Switch to the now released psr/clock-interface

This commit is contained in:
Jérôme Gamez
2022-11-25 18:08:55 +01:00
parent 5acec1192d
commit a5e62affe0
7 changed files with 12 additions and 11 deletions
+1 -1
View File
@@ -4,7 +4,7 @@ declare(strict_types=1);
namespace Beste;
use StellaMaris\Clock\ClockInterface;
use Psr\Clock\ClockInterface;
interface Clock extends ClockInterface
{
+1 -1
View File
@@ -7,7 +7,7 @@ namespace Beste\Clock;
use Beste\Clock;
use DateTimeImmutable;
use DateTimeZone;
use StellaMaris\Clock\ClockInterface;
use Psr\Clock\ClockInterface;
final class FrozenClock implements Clock
{
+1 -1
View File
@@ -6,7 +6,7 @@ namespace Beste\Clock;
use Beste\Clock;
use DateTimeImmutable;
use StellaMaris\Clock\ClockInterface;
use Psr\Clock\ClockInterface;
final class MinuteClock implements Clock
{
+6 -5
View File
@@ -6,7 +6,8 @@ namespace Beste\Clock;
use Beste\Clock;
use DateTimeImmutable;
use StellaMaris\Clock\ClockInterface;
use InvalidArgumentException;
use Psr\Clock\ClockInterface;
final class WrappingClock implements Clock
{
@@ -24,11 +25,11 @@ final class WrappingClock implements Clock
}
if (!method_exists($clock, 'now')) {
throw new \InvalidArgumentException('$clock must implement StellaMaris\Clock\ClockInterface or have a now() method');
throw new InvalidArgumentException('$clock must implement '.ClockInterface::class.' or have a now() method');
}
if (!($clock->now() instanceof DateTimeImmutable)) {
throw new \InvalidArgumentException('$clock->now() must return a DateTimeImmutable');
throw new InvalidArgumentException('$clock->now() must return a DateTimeImmutable');
}
$wrappedClock = new class($clock) implements ClockInterface {
@@ -39,13 +40,13 @@ final class WrappingClock implements Clock
$this->clock = $clock;
}
public function now(): \DateTimeImmutable
public function now(): DateTimeImmutable
{
assert(method_exists($this->clock, 'now'));
$now = $this->clock->now();
assert($now instanceof \DateTimeImmutable);
assert($now instanceof DateTimeImmutable);
return $now;
}