invalidate cache on unsafe methods only if response returns a non error status code

Lctrs · Lctrs · commit 6962aba3e5f3 · 2025-09-29T00:10:33.000+02:00
diff --git a/src/Symfony/Component/HttpClient/CachingHttpClient.php b/src/Symfony/Component/HttpClient/CachingHttpClient.php
@@ -154,12 +154,23 @@ public function request(string $method, string $url, array $options = []): Respo
         $fullUrl = implode('', $fullUrl);
         $fullUrlTag = self::hash($fullUrl);
 
-        if (\in_array($method, self::UNSAFE_METHODS, true)) {
-            $this->cache->invalidateTags([$fullUrlTag]);
-        }
-
         if ('' !== $options['body'] || ($options['extra']['no_cache'] ?? false) || isset($options['normalized_headers']['range']) || !\in_array($method, self::CACHEABLE_METHODS, true)) {
-            return new AsyncResponse($this->client, $method, $url, $options);
+            return new AsyncResponse($this->client, $method, $url, $options, function (ChunkInterface $chunk, AsyncContext $context) use ($method, $fullUrlTag): \Generator {
+                if (null !== $chunk->getError() || $chunk->isTimeout() || !$chunk->isFirst()) {
+                    yield $chunk;
+
+                    return;
+                }
+
+                $statusCode = $context->getStatusCode();
+                if ($statusCode >= 100 && $statusCode < 400 && \in_array($method, self::UNSAFE_METHODS, true)) {
+                    $this->cache->invalidateTags([$fullUrlTag]);
+                }
+
+                $context->passthru();
+
+                yield $chunk;
+            });
         }
 
         $requestHash = self::hash($method.$fullUrl.serialize(array_intersect_key($options['normalized_headers'], self::RESPONSE_INFLUENCING_HEADERS)));
diff --git a/src/Symfony/Component/HttpClient/Tests/CachingHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/CachingHttpClientTest.php
@@ -894,4 +894,53 @@ public function testResponseInfluencingHeadersAffectCacheKey()
         self::assertSame(200, $response->getStatusCode());
         self::assertSame('response for fr', $response->getContent());
     }
+
+    public function testUnsafeInvalidationInBypassFlow()
+    {
+        $mockClient = new MockHttpClient([
+            new MockResponse('initial get', ['http_code' => 200, 'response_headers' => ['Cache-Control' => 'max-age=300']]),
+            new MockResponse('', ['http_code' => 204]),
+            new MockResponse('after invalidate', ['http_code' => 200]),
+        ]);
+
+        $client = new CachingHttpClient($mockClient, $this->cacheAdapter);
+
+        // Warm cache with GET
+        $response = $client->request('GET', 'http://example.com/unsafe-test');
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('initial get', $response->getContent());
+
+        // Unsafe POST with body (bypasses cache but invalidates on success)
+        $client->request('POST', 'http://example.com/unsafe-test', ['body' => 'invalidate']);
+
+        // Next GET should miss cache and fetch new
+        $response = $client->request('GET', 'http://example.com/unsafe-test');
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('after invalidate', $response->getContent());
+    }
+
+    public function testNoInvalidationOnErrorInBypassFlow()
+    {
+        $mockClient = new MockHttpClient([
+            new MockResponse('initial get', ['http_code' => 200, 'response_headers' => ['Cache-Control' => 'max-age=300']]),
+            new MockResponse('server error', ['http_code' => 500]),
+            new MockResponse('should not be fetched'),
+        ]);
+
+        $client = new CachingHttpClient($mockClient, $this->cacheAdapter);
+
+        // Warm cache with GET
+        $response = $client->request('GET', 'http://example.com/no-invalidate-test');
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('initial get', $response->getContent());
+
+        // Unsafe POST with body (bypasses cache, but 500 shouldn't invalidate)
+        $response = $client->request('POST', 'http://example.com/no-invalidate-test', ['body' => 'no invalidate']);
+        self::assertSame(500, $response->getStatusCode());
+
+        // Next GET should hit cache
+        $response = $client->request('GET', 'http://example.com/no-invalidate-test');
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('initial get', $response->getContent());
+    }
 }
