symfony · nicolas-grekas · Jun 5, 2025 · Jun 3, 2025 · Jun 4, 2025 · Jun 4, 2025
diff --git a/.github/patch-types.php b/.github/patch-types.php
@@ -44,7 +44,6 @@
         case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/BadClasses/MissingParent.php'):
         case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/'):
         case false !== strpos($file, '/src/Symfony/Component/ErrorHandler/Tests/Fixtures/'):
-        case false !== strpos($file, '/src/Symfony/Component/HttpClient/Internal/') && str_contains($file, 'V4'):
         case false !== strpos($file, '/src/Symfony/Component/PropertyInfo/Tests/Fixtures/'):
         case false !== strpos($file, '/src/Symfony/Component/Runtime/Internal/ComposerPlugin.php'):
         case false !== strpos($file, '/src/Symfony/Component/Security/Http/Tests/Fixtures/IsGrantedAttributeMethodsWithClosureController.php'):

diff --git a/UPGRADE-8.0.md b/UPGRADE-8.0.md
@@ -6,6 +6,12 @@ release process, both versions have the same features, but Symfony 8.0 doesn't i
 To upgrade, make sure to resolve all deprecation notices.
 Read more about this in the [Symfony documentation](https://symfony.com/doc/8.0/setup/upgrade_major.html).
 
+HttpClient
+----------
+
+ * Remove support for amphp/http-client < 5
+ * Remove setLogger() methods on decorators; configure the logger on the wrapped client directly instead
+
 TwigBridge
 ----------
 

diff --git a/composer.json b/composer.json
@@ -124,8 +124,8 @@
         "symfony/yaml": "self.version"
     },
     "require-dev": {
-        "amphp/http-client": "^4.2.1|^5.0",
-        "amphp/http-tunnel": "^1.0|^2.0",
+        "amphp/http-client": "^5.0",
+        "amphp/http-tunnel": "^2.0",
         "async-aws/ses": "^1.0",
         "async-aws/sqs": "^1.0|^2.0",
         "async-aws/sns": "^1.0",
@@ -153,7 +153,6 @@
         "psr/http-client": "^1.0",
         "psr/simple-cache": "^1.0|^2.0|^3.0",
         "seld/jsonlint": "^1.10",
-        "symfony/amphp-http-client-meta": "^1.0|^2.0",
         "symfony/mercure-bundle": "^0.3",
         "symfony/phpunit-bridge": "^7.4|^8.0",
         "symfony/runtime": "self.version",
@@ -166,7 +165,7 @@
     },
     "conflict": {
         "ext-psr": "<1.1|>=2",
-        "amphp/amp": "<2.5",
+        "amphp/amp": "<3",
         "async-aws/core": "<1.5",
         "doctrine/collections": "<1.8",
         "doctrine/dbal": "<3.6",

diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Test;
 
-use PHPUnit\Framework\Attributes\AfterClass;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
@@ -40,6 +39,14 @@ protected function tearDown(): void
         static::$booted = false;
     }
 
+    public static function tearDownAfterClass(): void
+    {
+        static::ensureKernelShutdown();
+        static::$class = null;
+        static::$kernel = null;
+        static::$booted = false;
+    }
+
     /**
      * @throws \RuntimeException
      * @throws \LogicException
@@ -113,11 +120,8 @@ protected static function createKernel(array $options = []): KernelInterface
 
     /**
      * Shuts the kernel down if it was used in the test - called by the tearDown method by default.
-     *
-     * @afterClass
      */
