Merge branch 'hotfix/2.2.2'

Author: Toflar

src/Psr6Store.php

@@ -46,6 +46,7 @@ class Psr6Store implements Psr6StoreInterface, ClearableInterface
 {
     const NON_VARYING_KEY = 'non-varying';
     const COUNTER_KEY = 'write-operations-counter';
+    const CACHE_DEBUG_HEADER = 'toflar-psr6cache-requested-uri';
 
     /**
      * @var array
@@ -221,6 +222,7 @@ public function write(Request $request, Response $response)
             }
 
             $response->headers->set('X-Content-Digest', $contentDigest);
+            $response->headers->set(self::CACHE_DEBUG_HEADER, $request->getUri());
 
             if (!$response->headers->has('Transfer-Encoding')) {
                 $response->headers->set('Content-Length', \strlen($response->getContent()));
@@ -564,6 +566,9 @@ private function saveDeferred($key, $data, $expiresAfter = null, $tags = [])
      */
     private function restoreResponse(array $cacheData)
     {
+        // Unset internal debug info
+        unset($cacheData['headers'][self::CACHE_DEBUG_HEADER]);
+
         if (isset($cacheData['headers']['x-content-digest'][0])) {
             $item = $this->cache->getItem($cacheData['headers']['x-content-digest'][0]);
             if ($item->isHit()) {

tests/Psr6StoreTest.php

@@ -342,12 +342,15 @@ public function testRegularLookup()
 
         $this->store->write($request, $response);
 
+        $this->assertSame('https://foobar.com/', $response->headers->get(Psr6Store::CACHE_DEBUG_HEADER));
+
         $result = $this->store->lookup($request);
 
         $this->assertInstanceOf(Response::class, $result);
         $this->assertSame(200, $result->getStatusCode());
         $this->assertSame('hello world', $result->getContent());
         $this->assertSame('whatever', $result->headers->get('Foobar'));
+        $this->assertNull($result->headers->get(Psr6Store::CACHE_DEBUG_HEADER));
     }
 
     public function testRegularLookupWithBinaryResponse()
@@ -364,6 +367,7 @@ public function testRegularLookupWithBinaryResponse()
         $this->assertSame(200, $result->getStatusCode());
         $this->assertSame(__DIR__.'/Fixtures/favicon.ico', $result->getFile()->getPathname());
         $this->assertSame('whatever', $result->headers->get('Foobar'));
+        $this->assertNull($result->headers->get(Psr6Store::CACHE_DEBUG_HEADER));
     }
 
     public function testRegularLookupWithRemovedBinaryResponse()