[Cache] Propagate expiry when syncing items in ChainAdapter

If a lower adapter provides item metadata, propagate the expiry time when syncing the item to upper ones.
symfony · Dec 10, 2019 · 77138ac · 77138ac
1 parent 5da657b
commit 77138ac
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
@@ -61,14 +61,15 @@ public function __construct(array $adapters, int $defaultLifetime = 0)
         $this->adapterCount = \count($this->adapters);
 
         $this->syncItem = \Closure::bind(
-            static function ($sourceItem, $item) use ($defaultLifetime) {
+            static function ($sourceItem, $item, $sourceMetadata = null) use ($defaultLifetime) {
+                $sourceItem->isTaggable = false;
+                $sourceMetadata = $sourceMetadata ?? $sourceItem->metadata;
+                unset($sourceMetadata[CacheItem::METADATA_TAGS]);
+
                 $item->value = $sourceItem->value;
-                $item->expiry = $sourceItem->expiry;
+                $item->expiry = $sourceMetadata[CacheItem::METADATA_EXPIRY] ?? $sourceItem->expiry;
                 $item->isHit = $sourceItem->isHit;
-                $item->metadata = $sourceItem->metadata;
-
-                $sourceItem->isTaggable = false;
-                unset($sourceItem->metadata[CacheItem::METADATA_TAGS]);
+                $item->metadata = $item->newMetadata = $sourceItem->metadata = $sourceMetadata;
 
                 if (0 < $sourceItem->defaultLifetime && $sourceItem->defaultLifetime < $defaultLifetime) {
                     $defaultLifetime = $sourceItem->defaultLifetime;
@@ -103,7 +104,7 @@ public function get(string $key, callable $callback, float $beta = null, array &
                 $value = $this->doGet($adapter, $key, $callback, $beta, $metadata);
             }
             if (null !== $item) {
-                ($this->syncItem)($lastItem = $lastItem ?? $item, $item);
+                ($this->syncItem)($lastItem = $lastItem ?? $item, $item, $metadata);
             }
 
             return $value;

diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php
@@ -28,7 +28,7 @@ class ChainAdapterTest extends AdapterTestCase
     public function createCachePool($defaultLifetime = 0, $testMethod = null)
     {
         if ('testGetMetadata' === $testMethod) {
-            return new ChainAdapter([new FilesystemAdapter('', $defaultLifetime)], $defaultLifetime);
+            return new ChainAdapter([new FilesystemAdapter('a', $defaultLifetime), new FilesystemAdapter('b', $defaultLifetime)], $defaultLifetime);
         }
 
         return new ChainAdapter([new ArrayAdapter($defaultLifetime), new ExternalAdapter(), new FilesystemAdapter('', $defaultLifetime)], $defaultLifetime);