-    #[AfterClass]
-    public static function ensureKernelShutdown()
+    protected static function ensureKernelShutdown()
     {
         if (null !== static::$kernel) {
             static::$kernel->boot();

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/routing/profiler.php b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/routing/profiler.php
@@ -16,7 +16,7 @@
     foreach (debug_backtrace(\DEBUG_BACKTRACE_PROVIDE_OBJECT) as $trace) {
         if (isset($trace['object']) && $trace['object'] instanceof XmlFileLoader && 'doImport' === $trace['function']) {
             if (__DIR__ === dirname(realpath($trace['args'][3]))) {
-                trigger_deprecation('symfony/routing', '7.3', 'The "profiler.xml" routing configuration file is deprecated, import "profile.php" instead.');
+                trigger_deprecation('symfony/routing', '7.3', 'The "profiler.xml" routing configuration file is deprecated, import "profiler.php" instead.');
 
                 break;
             }

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/routing/wdt.php b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/routing/wdt.php
@@ -16,7 +16,7 @@
     foreach (debug_backtrace(\DEBUG_BACKTRACE_PROVIDE_OBJECT) as $trace) {
         if (isset($trace['object']) && $trace['object'] instanceof XmlFileLoader && 'doImport' === $trace['function']) {
             if (__DIR__ === dirname(realpath($trace['args'][3]))) {
-                trigger_deprecation('symfony/routing', '7.3', 'The "xdt.xml" routing configuration file is deprecated, import "xdt.php" instead.');
+                trigger_deprecation('symfony/routing', '7.3', 'The "wdt.xml" routing configuration file is deprecated, import "wdt.php" instead.');
 
                 break;
             }

diff --git a/src/Symfony/Component/HttpClient/AmpHttpClient.php b/src/Symfony/Component/HttpClient/AmpHttpClient.php
@@ -12,28 +12,24 @@
 namespace Symfony\Component\HttpClient;
 
 use Amp\CancelledException;
-use Amp\DeferredFuture;
 use Amp\Http\Client\DelegateHttpClient;
 use Amp\Http\Client\InterceptedHttpClient;
 use Amp\Http\Client\PooledHttpClient;
 use Amp\Http\Client\Request;
-use Amp\Http\HttpMessage;
 use Amp\Http\Tunnel\Http1TunnelConnector;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
 use Symfony\Component\HttpClient\Exception\TransportException;
-use Symfony\Component\HttpClient\Internal\AmpClientStateV4;
-use Symfony\Component\HttpClient\Internal\AmpClientStateV5;
-use Symfony\Component\HttpClient\Response\AmpResponseV4;
-use Symfony\Component\HttpClient\Response\AmpResponseV5;
+use Symfony\Component\HttpClient\Internal\AmpClientState;
+use Symfony\Component\HttpClient\Response\AmpResponse;
 use Symfony\Component\HttpClient\Response\ResponseStream;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 use Symfony\Contracts\HttpClient\ResponseStreamInterface;
 use Symfony\Contracts\Service\ResetInterface;
 
 if (!interface_exists(DelegateHttpClient::class)) {
-    throw new \LogicException('You cannot use "Symfony\Component\HttpClient\AmpHttpClient" as the "amphp/http-client" package is not installed. Try running "composer require amphp/http-client:^4.2.1".');
+    throw new \LogicException('You cannot use "Symfony\Component\HttpClient\AmpHttpClient" as the "amphp/http-client" package is not installed. Try running "composer require amphp/http-client:^5".');
 }
 
 /**
@@ -52,7 +48,7 @@ final class AmpHttpClient implements HttpClientInterface, LoggerAwareInterface,
 
     private array $defaultOptions = self::OPTIONS_DEFAULTS;
     private static array $emptyDefaults = self::OPTIONS_DEFAULTS;
-    private AmpClientStateV4|AmpClientStateV5 $multi;
+    private AmpClientState $multi;
 
     /**
      * @param array         $defaultOptions     Default requests' options
@@ -71,14 +67,7 @@ public function __construct(array $defaultOptions = [], ?callable $clientConfigu
             [, $this->defaultOptions] = self::prepareRequest(null, null, $defaultOptions, $this->defaultOptions);
         }
 
-        if (is_subclass_of(Request::class, HttpMessage::class)) {
-            $this->multi = new AmpClientStateV5($clientConfigurator, $maxHostConnections, $maxPendingPushes, $this->logger);
-        } else {
-            if (\PHP_VERSION_ID >= 80400) {
-                trigger_deprecation('symfony/http-client', '7.4', 'Using amphp/http-client < 5 is deprecated. Try running "composer require amphp/http-client:^5".');
-            }
-            $this->multi = new AmpClientStateV4($clientConfigurator, $maxHostConnections, $maxPendingPushes, $this->logger);
-        }
+        $this->multi = new AmpClientState($clientConfigurator, $maxHostConnections, $maxPendingPushes, $this->logger);
     }
 
     /**
@@ -139,10 +128,9 @@ public function request(string $method, string $url, array $options = []): Respo
             $request->addHeader($h[0], $h[1]);
         }
 
-        $coef = $request instanceof HttpMessage ? 1 : 1000;
-        $request->setTcpConnectTimeout($coef * $options['timeout']);
-        $request->setTlsHandshakeTimeout($coef * $options['timeout']);
-        $request->setTransferTimeout($coef * $options['max_duration']);
+        $request->setTcpConnectTimeout($options['timeout']);
+        $request->setTlsHandshakeTimeout($options['timeout']);
+        $request->setTransferTimeout($options['max_duration']);
         if (method_exists($request, 'setInactivityTimeout')) {
             $request->setInactivityTimeout(0);
         }
@@ -153,24 +141,16 @@ public function request(string $method, string $url, array $options = []): Respo
             $request->setHeader('Authorization', 'Basic '.base64_encode(implode(':', $auth)));
         }
 
-        if ($request instanceof HttpMessage) {
-            return new AmpResponseV5($this->multi, $request, $options, $this->logger);
-        }
-
-        return new AmpResponseV4($this->multi, $request, $options, $this->logger);
+        return new AmpResponse($this->multi, $request, $options, $this->logger);
     }
 
     public function stream(ResponseInterface|iterable $responses, ?float $timeout = null): ResponseStreamInterface
     {
-        if ($responses instanceof AmpResponseV4 || $responses instanceof AmpResponseV5) {
+        if ($responses instanceof AmpResponse) {
             $responses = [$responses];
         }
 
-        if ($this->multi instanceof AmpClientStateV5) {
-            return new ResponseStream(AmpResponseV5::stream($responses, $timeout));
-        }
-
-        return new ResponseStream(AmpResponseV4::stream($responses, $timeout));
+        return new ResponseStream(AmpResponse::stream($responses, $timeout));
     }
 
     public function reset(): void
@@ -179,11 +159,7 @@ public function reset(): void
 
         foreach ($this->multi->pushedResponses as $pushedResponses) {
             foreach ($pushedResponses as [$pushedUrl, $pushDeferred]) {
-                if ($pushDeferred instanceof DeferredFuture) {
-                    $pushDeferred->error(new CancelledException());
-                } else {
-                    $pushDeferred->fail(new CancelledException());
-                }
+                $pushDeferred->fail(new CancelledException());
 
                 $this->logger?->debug(\sprintf('Unused pushed response: "%s"', $pushedUrl));
             }

diff --git a/src/Symfony/Component/HttpClient/CHANGELOG.md b/src/Symfony/Component/HttpClient/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+8.0
+---
+
+ * Remove support for amphp/http-client < 5
+ * Remove setLogger() methods on decorators; configure the logger on the wrapped client directly instead
+
 7.4
 ---
 

diff --git a/...mponent/HttpClient/Internal/AmpBodyV5.php → ...Component/HttpClient/Internal/AmpBody.php b/...mponent/HttpClient/Internal/AmpBodyV5.php → ...Component/HttpClient/Internal/AmpBody.php
@@ -24,7 +24,7 @@
  *
  * @internal
  */
-class AmpBodyV5 implements HttpContent, ReadableStream, \IteratorAggregate
+class AmpBody implements HttpContent, ReadableStream, \IteratorAggregate
 {
     private ReadableStream $body;
     private ?string $content;

diff --git a/src/Symfony/Component/HttpClient/Internal/AmpBodyV4.php b/src/Symfony/Component/HttpClient/Internal/AmpBodyV4.php