When checking if results are fresh on freshness policy, unstage tag t…

…ag from cache if the result is empty

src/Cache/SoftInvalidatableCache.php

@@ -23,7 +23,6 @@ public function stage(string $key): void
         parent::stage($key);
     }
 
-
     public function get($key, callable $regenerator = null, $ttl = 0)
     {
         $regeneratedByParent = false;

src/Cache/TaggedFreshnessPolicy.php

@@ -23,6 +23,15 @@ public function computeTtl($ttl)
     {
         return $ttl;
     }
+
+    public function resultIsFresh($result)
+    {
+        if (!($result instanceof CacheData)) {
+            $this->tagset->unstage();
+            return false;
+        }
+        return parent::resultIsFresh($result);
+    }
 
     protected function isFresh($freshnessData)
     {

src/Tag/Tag.php

@@ -30,6 +30,14 @@ public function getVersion()
         $stored = $this->cache->get($this->key);
         return $stored && is_string($stored) ? $stored : $this->clear();
     }
+
+    public function unstage()
+    {
+        if ($this->staged) {
+            $this->cache->get($this->key);
+        }
+    }
+
 
     public function clear()
     {

src/Tag/TagSet.php

@@ -47,4 +47,11 @@ public function stage()
             $tag->stage();
         });
     }
+
+    public function unstage()
+    {
+        array_walk($this->tags, function ($tag) {
+            $tag->unstage();
+        });
+    }
 }

tests/Cache/CacheBuilderTest.php

@@ -94,6 +94,7 @@ public function testTaggedBuild()
             ->andReturnNull();
         $tagset = m::mock('GeekCache\Tag\TagSet');
         $tagset->shouldReceive('stage');
+        $tagset->shouldReceive('unstage')->once();
         $this->tagsetfactory->shouldReceive('makeTagSet')
             ->once()
             ->with(array('footag', 'bartag'))

tests/Cache/TaggedCacheMemcachedTest.php

@@ -34,6 +34,15 @@ public function testTaggedCacheInvalidates()
         $this->assertEquals(self::VALUE, $cache->get(self::KEY));
         $tagSet->clearAll();
         $this->assertFalse($cache->get(self::KEY));
+        $this->assertStageEmpty();
+    }
+
+    public function testTaggedCacheLookupMiss()
+    {
+        $getCount = $this->parentcache->getGetCount();
+        $this->cache->get(self::KEY);
+        $this->assertEquals($getCount + 1, $this->parentcache->getGetCount());
+        $this->assertStageEmpty();
     }
 
     public function testTaggedCacheLookupHitsCacheOnce()

tests/Cache/TaggedCacheTest.php

@@ -15,6 +15,7 @@ public function setUp(): void
             ->andReturn('foo')
             ->byDefault();
         $this->tagset->shouldReceive('stage');
+        $this->tagset->shouldReceive('unstage');
         $policy = new GeekCache\Cache\TaggedFreshnessPolicy($this->tagset);
         $this->cache = new GeekCache\Cache\SoftInvalidatableCache($this->parentcache, $policy);
     }