Fixed issue with wrong vary key when unsetting cookies on the Symfony request instance

Author: Toflar

src/Psr6Store.php

@@ -424,14 +424,27 @@ public function getVaryKey(array $vary, Request $request)
             return self::NON_VARYING_KEY;
         }
 
+        // Normalize
+        $vary = array_map('strtolower', $vary);
         sort($vary);
 
         $hashData = '';
 
         foreach ($vary as $headerName) {
+            if ('cookie' === $headerName) {
+                continue;
+            }
+
             $hashData .= $headerName.':'.$request->headers->get($headerName);
         }
 
+        if (\in_array('cookie', $vary, true)) {
+            $hashData .= 'cookies:';
+            foreach ($request->cookies->all() as $k => $v) {
+                $hashData .= $k.'='.$v;
+            }
+        }
+
         return hash('sha256', $hashData);
     }
 

tests/Psr6StoreTest.php

@@ -18,6 +18,7 @@
 use Symfony\Component\Cache\Adapter\RedisAdapter;
 use Symfony\Component\Cache\Adapter\TagAwareAdapter;
 use Symfony\Component\Cache\Adapter\TagAwareAdapterInterface;
+use Symfony\Component\HttpFoundation\Cookie;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Lock\Exception\LockReleasingException;
@@ -334,6 +335,26 @@ public function testRegularLookup()
         $this->assertSame('whatever', $result->headers->get('Foobar'));
     }
 
+    public function testLookupWithVaryOnCookies()
+    {
+        // Cookies match
+        $request = Request::create('https://foobar.com/', 'GET', [], ['Foo' => 'Bar'], [], ['HTTP_COOKIE' => 'Foo=Bar']);
+        $response = new Response('hello world', 200, ['Vary' => 'Cookie']);
+        $response->headers->setCookie(Cookie::create('Foo', 'Bar'));
+
+        $this->store->write($request, $response);
+
+        $result = $this->store->lookup($request);
+        $this->assertInstanceOf(Response::class, $result);
+
+        // Cookies do not match (manually removed on request)
+        $request = Request::create('https://foobar.com/', 'GET', [], ['Foo' => 'Bar'], [], ['HTTP_COOKIE' => 'Foo=Bar']);
+        $request->cookies->remove('Foo');
+
+        $result = $this->store->lookup($request);
+        $this->assertNull($result);
+    }
+
     public function testLookupWithEmptyCache()
     {
         $request = Request::create('https://foobar.com/');