disable range support again + other reviews

Lctrs · Lctrs · commit c81927d4ae22 · 2025-09-08T23:40:38.000+02:00
diff --git a/src/Symfony/Component/HttpClient/CHANGELOG.md b/src/Symfony/Component/HttpClient/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * Deprecate using amphp/http-client < 5
  * Add RFC 9111–based caching support to `CachingHttpClient`
+ * Deprecate passing an instance of `StoreInterface` as `$cache` argument to `CachingHttpClient` constructor
 
 7.3
 ---
diff --git a/src/Symfony/Component/HttpClient/CachingHttpClient.php b/src/Symfony/Component/HttpClient/CachingHttpClient.php
@@ -34,10 +34,12 @@
  * Adds caching on top of an HTTP client (per RFC 9111).
  *
  * Known omissions / partially supported features per RFC 9111:
- *   1. stale-while-revalidate:
+ *   1. Range requests:
+ *     - All range requests ("partial content") are passed through and never cached.
+ *   2. stale-while-revalidate:
  *     - There's no actual "background revalidation" for stale responses, they will
  *       always be revalidated.
- *   2. min-fresh, max-stale, only-if-cached:
+ *   3. min-fresh, max-stale, only-if-cached:
  *     - Request directives are not parsed; the client ignores them.
  *
  * @see https://www.rfc-editor.org/rfc/rfc9111
@@ -78,7 +80,6 @@ class CachingHttpClient implements HttpClientInterface, ResetInterface
         'cookie' => true,
         'expect' => true,
         'host' => true,
-        'range' => true,
         'user-agent' => true,
     ];
     /**
@@ -114,7 +115,7 @@ public function __construct(
         private readonly ?int $maxTtl = null,
     ) {
         if ($cache instanceof StoreInterface) {
-            trigger_deprecation('symfony/http-client', '7.3', 'Passing a "%s" as constructor\'s 2nd argument of "%s" is deprecated, "%s" expected.', StoreInterface::class, __CLASS__, TagAwareCacheInterface::class);
+            trigger_deprecation('symfony/http-client', '7.4', 'Passing a "%s" as constructor\'s 2nd argument of "%s" is deprecated, "%s" expected.', StoreInterface::class, __CLASS__, TagAwareCacheInterface::class);
 
             if (!class_exists(HttpClientKernel::class)) {
                 throw new \LogicException(\sprintf('Using "%s" requires the HttpKernel component, try running "composer require symfony/http-kernel".', __CLASS__));
@@ -157,11 +158,11 @@ public function request(string $method, string $url, array $options = []): Respo
             $this->cache->invalidateTags([$fullUrlTag]);
         }
 
-        if ('' !== $options['body'] || ($options['extra']['no_cache'] ?? false) || !\in_array($method, self::CACHEABLE_METHODS, true)) {
+        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);
         }
 
-        $requestHash = self::hash($method.$fullUrl.json_encode(array_intersect_key($options['normalized_headers'], self::RESPONSE_INFLUENCING_HEADERS), \JSON_THROW_ON_ERROR));
+        $requestHash = self::hash($method.$fullUrl.serialize(array_intersect_key($options['normalized_headers'], self::RESPONSE_INFLUENCING_HEADERS)));
         $varyKey = "vary_{$requestHash}";
         $varyFields = $this->cache->get($varyKey, static function (ItemInterface $item, bool &$save): array {
             $save = false;
