Skip to content

Commit 29a31bc

Browse files
RikudouSageRikudouSage
committed
Replace clock
1 parent 7098dad commit 29a31bc

9 files changed

Lines changed: 47 additions & 66 deletions

‎composer.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"php": "^8.0",
99
"rikudou/clock": "^1.0",
1010
"psr/simple-cache": "^1.0",
11-
"async-aws/dynamo-db": "^1.0"
11+
"async-aws/dynamo-db": "^1.0",
12+
"psr/clock": "^1.0"
1213
},
1314
"autoload": {
1415
"psr-4": {

‎src/Converter/DefaultCacheItemConverter.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
namespace Rikudou\DynamoDbCache\Converter;
44

55
use Psr\Cache\CacheItemInterface;
6-
use Rikudou\Clock\Clock;
7-
use Rikudou\Clock\ClockInterface;
6+
use Psr\Clock\ClockInterface as PsrClock;
7+
use Rikudou\Clock\ClockInterface as RikudouClock;
88
use Rikudou\DynamoDbCache\DynamoCacheItem;
99
use Rikudou\DynamoDbCache\Encoder\CacheItemEncoderInterface;
1010
use Rikudou\DynamoDbCache\Encoder\SerializeItemEncoder;
11+
use Rikudou\DynamoDbCache\Helper\ClockHelper;
1112

1213
final class DefaultCacheItemConverter implements CacheItemConverterInterface
1314
{
1415
private CacheItemEncoderInterface $encoder;
1516

16-
private ClockInterface $clock;
17+
private PsrClock $clock;
1718

18-
public function __construct(?CacheItemEncoderInterface $encoder = null, ?ClockInterface $clock = null)
19+
public function __construct(?CacheItemEncoderInterface $encoder = null, RikudouClock|PsrClock|null $clock = null)
1920
{
2021
if ($encoder === null) {
2122
$encoder = new SerializeItemEncoder();
2223
}
23-
if ($clock === null) {
24-
$clock = new Clock();
25-
}
24+
$clock = ClockHelper::psrClock($clock);
25+
2626
$this->encoder = $encoder;
2727
$this->clock = $clock;
2828
}

‎src/DynamoCacheItem.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use DateInterval;
66
use DateTimeInterface;
77
use Psr\Cache\CacheItemInterface;
8-
use Rikudou\Clock\ClockInterface;
8+
use Psr\Clock\ClockInterface;
99
use Rikudou\DynamoDbCache\Encoder\CacheItemEncoderInterface;
1010

1111
final class DynamoCacheItem implements CacheItemInterface

‎src/DynamoDbCache.php‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,17 @@
1414
use LogicException;
1515
use Psr\Cache\CacheItemInterface;
1616
use Psr\Cache\CacheItemPoolInterface;
17+
use Psr\Clock\ClockInterface as PsrClock;
1718
use Psr\SimpleCache\CacheInterface;
18-
use Rikudou\Clock\Clock;
19-
use Rikudou\Clock\ClockInterface;
19+
use Rikudou\Clock\ClockInterface as RikudouClock;
2020
use Rikudou\DynamoDbCache\Converter\CacheItemConverterRegistry;
2121
use Rikudou\DynamoDbCache\Converter\DefaultCacheItemConverter;
2222
use Rikudou\DynamoDbCache\Encoder\CacheItemEncoderInterface;
2323
use Rikudou\DynamoDbCache\Encoder\SerializeItemEncoder;
2424
use Rikudou\DynamoDbCache\Enum\NetworkErrorMode;
2525
use Rikudou\DynamoDbCache\Exception\CacheItemNotFoundException;
2626
use Rikudou\DynamoDbCache\Exception\InvalidArgumentException;
27+
use Rikudou\DynamoDbCache\Helper\ClockHelper;
2728

2829
final class DynamoDbCache implements CacheItemPoolInterface, CacheInterface
2930
{
@@ -35,7 +36,7 @@ final class DynamoDbCache implements CacheItemPoolInterface, CacheInterface
3536
*/
3637
private array $deferred = [];
3738

38-
private ClockInterface $clock;
39+
private PsrClock $clock;
3940

4041
private CacheItemConverterRegistry $converter;
4142

@@ -47,16 +48,14 @@ public function __construct(
4748
private string $primaryField = 'id',
4849
private string $ttlField = 'ttl',
4950
private string $valueField = 'value',
50-
?ClockInterface $clock = null,
51+
RikudouClock|PsrClock|null $clock = null,
5152
?CacheItemConverterRegistry $converter = null,
5253
?CacheItemEncoderInterface $encoder = null,
5354
private ?string $prefix = null,
5455
#[ExpectedValues(valuesFromClass: NetworkErrorMode::class)]
5556
private int $networkErrorMode = NetworkErrorMode::DEFAULT,
5657
) {
57-
if ($clock === null) {
58-
$clock = new Clock();
59-
}
58+
$clock = ClockHelper::psrClock($clock);
6059
$this->clock = $clock;
6160

6261
if ($encoder === null) {

‎src/DynamoDbCacheBuilder.php‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44

55
use AsyncAws\DynamoDb\DynamoDbClient;
66
use JetBrains\PhpStorm\ExpectedValues;
7-
use Rikudou\Clock\ClockInterface;
7+
use Psr\Clock\ClockInterface as PsrClock;
8+
use Rikudou\Clock\ClockInterface as RikudouClock;
89
use Rikudou\DynamoDbCache\Converter\CacheItemConverterRegistry;
910
use Rikudou\DynamoDbCache\Encoder\CacheItemEncoderInterface;
1011
use Rikudou\DynamoDbCache\Enum\NetworkErrorMode;
12+
use Rikudou\DynamoDbCache\Helper\ClockHelper;
1113

1214
final class DynamoDbCacheBuilder
1315
{
@@ -19,7 +21,7 @@ final class DynamoDbCacheBuilder
1921

2022
private ?string $prefix = null;
2123

22-
private ?ClockInterface $clock = null;
24+
private ?PsrClock $clock = null;
2325

2426
private ?CacheItemConverterRegistry $converterRegistry = null;
2527

@@ -70,8 +72,10 @@ public function withPrefix(?string $prefix): self
7072
return $copy;
7173
}
7274

73-
public function withClock(?ClockInterface $clock): self
75+
public function withClock(RikudouClock|PsrClock|null $clock): self
7476
{
77+
$clock = ClockHelper::psrClock($clock);
78+
7579
$copy = clone $this;
7680
$copy->clock = $clock;
7781

‎tests/Converter/DefaultCacheItemConverterTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Rikudou\DynamoDbCache\Converter\DefaultCacheItemConverter;
99
use Rikudou\DynamoDbCache\DynamoCacheItem;
1010
use Rikudou\DynamoDbCache\Encoder\SerializeItemEncoder;
11+
use Rikudou\DynamoDbCache\Helper\ClockHelper;
1112

1213
final class DefaultCacheItemConverterTest extends TestCase
1314
{
@@ -33,7 +34,7 @@ protected function setUp(): void
3334
true,
3435
'something',
3536
null,
36-
new Clock(),
37+
ClockHelper::psrClock(),
3738
new SerializeItemEncoder()
3839
);
3940
$this->basicCacheItem = $this->createBasicCacheItem();

‎tests/DynamoCacheItemTest.php‎

Lines changed: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44

55
use DateInterval;
66
use DateTime;
7+
use DateTimeImmutable;
78
use PHPUnit\Framework\TestCase;
8-
use ReflectionObject;
9-
use Rikudou\Clock\Clock;
10-
use Rikudou\Clock\ClockInterface;
11-
use Rikudou\Clock\TestClock;
9+
use Psr\Clock\ClockInterface;
1210
use Rikudou\DynamoDbCache\DynamoCacheItem;
1311
use Rikudou\DynamoDbCache\Encoder\SerializeItemEncoder;
14-
use Rikudou\DynamoDbCache\Exception\InvalidArgumentException;
12+
use Rikudou\DynamoDbCache\Helper\ClockHelper;
1513

1614
final class DynamoCacheItemTest extends TestCase
1715
{
@@ -21,19 +19,13 @@ final class DynamoCacheItemTest extends TestCase
2119
private const DEFAULT_EXPIRES_AT = null;
2220
private const DEFAULT_DATE = '2030-01-01T15:00:00+00:00';
2321

24-
/**
25-
* @var DynamoCacheItem
26-
*/
27-
private $instance;
22+
private DynamoCacheItem $instance;
2823

29-
/**
30-
* @var TestClock
31-
*/
32-
private $clock;
24+
private ClockInterface $clock;
3325

3426
protected function setUp(): void
3527
{
36-
$this->clock = new TestClock(new DateTime(self::DEFAULT_DATE));
28+
$this->clock = ClockHelper::fixedTimeClock(new DateTimeImmutable(self::DEFAULT_DATE));
3729
$this->instance = new DynamoCacheItem(
3830
self::DEFAULT_KEY,
3931
self::DEFAULT_IS_HIT,
@@ -87,29 +79,11 @@ public function testExpiresAfter()
8779
self::assertNull($this->instance->getExpiresAt());
8880

8981
$this->instance->expiresAfter(new DateInterval('P1DT2H3M'));
90-
self::assertEquals('2030-01-02T17:04:00+00:00', $this->instance->getExpiresAt()->format('c'));
82+
self::assertEquals('2030-01-02T17:03:00+00:00', $this->instance->getExpiresAt()->format('c'));
9183
}
9284

9385
public function testGetRaw()
9486
{
9587
self::assertEquals(serialize(self::DEFAULT_VALUE), $this->instance->getRaw());
9688
}
97-
98-
public function testDefaultClock()
99-
{
100-
$instance = new DynamoCacheItem(
101-
self::DEFAULT_KEY,
102-
self::DEFAULT_IS_HIT,
103-
self::DEFAULT_VALUE,
104-
self::DEFAULT_EXPIRES_AT,
105-
new Clock(),
106-
new SerializeItemEncoder()
107-
);
108-
109-
$reflection = new ReflectionObject($instance);
110-
$clock = $reflection->getProperty('clock');
111-
$clock->setAccessible(true);
112-
113-
self::assertInstanceOf(ClockInterface::class, $clock->getValue($instance));
114-
}
11589
}

‎tests/DynamoDbCacheBuilderTest.php‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@
33
namespace Rikudou\Tests\DynamoDbCache;
44

55
use AsyncAws\DynamoDb\DynamoDbClient;
6+
use DateTimeInterface;
7+
use Psr\Clock\ClockInterface;
68
use ReflectionObject;
79
use Rikudou\Clock\Clock;
8-
use Rikudou\Clock\ClockInterface;
910
use Rikudou\DynamoDbCache\Converter\CacheItemConverterRegistry;
1011
use Rikudou\DynamoDbCache\DynamoDbCache;
1112
use Rikudou\DynamoDbCache\DynamoDbCacheBuilder;
1213
use PHPUnit\Framework\TestCase;
1314
use Rikudou\DynamoDbCache\Encoder\CacheItemEncoderInterface;
1415
use Rikudou\DynamoDbCache\Encoder\JsonItemEncoder;
1516
use Rikudou\DynamoDbCache\Enum\NetworkErrorMode;
17+
use Rikudou\DynamoDbCache\Helper\ClockHelper;
1618

1719
class DynamoDbCacheBuilderTest extends TestCase
1820
{
@@ -171,15 +173,15 @@ public function testWithConverterRegistry()
171173

172174
public function testWithClock()
173175
{
174-
$clock = new Clock();
176+
$clock = ClockHelper::psrClock();
175177
$instance = $this->instance->withClock($clock);
176178

177179
$result = $this->getBuiltData($instance->build());
178180
self::assertEquals('test', $result['tableName']);
179181
self::assertEquals('id', $result['primaryField']);
180182
self::assertEquals('ttl', $result['ttlField']);
181183
self::assertEquals('value', $result['valueField']);
182-
self::assertSame($clock, $result['clock']);
184+
self::assertSame($clock->now()->format(DateTimeInterface::RFC7231), $result['clock']->now()->format(DateTimeInterface::RFC7231));
183185
self::assertInstanceOf(CacheItemConverterRegistry::class, $result['converter']);
184186
self::assertInstanceOf(CacheItemEncoderInterface::class, $result['encoder']);
185187
self::assertNull($result['prefix']);
@@ -188,7 +190,7 @@ public function testWithClock()
188190

189191
public function testAllAtOnce()
190192
{
191-
$clock = new Clock();
193+
$clock = ClockHelper::psrClock();
192194
$registry = new CacheItemConverterRegistry();
193195
$encoder = new JsonItemEncoder();
194196

@@ -208,7 +210,7 @@ public function testAllAtOnce()
208210
self::assertEquals('id1', $result['primaryField']);
209211
self::assertEquals('ttl1', $result['ttlField']);
210212
self::assertEquals('value1', $result['valueField']);
211-
self::assertSame($clock, $result['clock']);
213+
self::assertSame($clock->now()->format(DateTimeInterface::RFC7231), $result['clock']->now()->format(DateTimeInterface::RFC7231));
212214
self::assertSame($registry, $result['converter']);
213215
self::assertSame($encoder, $result['encoder']);
214216
self::assertEquals('testPrefix', $result['prefix']);

‎tests/DynamoDbCacheTest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
use ReflectionClass;
2626
use ReflectionObject;
2727
use Rikudou\Clock\Clock;
28-
use Rikudou\Clock\TestClock;
2928
use Rikudou\DynamoDbCache\DynamoCacheItem;
3029
use Rikudou\DynamoDbCache\DynamoDbCache;
3130
use Rikudou\DynamoDbCache\Encoder\SerializeItemEncoder;
3231
use Rikudou\DynamoDbCache\Enum\NetworkErrorMode;
3332
use Rikudou\DynamoDbCache\Exception\InvalidArgumentException;
33+
use Rikudou\DynamoDbCache\Helper\ClockHelper;
3434
use stdClass;
3535
use Symfony\Component\HttpClient\MockHttpClient;
3636
use Symfony\Component\HttpClient\Response\MockResponse;
@@ -659,7 +659,7 @@ public function testSet()
659659
'id',
660660
'ttl',
661661
'value',
662-
new TestClock(new DateTime('2030-01-01 15:00:00'))
662+
ClockHelper::fixedTimeClock(new DateTimeImmutable('2030-01-01 15:00:00'))
663663
);
664664
self::assertTrue($instance->set('test2', 'test', 3600));
665665
self::assertCount(++$count, $this->itemPoolSaved);
@@ -671,7 +671,7 @@ public function testSet()
671671
self::assertTrue($instance->set('test3', 'test', new DateInterval('P1DT3S')));
672672
self::assertCount(++$count, $this->itemPoolSaved);
673673
self::assertEquals(
674-
'2030-01-02 16:00:03',
674+
'2030-01-02 15:00:03',
675675
(new DateTime())->setTimestamp(end($this->itemPoolSaved)['ttl']['N'])->format('Y-m-d H:i:s')
676676
);
677677
}
@@ -690,7 +690,7 @@ public function testSetPrefixed()
690690
'id',
691691
'ttl',
692692
'value',
693-
new TestClock(new DateTime('2030-01-01 15:00:00')),
693+
ClockHelper::fixedTimeClock(new DateTimeImmutable('2030-01-01 15:00:00')),
694694
null,
695695
null,
696696
$this->prefix
@@ -705,7 +705,7 @@ public function testSetPrefixed()
705705
self::assertTrue($instance->set('test3', 'test', new DateInterval('P1DT3S')));
706706
self::assertCount(++$count, $this->itemPoolSaved);
707707
self::assertEquals(
708-
'2030-01-02 16:00:03',
708+
'2030-01-02 15:00:03',
709709
(new DateTime())->setTimestamp(end($this->itemPoolSaved)['ttl']['N'])->format('Y-m-d H:i:s')
710710
);
711711
}
@@ -831,7 +831,7 @@ public function testSetMultiple()
831831
'id',
832832
'ttl',
833833
'value',
834-
new TestClock(new DateTimeImmutable('2030-01-01 15:00:00'))
834+
ClockHelper::fixedTimeClock(new DateTimeImmutable('2030-01-01 15:00:00'))
835835
);
836836

837837
$this->itemPoolSaved = [];
@@ -890,7 +890,7 @@ public function testSetMultiplePrefixed()
890890
'id',
891891
'ttl',
892892
'value',
893-
new TestClock(new DateTimeImmutable('2030-01-01 15:00:00')),
893+
ClockHelper::fixedTimeClock(new DateTimeImmutable('2030-01-01 15:00:00')),
894894
null,
895895
null,
896896
$this->prefix
@@ -990,7 +990,7 @@ public function testInvalidKeys()
990990
true,
991991
'',
992992
null,
993-
new Clock(),
993+
ClockHelper::psrClock(),
994994
new SerializeItemEncoder()
995995
);
996996

0 commit comments

Comments
 (0)