Skip to content

Commit 30a6679

Browse files
committed
PsrCacheAdapter: conversion DateInterval -> seconds is not affected by timezone
1 parent b2fdae8 commit 30a6679

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/Bridges/Psr/PsrCacheAdapter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function has(string $key): bool
100100
private static function ttlToSeconds(null|int|DateInterval $ttl = null): ?int
101101
{
102102
if ($ttl instanceof DateInterval) {
103-
$now = new \DateTimeImmutable;
103+
$now = new \DateTimeImmutable('', new \DateTimeZone('UTC'));
104104
return $now->add($ttl)->getTimestamp() - $now->getTimestamp();
105105
}
106106

tests/Bridges.Psr/PsrCacheAdapter.set.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ test('set ttl DateInterval', function () {
4242
Assert::same([
4343
'data' => '3',
4444
'dependencies' => [
45-
Caching\Cache::Expire => (new DateTime)->add($interval)->getTimestamp() - (new DateTime)->getTimestamp(),
45+
Caching\Cache::Expire => ($dt = new DateTimeImmutable('', new DateTimeZone('UTC')))->add($interval)->getTimestamp() - $dt->getTimestamp(),
4646
],
4747
], $storage->read('test'));
4848
});

tests/Bridges.Psr/PsrCacheAdapter.setMultiple.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ test('set multiple ttl DateInterval', function () {
5656
Assert::same([
5757
'data' => '1',
5858
'dependencies' => [
59-
Caching\Cache::Expire => (new DateTime)->add($interval)->getTimestamp() - (new DateTime)->getTimestamp(),
59+
Caching\Cache::Expire => ($dt = new DateTimeImmutable('', new DateTimeZone('UTC')))->add($interval)->getTimestamp() - $dt->getTimestamp(),
6060
],
6161
], $storage->read('test1'));
6262

6363
Assert::same([
6464
'data' => '2',
6565
'dependencies' => [
66-
Caching\Cache::Expire => (new DateTime)->add($interval)->getTimestamp() - (new DateTime)->getTimestamp(),
66+
Caching\Cache::Expire => ($dt = new DateTimeImmutable('', new DateTimeZone('UTC')))->add($interval)->getTimestamp() - $dt->getTimestamp(),
6767
],
6868
], $storage->read('test2'));
6969
});

0 commit comments

Comments
 (0)