Always replay cookies

src/SymfonyCache/HeaderReplaySubscriber.php

@@ -102,6 +102,9 @@ public function preHandle(CacheEvent $event)
             $this->replayHeaders($preflightResponse, $request);
         }
 
+        // Replay Set-Cookie headers (behave like a browser)
+        $this->replayCookieHeaders($preflightResponse, $request);
+
         // The original request now has our decorated/replayed headers if
         // applicable and the kernel can continue normally
     }
@@ -139,9 +142,6 @@ private function replayHeaders(Response $preflightResponse, Request $request)
             }
         }
 
-        // Replay Set-Cookie headers (behave like a browser)
-        $this->replayCookieHeaders($preflightResponse, $request);
-
         // Force no cache
         if ($preflightResponse->headers->has(HeaderReplayListener::FORCE_NO_CACHE_HEADER_NAME)) {
             $request->headers->addCacheControlDirective('no-cache');

tests/SymfonyCache/HeaderReplaySubscriberTest.php

@@ -169,8 +169,14 @@ public function testKernelIsCorrectlyCalledWithPreflightAcceptHeader()
      * @param Response $response
      * @dataProvider noHeadersAddedAndEarlyResponseIfResponseIsNotACorrectPreflightResponse
      */
-    public function testNoHeadersAddedIfResponseIsNotACorrectPreflightResponse(Response $response)
+    public function testNoHeadersAddedButCookiesAreReplayedIfResponseIsNotACorrectPreflightResponse(Response $response)
     {
+        $validCookie = new Cookie('i-am-valid', 'foobar', time() + 5000);
+        $expiredCookie = new Cookie('i-am-expired', 'foobar', 0);
+
+        $response->headers->setCookie($validCookie);
+        $response->headers->setCookie($expiredCookie);
+
         $kernel = $this->createMock(HttpCache::class);
         $kernel
             ->expects($this->once())
@@ -198,6 +204,10 @@ public function testNoHeadersAddedIfResponseIsNotACorrectPreflightResponse(Respo
         // Assert response was not set to event but instead just left for
         // the kernel to be handled
         $this->assertNull($cacheEvent->getResponse());
+
+        // Assert cookies correctly replayed
+        $this->assertSame('foobar', $request->cookies->get('i-am-valid'));
+        $this->assertFalse($request->cookies->has('i-am-expired'));
     }
 
     public function testReplayHeaders()