Merge branch '7.4' into 8.0

alexandre-daubois · alexandre-daubois · commit aabe16ed91f0 · 2025-10-29T08:48:08.000+01:00
* 7.4:
  Fix the initialization of the phpunit bridge
  [FrameworkBundle] Simplify wiring of scoped clients
  Bump Symfony version to 7.3.6
  Update VERSION for 7.3.5
  Update CHANGELOG for 7.3.5
  Bump Symfony version to 6.4.28
  Update VERSION for 6.4.27
  Update CONTRIBUTORS for 6.4.27
  Update CHANGELOG for 6.4.27
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -2735,47 +2735,52 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
             $retryOptions = $scopeConfig['retry_failed'] ?? ['enabled' => false];
             unset($scopeConfig['retry_failed']);
 
-            $transport = $name.'.transport';
-            $container->register($transport, HttpClientInterface::class)
+            // This "transport" service is decorated in the following order:
+            // 1. ThrottlingHttpClient (30) -> throttles requests
+            // 2. UriTemplateHttpClient (25) -> expands URI templates
+            // 3. ScopingHttpClient (20) -> resolves relative URLs and applies scope configuration
+            // 4. CachingHttpClient (15) -> caches responses
+            // 5. RetryableHttpClient (10) -> retries requests
+            // 6. TraceableHttpClient (5) -> traces requests
+            $container->register($name, HttpClientInterface::class)
                 ->setFactory('current')
                 ->setArguments([[new Reference('http_client.transport')]])
+                ->addTag('http_client.client')
             ;
 
+            $scopingDefinition = $container->register($name.'.scoping', ScopingHttpClient::class)
+                ->setDecoratedService($name, null, 20)
+                ->addTag('kernel.reset', ['method' => 'reset', 'on_invalid' => 'ignore']);
+
             if (null === $scope) {
                 $baseUri = $scopeConfig['base_uri'];
                 unset($scopeConfig['base_uri']);
 
-                $container->register($name, ScopingHttpClient::class)
+                $scopingDefinition
                     ->setFactory([ScopingHttpClient::class, 'forBaseUri'])
-                    ->setArguments([new Reference($transport), $baseUri, $scopeConfig])
-                    ->addTag('http_client.client')
-                    ->addTag('kernel.reset', ['method' => 'reset', 'on_invalid' => 'ignore'])
-                ;
+                    ->setArguments([new Reference('.inner'), $baseUri, $scopeConfig]);
             } else {
-                $container->register($name, ScopingHttpClient::class)
-                    ->setArguments([new Reference($transport), [$scope => $scopeConfig], $scope])
-                    ->addTag('http_client.client')
-                    ->addTag('kernel.reset', ['method' => 'reset', 'on_invalid' => 'ignore'])
-                ;
+                $scopingDefinition
+                    ->setArguments([new Reference('.inner'), [$scope => $scopeConfig], $scope]);
             }
 
             if ($this->readConfigEnabled('http_client.scoped_clients.'.$name.'.caching', $container, $cachingOptions)) {
-                $this->registerCachingHttpClient($cachingOptions, $scopeConfig, $transport, $container);
+                $this->registerCachingHttpClient($cachingOptions, $scopeConfig, $name, $container);
             }
 
             if (null !== $rateLimiter) {
-                $this->registerThrottlingHttpClient($rateLimiter, $transport, $container);
+                $this->registerThrottlingHttpClient($rateLimiter, $name, $container);
             }
 
             if ($this->readConfigEnabled('http_client.scoped_clients.'.$name.'.retry_failed', $container, $retryOptions)) {
-                $this->registerRetryableHttpClient($retryOptions, $transport, $container);
+                $this->registerRetryableHttpClient($retryOptions, $name, $container);
             }
 
             $container
                 ->register($name.'.uri_template', UriTemplateHttpClient::class)
-                ->setDecoratedService($name, null, 7) // After TraceableHttpClient (5) and on top of ScopingHttpClient
+                ->setDecoratedService($name, null, 25)
                 ->setArguments([
-                    new Reference($name.'.uri_template.inner'),
+                    new Reference('.inner'),
                     new Reference('http_client.uri_template_expander', ContainerInterface::NULL_ON_INVALID_REFERENCE),
                     $defaultUriTemplateVars,
                 ]);
@@ -2799,7 +2804,7 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
 
         if ($responseFactoryId = $config['mock_response_factory'] ?? null) {
             $container->register('http_client.mock_client', MockHttpClient::class)
-                ->setDecoratedService('http_client.transport', null, -10)  // lower priority than TraceableHttpClient (5)
+                ->setDecoratedService('http_client.transport', null, -10)
                 ->setArguments([new Reference($responseFactoryId)]);
         }
     }
