rebase to branch 7.4

Lctrs · Lctrs · commit 17d0fdcafb26 · 2025-08-27T23:54:58.000+02:00
diff --git a/UPGRADE-7.3.md b/UPGRADE-7.3.md
@@ -136,11 +136,6 @@ FrameworkBundle
        prefix: /webhook
    ```
 
-HttpClient
-----------
-
- * Deprecate passing an instance of `StoreInterface` as `$cache` argument to `CachingHttpClient` constructor
-
 HttpFoundation
 --------------
 
@@ -418,4 +413,4 @@ Workflow
            $workflow = $this->workflows->get($event->getWorkflowName());
        }
    }
-   ```
+   ```
diff --git a/UPGRADE-7.4.md b/UPGRADE-7.4.md
@@ -56,6 +56,7 @@ HttpClient
 ----------
 
  * Deprecate using amphp/http-client < 5
+ * Deprecate passing an instance of `StoreInterface` as `$cache` argument to `CachingHttpClient` constructor
 
 HttpFoundation
 --------------
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG
  * Deprecate `Symfony\Bundle\FrameworkBundle\Console\Application::add()` in favor of `Symfony\Bundle\FrameworkBundle\Console\Application::addCommand()`
  * Add `assertEmailAddressNotContains()` to the `MailerAssertionsTrait`
  * Add `framework.type_info.aliases` option
+ * Add support for configuring the `CachingHttpClient`
 
 7.3
 ---
@@ -66,7 +67,6 @@ CHANGELOG
  * Make `ValidatorCacheWarmer` use `kernel.build_dir` instead of `cache_dir`
  * Make `SerializeCacheWarmer` use `kernel.build_dir` instead of `cache_dir`
  * Support executing custom workflow validators during container compilation
- * Add support for configuring the `CachingHttpClient`
 
 7.2
 ---
diff --git a/src/Symfony/Component/HttpClient/CHANGELOG.md b/src/Symfony/Component/HttpClient/CHANGELOG.md
@@ -5,13 +5,13 @@ CHANGELOG
 ---
 
  * Deprecate using amphp/http-client < 5
+ * Add RFC 9111–based caching support to `CachingHttpClient`
 
 7.3
 ---
 
  * Add IPv6 support to `NativeHttpClient`
  * Allow using HTTP/3 with the `CurlHttpClient`
- * Add RFC 9111–based caching support to `CachingHttpClient`
 
 7.2
 ---
