[Cache] Fix tags expiration

nicolas-grekas · nicolas-grekas · commit bc482ee51c0b · 2017-01-18T16:41:48.000+01:00
diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
@@ -26,24 +26,23 @@ class TagAwareAdapter implements TagAwareAdapterInterface
     private $deferred = array();
     private $createCacheItem;
     private $getTagsByKey;
+    private $invalidateTags;
     private $tagsAdapter;
 
     public function __construct(AdapterInterface $itemsAdapter, AdapterInterface $tagsAdapter = null)
     {
         $this->itemsAdapter = $itemsAdapter;
         $this->tagsAdapter = $tagsAdapter ?: $itemsAdapter;
         $this->createCacheItem = \Closure::bind(
-            function ($key, $value = null, CacheItem $protoItem = null) {
+            function ($key, $value, CacheItem $protoItem) {
                 $item = new CacheItem();
                 $item->key = $key;
                 $item->value = $value;
                 $item->isHit = false;
-
-                if (null !== $protoItem) {
-                    $item->defaultLifetime = $protoItem->defaultLifetime;
-                    $item->innerItem = $protoItem->innerItem;
-                    $item->poolHash = $protoItem->poolHash;
-                }
+                $item->defaultLifetime = $protoItem->defaultLifetime;
+                $item->expiry = $protoItem->expiry;
+                $item->innerItem = $protoItem->innerItem;
+                $item->poolHash = $protoItem->poolHash;
 
                 return $item;
             },
@@ -62,6 +61,20 @@ function ($deferred) {
             null,
             CacheItem::class
         );
+        $this->invalidateTags = \Closure::bind(
+            function (AdapterInterface $tagsAdapter, array $tags) {
+                foreach ($tagsAdapter->getItems($tags) as $v) {
+                    $v->set(1 + (int) $v->get());
+                    $v->defaultLifetime = 0;
+                    $v->expiry = null;
+                    $tagsAdapter->saveDeferred($v);
+                }
+
+                return $tagsAdapter->commit();
+            },
+            null,
+            CacheItem::class
+        );
     }
 
     /**
@@ -74,13 +87,9 @@ public function invalidateTags(array $tags)
                 $tags[$k] = $tag.static::TAGS_PREFIX;
             }
         }
+        $f = $this->invalidateTags;
 
-        foreach ($this->tagsAdapter->getItems($tags) as $v) {
-            $v->set(1 + (int) $v->get());
-            $this->tagsAdapter->saveDeferred($v);
-        }
-
-        return $this->tagsAdapter->commit();
+        return $f($this->tagsAdapter, $tags);
     }
 
     /**
@@ -211,22 +220,23 @@ public function commit()
         $ok = true;
 
         if ($this->deferred) {
-            foreach ($this->deferred as $key => $item) {
+            $items = $this->deferred;
+            foreach ($items as $key => $item) {
                 if (!$this->itemsAdapter->saveDeferred($item)) {
                     unset($this->deferred[$key]);
                     $ok = false;
                 }
             }
 
             $f = $this->getTagsByKey;
-            $tagsByKey = $f($this->deferred);
+            $tagsByKey = $f($items);
             $deletedTags = $this->deferred = array();
             $tagVersions = $this->getTagVersions($tagsByKey);
             $f = $this->createCacheItem;
 
             foreach ($tagsByKey as $key => $tags) {
                 if ($tags) {
-                    $this->itemsAdapter->saveDeferred($f(static::TAGS_PREFIX.$key, array_intersect_key($tagVersions, $tags)));
+                    $this->itemsAdapter->saveDeferred($f(static::TAGS_PREFIX.$key, array_intersect_key($tagVersions, $tags), $items[$key]));
                 } else {
                     $deletedTags[] = static::TAGS_PREFIX.$key;
                 }
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
@@ -97,4 +97,21 @@ public function testTagsAreCleanedOnDelete()
 
         $this->assertTrue($pool->getItem('k')->isHit());
     }
+
+    public function testTagItemExpiry()
+    {
+        $pool = $this->createCachePool(10);
+
+        $item = $pool->getItem('foo');
+        $item->tag(['baz']);
+        $item->expiresAfter(100);
+
+        $pool->save($item);
+        $pool->invalidateTags(['baz']);
+        $this->assertFalse($pool->getItem('foo')->isHit());
+
+        sleep(20);
+
+        $this->assertFalse($pool->getItem('foo')->isHit());
+    }
 }