@@ -2812,9 +2817,9 @@ private function registerCachingHttpClient(array $options, array $defaultOptions
 
         $container
             ->register($name.'.caching', CachingHttpClient::class)
-            ->setDecoratedService($name, null, 13) // between RetryableHttpClient (10) and ThrottlingHttpClient (15)
+            ->setDecoratedService($name, null,  15)
             ->setArguments([
-                new Reference($name.'.caching.inner'),
+                new Reference('.inner'),
                 new Reference($options['cache_pool']),
                 $defaultOptions,
                 $options['shared'],
@@ -2833,8 +2838,8 @@ private function registerThrottlingHttpClient(string $rateLimiter, string $name,
 
         $container
             ->register($name.'.throttling', ThrottlingHttpClient::class)
-            ->setDecoratedService($name, null, 15) // higher priority than RetryableHttpClient (10)
-            ->setArguments([new Reference($name.'.throttling.inner'), new Reference($name.'.throttling.limiter')]);
+            ->setDecoratedService($name, null, 30)
+            ->setArguments([new Reference('.inner'), new Reference($name.'.throttling.limiter')]);
     }
 
     private function registerRetryableHttpClient(array $options, string $name, ContainerBuilder $container): void
@@ -2865,8 +2870,8 @@ private function registerRetryableHttpClient(array $options, string $name, Conta
 
         $container
             ->register($name.'.retryable', RetryableHttpClient::class)
-            ->setDecoratedService($name, null, 10) // higher priority than TraceableHttpClient (5)
-            ->setArguments([new Reference($name.'.retryable.inner'), $retryStrategy, $options['max_retries'], new Reference('logger')])
+            ->setDecoratedService($name, null, 10)
+            ->setArguments([new Reference('.inner'), $retryStrategy, $options['max_retries'], new Reference('logger')])
             ->addTag('monolog.logger', ['channel' => 'http_client']);
     }
 
diff --git a/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -58,7 +58,6 @@
 use Symfony\Component\HttpClient\Exception\ChunkCacheItemNotFoundException;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\RetryableHttpClient;
-use Symfony\Component\HttpClient\ScopingHttpClient;
 use Symfony\Component\HttpClient\ThrottlingHttpClient;
 use Symfony\Component\HttpFoundation\IpUtils;
 use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;
@@ -107,6 +106,7 @@
 use Symfony\Component\Workflow\WorkflowEvents;
 use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\TagAwareCacheInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 abstract class FrameworkExtensionTestCase extends TestCase
 {
@@ -2210,16 +2210,16 @@ public function testHttpClientDefaultOptions()
 
         $this->assertTrue($container->hasDefinition('foo'), 'should have the "foo" service.');
         $definition = $container->getDefinition('foo');
-        $this->assertSame(ScopingHttpClient::class, $definition->getClass());
-        $this->assertTrue($definition->hasTag('kernel.reset'));
+        $this->assertSame(HttpClientInterface::class, $definition->getClass());
+        $this->assertTrue($definition->hasTag('http_client.client'));
     }
 
     public function testScopedHttpClientWithoutQueryOption()
     {
         $container = $this->createContainerFromFile('http_client_scoped_without_query_option');
 
         $this->assertTrue($container->hasDefinition('foo'), 'should have the "foo" service.');
-        $this->assertSame(ScopingHttpClient::class, $container->getDefinition('foo')->getClass());
+        $this->assertSame(HttpClientInterface::class, $container->getDefinition('foo')->getClass());
     }
 
     public function testHttpClientOverrideDefaultOptions()
@@ -2229,7 +2229,7 @@ public function testHttpClientOverrideDefaultOptions()
         $this->assertSame(['foo' => 'bar'], $container->getDefinition('http_client.transport')->getArgument(0)['headers']);
         $this->assertSame(['foo' => 'bar'], $container->getDefinition('http_client.transport')->getArgument(0)['extra']);
         $this->assertSame(4, $container->getDefinition('http_client.transport')->getArgument(1));
-        $this->assertSame('http://example.com', $container->getDefinition('foo')->getArgument(1));
+        $this->assertSame('http://example.com', $container->getDefinition('foo.scoping')->getArgument(1));
 
         $expected = [
             'headers' => [
@@ -2241,7 +2241,7 @@ public function testHttpClientOverrideDefaultOptions()
             'query' => [],
             'resolve' => [],
         ];
-        $this->assertEquals($expected, $container->getDefinition('foo')->getArgument(2));
+        $this->assertEquals($expected, $container->getDefinition('foo.scoping')->getArgument(2));
     }
 
     public function testCachingHttpClient()
@@ -2258,26 +2258,26 @@ public function testCachingHttpClient()
         $this->assertSame('http_client', $definition->getDecoratedService()[0]);
         $this->assertCount(5, $arguments = $definition->getArguments());
         $this->assertInstanceOf(Reference::class, $arguments[0]);
-        $this->assertSame('http_client.caching.inner', (string) $arguments[0]);
+        $this->assertSame('.inner', (string) $arguments[0]);
         $this->assertInstanceOf(Reference::class, $arguments[1]);
         $this->assertSame('foo', (string) $arguments[1]);
         $this->assertArrayHasKey('headers', $arguments[2]);
         $this->assertSame(['X-powered' => 'PHP'], $arguments[2]['headers']);
         $this->assertFalse($arguments[3]);
         $this->assertSame(2, $arguments[4]);
 
-        $this->assertTrue($container->hasDefinition('bar.transport.caching'));
-        $definition = $container->getDefinition('bar.transport.caching');
+        $this->assertTrue($container->hasDefinition('bar.caching'));
+        $definition = $container->getDefinition('bar.caching');
         $this->assertSame(CachingHttpClient::class, $definition->getClass());
         $arguments = $definition->getArguments();
         $this->assertInstanceOf(Reference::class, $arguments[0]);
-        $this->assertSame('bar.transport.caching.inner', (string) $arguments[0]);
+        $this->assertSame('.inner', (string) $arguments[0]);
         $this->assertInstanceOf(Reference::class, $arguments[1]);
         $this->assertSame('baz', (string) $arguments[1]);
-        $scopedClient = $container->getDefinition('bar');
+        $scopedClient = $container->getDefinition('bar.scoping');
 
-        $this->assertSame('bar.transport', (string) $scopedClient->getArgument(0));
-        $this->assertNull($scopedClient->getDecoratedService());
+        $this->assertSame('.inner', (string) $scopedClient->getArgument(0));
+        $this->assertSame('bar', $scopedClient->getDecoratedService()[0]);
     }
 
     public function testHttpClientRetry()
@@ -2291,8 +2291,8 @@ public function testHttpClientRetry()
         $this->assertSame(0.3, $container->getDefinition('http_client.retry_strategy')->getArgument(4));
         $this->assertSame(2, $container->getDefinition('http_client.retryable')->getArgument(2));
 
-        $this->assertSame(RetryableHttpClient::class, $container->getDefinition('foo.transport.retryable')->getClass());
-        $this->assertSame(4, $container->getDefinition('foo.transport.retry_strategy')->getArgument(2));
+        $this->assertSame(RetryableHttpClient::class, $container->getDefinition('foo.retryable')->getClass());
+        $this->assertSame(4, $container->getDefinition('foo.retry_strategy')->getArgument(2));
     }
 
     public function testHttpClientWithQueryParameterKey()
@@ -2302,12 +2302,12 @@ public function testHttpClientWithQueryParameterKey()
         $expected = [
             'key' => 'foo',
         ];
-        $this->assertSame($expected, $container->getDefinition('foo')->getArgument(2)['query']);
+        $this->assertSame($expected, $container->getDefinition('foo.scoping')->getArgument(2)['query']);
 
         $expected = [
             'host' => '127.0.0.1',
         ];
-        $this->assertSame($expected, $container->getDefinition('foo')->getArgument(2)['resolve']);
+        $this->assertSame($expected, $container->getDefinition('foo.scoping')->getArgument(2)['resolve']);
     }
 
     public function testHttpClientFullDefaultOptions()
