[Cache] fix using ProxyAdapter inside TagAwareAdapter

symfony · Apr 6, 2019 · 7cb1dd7 · 7cb1dd7
1 parent c8d6dec
commit 7cb1dd7
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
@@ -156,7 +156,7 @@ private function doSave(CacheItemInterface $item, $method)
         if (null === $expiry && 0 < $item["\0*\0defaultLifetime"]) {
             $expiry = time() + $item["\0*\0defaultLifetime"];
         }
-        $innerItem = $item["\0*\0poolHash"] === $this->poolHash ? $item["\0*\0innerItem"] : $this->pool->getItem($this->namespace.$item["\0*\0key"]);
+        $innerItem = $item["\0*\0poolHash"] === $this->poolHash && $item["\0*\0innerItem"] ? $item["\0*\0innerItem"] : $this->pool->getItem($this->namespace.$item["\0*\0key"]);
         $innerItem->set($item["\0*\0value"]);
         $innerItem->expiresAt(null !== $expiry ? \DateTime::createFromFormat('U', $expiry) : null);
 

diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
@@ -48,7 +48,6 @@ function ($key, $value, CacheItem $protoItem) {
                 $item->value = $value;
                 $item->defaultLifetime = $protoItem->defaultLifetime;
                 $item->expiry = $protoItem->expiry;
-                $item->innerItem = $protoItem->innerItem;
                 $item->poolHash = $protoItem->poolHash;
 
                 return $item;

diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\Adapter\ProxyAdapter;
+use Symfony\Component\Cache\Adapter\TagAwareAdapter;
+
+class TagAwareAndProxyAdapterIntegrationTest extends TestCase
+{
+    public function testIntegration(): void
+    {
+        $cache = new TagAwareAdapter(
+            new ProxyAdapter(
+                new ArrayAdapter()
+            )
+        );
+
+        $item = $cache->getItem('foo');
+        $item->tag(['tag1', 'tag2']);
+        $item->set('bar');
+        $cache->save($item);
+
+        $this->assertSame('bar', $cache->getItem('foo')->get());
+    }
+}