From fd825c3702dfe1b35a0655c0bd2055e0c407be01 Mon Sep 17 00:00:00 2001
From: David Maicher <mail@dmaicher.de>
Date: Sat, 6 Apr 2019 18:45:14 +0200
Subject: [PATCH] [Cache] fix using ProxyAdapter inside TagAwareAdapter

---
 .../Component/Cache/Adapter/ProxyAdapter.php  |  2 +-
 .../Cache/Adapter/TagAwareAdapter.php         |  1 -
 ...TagAwareAndProxyAdapterIntegrationTest.php | 28 +++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 src/Symfony/Component/Cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php

diff --git a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
index 9060523609159..ea6e096bfa7a9 100644
--- 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
index d453e271aef4c..362aceed0eb18 100644
--- 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
new file mode 100644
index 0000000000000..3cafe5304594f
--- /dev/null
+++ b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php
@@ -0,0 +1,28 @@
+<?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());
+    }
+}