[Cache] fix logic for fetching tag versions on TagAwareAdapter

dmaicher · dmaicher · commit da8dfb966e30 · 2018-05-04T21:08:14.000+02:00
diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
@@ -344,9 +344,16 @@ private function getTagVersions(array $tagsByKey, array &$invalidatedTags = arra
         $tags = array();
         foreach ($tagVersions as $tag => $version) {
             $tags[$tag.static::TAGS_PREFIX] = $tag;
-            if ($fetchTagVersions || !isset($this->knownTagVersions[$tag])) {
+
+            if ($fetchTagVersions) {
+                continue;
+            }
+
+            if (!isset($this->knownTagVersions[$tag])) {
+                $fetchTagVersions = true;
                 continue;
             }
+
             $version -= $this->knownTagVersions[$tag][1];
             if ((0 !== $version && 1 !== $version) || $this->knownTagVersionsTtl > $now - $this->knownTagVersions[$tag][0]) {
                 // reuse previously fetched tag versions up to the ttl, unless we are storing items or a potential miss arises
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
@@ -69,6 +69,12 @@ public function testInvalidateTags()
         $this->assertFalse($pool->getItem('i1')->isHit());
         $this->assertFalse($pool->getItem('i3')->isHit());
         $this->assertTrue($pool->getItem('foo')->isHit());
+
+        $anotherPoolInstance = $this->createCachePool();
+
+        $this->assertFalse($anotherPoolInstance->getItem('i1')->isHit());
+        $this->assertFalse($anotherPoolInstance->getItem('i3')->isHit());
+        $this->assertTrue($anotherPoolInstance->getItem('foo')->isHit());
     }
 
     public function testInvalidateCommits()
