PsrCacheAdapter: conversion DateInterval -> seconds is not affected by timezone

Author: dg

src/Bridges/Psr/PsrCacheAdapter.php

@@ -102,17 +102,10 @@ public function has(string $key): bool
 	private static function ttlToSeconds(null|int|DateInterval $ttl = null): ?int
 	{
 		if ($ttl instanceof DateInterval) {
-			return self::dateIntervalToSeconds($ttl);
+			$now = new \DateTimeImmutable('', new \DateTimeZone('UTC'));
+			return $now->add($ttl)->getTimestamp() - $now->getTimestamp();
 		}
 
 		return $ttl;
 	}
-
-
-	private static function dateIntervalToSeconds(DateInterval $dateInterval): int
-	{
-		$now = new \DateTimeImmutable;
-		$expiresAt = $now->add($dateInterval);
-		return $expiresAt->getTimestamp() - $now->getTimestamp();
-	}
 }

tests/Bridges.Psr/PsrCacheAdapter.set.phpt

@@ -40,7 +40,7 @@ test('set ttl DateInterval', function () {
 	Assert::same([
 		'data' => '3',
 		'dependencies' => [
-			Caching\Cache::Expire => (new DateTime)->add($interval)->getTimestamp() - (new DateTime)->getTimestamp(),
+			Caching\Cache::Expire => ($dt = new DateTimeImmutable('', new DateTimeZone('UTC')))->add($interval)->getTimestamp() - $dt->getTimestamp(),
 		],
 	], $storage->read('test'));
 });

tests/Bridges.Psr/PsrCacheAdapter.setMultiple.phpt

@@ -54,14 +54,14 @@ test('set multiple ttl DateInterval', function () {
 	Assert::same([
 		'data' => '1',
 		'dependencies' => [
-			Caching\Cache::Expire => (new DateTime)->add($interval)->getTimestamp() - (new DateTime)->getTimestamp(),
+			Caching\Cache::Expire => ($dt = new DateTimeImmutable('', new DateTimeZone('UTC')))->add($interval)->getTimestamp() - $dt->getTimestamp(),
 		],
 	], $storage->read('test1'));
 
 	Assert::same([
 		'data' => '2',
 		'dependencies' => [
-			Caching\Cache::Expire => (new DateTime)->add($interval)->getTimestamp() - (new DateTime)->getTimestamp(),
+			Caching\Cache::Expire => ($dt = new DateTimeImmutable('', new DateTimeZone('UTC')))->add($interval)->getTimestamp() - $dt->getTimestamp(),
 		],
 	], $storage->read('test2'));
 });