Fixing tests inconsistency and complet code

philpichet · philpichet · commit fc7da9031fe4 · 2025-09-05T21:05:45.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
@@ -211,16 +211,16 @@ public function write(Request $request, Response $response): string
 
         // read existing cache entries, remove non-varying, and add this one to the list
         $entries = [];
-        $vary = $response->headers->all('vary');
-        $vary = implode(', ', $vary);
-        foreach ($this->getMetadata($key) as $entry) {
+        $vary = implode(', ', $response->headers->all('vary'));
+        foreach ($this->getMetadata($key) as $entry) {      
             if (!isset($entry[1]['vary'][0])) {
-                $entry[1]['vary'] = [''];
+                $entry[1]['vary'] = [];
             }
 
+            // Get the previous vary change
             $olderVary = [];
-            if (\count($entry[1]['vary']) > 1) {
-                $olderVary = array_filter($entry[1]['vary'], fn ($entryVary) => str_contains($vary, $entryVary));
+            if (\count($entry[1]['vary']) >= 1) {
+                $olderVary = array_filter($entry[1]['vary'], fn ($entryVary) => str_contains($vary, $entryVary) === false);
             }
 
             if (0 !== \count($olderVary) || !$this->requestsMatch($vary ?? '', $entry[0], $storedEnv)) {
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/StoreTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/StoreTest.php
@@ -351,15 +351,15 @@ public function testLoadsBodyEval()
 
     public function testWriteWithMultipleVary()
     {
-        $req1 = Request::create('/foo', 'get', [], [], [], ['HTTP_FOO' => 'bar']);
+        $req1 = Request::create('/foo', 'get', [], [], [], ['HTTP_FOO' => 'foo','HTTP_BAR' => 'bar']);
         $content = str_repeat('a', 24).'b'.str_repeat('a', 24);
         $res1 = new Response($content, 200, ['vary' => ['Foo', 'Bar'], 'X-Body-Eval' => 'SSI']);
         $this->store->write($req1, $res1);
 
         $responseLook = $this->store->lookup($req1);
         $this->assertSame($content, $responseLook->getContent());
 
-        $req2 = Request::create('/foo', 'get', [], [], [], ['HTTP_FOO' => 'foobar']);
+        $req2 = Request::create('/foo', 'get', [], [], [], ['HTTP_FOO' => 'foo','HTTP_BAR' => 'foobar']);
         $content2 = str_repeat('b', 24).'a'.str_repeat('b', 24);
         $res2 = new Response($content2, 200, ['vary' => ['Foo', 'Bar'], 'X-Body-Eval' => 'SSI']);
         $this->store->write($req2, $res2);
