[Cache] minor improvement in expiry handling

nicolas-grekas · nicolas-grekas · commit 13af58c57f22 · 2020-10-29T11:44:04.000+01:00
diff --git a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
@@ -74,11 +74,7 @@ static function ($sourceItem, $item, $sourceMetadata = null) use ($defaultLifeti
                 $item->metadata = $item->newMetadata = $sourceItem->metadata = $sourceMetadata;
 
                 if (isset($item->metadata[CacheItem::METADATA_EXPIRY])) {
-                    if (\is_int($expiry = $item->metadata[CacheItem::METADATA_EXPIRY])) {
-                        $item->expiresAt(\DateTime::createFromFormat('U', $expiry));
-                    } else {
-                        $item->expiresAt(\DateTime::createFromFormat('U.u', sprintf('%.3F', $expiry)));
-                    }
+                    $item->expiresAt(\DateTime::createFromFormat('U.u', sprintf('%.6F', $item->metadata[CacheItem::METADATA_EXPIRY])));
                 } elseif (0 < $defaultLifetime) {
                     $item->expiresAfter($defaultLifetime);
                 }
diff --git a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
@@ -88,7 +88,7 @@ static function (CacheItemInterface $innerItem, array $item) {
                     $item["\0*\0value"] = ["\x9D".pack('VN', (int) (0.1 + $metadata[self::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[self::METADATA_CTIME])."\x5F" => $item["\0*\0value"]];
                 }
                 $innerItem->set($item["\0*\0value"]);
-                $innerItem->expiresAt(null !== $item["\0*\0expiry"] ? \DateTime::createFromFormat('U.u', sprintf('%.6f', 0 === $item["\0*\0expiry"] ? \PHP_INT_MAX : $item["\0*\0expiry"])) : null);
+                $innerItem->expiresAt(null !== $item["\0*\0expiry"] ? \DateTime::createFromFormat('U.u', sprintf('%.6F', 0 === $item["\0*\0expiry"] ? \PHP_INT_MAX : $item["\0*\0expiry"])) : null);
             },
             null,
             CacheItem::class

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ static function (CacheItemInterface $innerItem, array $item) {`
`88`	`88`	`$item["\0\0value"] = ["\x9D".pack('VN', (int) (0.1 + $metadata[self::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[self::METADATA_CTIME])."\x5F" => $item["\0\0value"]];`
`89`	`89`	`}`
`90`	`90`	`$innerItem->set($item["\0*\0value"]);`
`91`		`- $innerItem->expiresAt(null !== $item["\0\0expiry"] ? \DateTime::createFromFormat('U.u', sprintf('%.6f', 0 === $item["\0\0expiry"] ? \PHP_INT_MAX : $item["\0*\0expiry"])) : null);`
	`91`	`+ $innerItem->expiresAt(null !== $item["\0\0expiry"] ? \DateTime::createFromFormat('U.u', sprintf('%.6F', 0 === $item["\0\0expiry"] ? \PHP_INT_MAX : $item["\0*\0expiry"])) : null);`
`92`	`92`	`},`
`93`	`93`	`null,`
`94`	`94`	`CacheItem::class`