@@ -2353,19 +2353,19 @@ public function testHttpClientRateLimiter()
         $this->assertSame('http_client', $definition->getDecoratedService()[0]);
         $this->assertCount(2, $arguments = $definition->getArguments());
         $this->assertInstanceOf(Reference::class, $arguments[0]);
-        $this->assertSame('http_client.throttling.inner', (string) $arguments[0]);
+        $this->assertSame('.inner', (string) $arguments[0]);
         $this->assertInstanceOf(Reference::class, $arguments[1]);
         $this->assertSame('http_client.throttling.limiter', (string) $arguments[1]);
 
-        $this->assertTrue($container->hasDefinition('foo.transport.throttling'));
-        $definition = $container->getDefinition('foo.transport.throttling');
+        $this->assertTrue($container->hasDefinition('foo.throttling'));
+        $definition = $container->getDefinition('foo.throttling');
         $this->assertSame(ThrottlingHttpClient::class, $definition->getClass());
-        $this->assertSame('foo.transport', $definition->getDecoratedService()[0]);
+        $this->assertSame('foo', $definition->getDecoratedService()[0]);
         $this->assertCount(2, $arguments = $definition->getArguments());
         $this->assertInstanceOf(Reference::class, $arguments[0]);
-        $this->assertSame('foo.transport.throttling.inner', (string) $arguments[0]);
+        $this->assertSame('.inner', (string) $arguments[0]);
         $this->assertInstanceOf(Reference::class, $arguments[1]);
-        $this->assertSame('foo.transport.throttling.limiter', (string) $arguments[1]);
+        $this->assertSame('foo.throttling.limiter', (string) $arguments[1]);
     }
 
     public static function provideMailer(): iterable
