[HttpClient] Fix caching client docrating scoping client

pierredup · pierredup · commit 5bb89188e935 · 2025-10-27T08:07:06.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2943,19 +2943,31 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
     private function registerCachingHttpClient(array $options, array $defaultOptions, string $name, ContainerBuilder $container): void
     {
         if (!class_exists(ChunkCacheItemNotFoundException::class)) {
-            throw new LogicException('Caching cannot be enabled as version 7.3+ of the HttpClient component is required.');
+            throw new LogicException('Caching cannot be enabled as version 7.4+ of the HttpClient component is required.');
         }
 
         $container
             ->register($name.'.caching', CachingHttpClient::class)
-            ->setDecoratedService($name, null, 13) // between RetryableHttpClient (10) and ThrottlingHttpClient (15)
             ->setArguments([
                 new Reference($name.'.caching.inner'),
                 new Reference($options['cache_pool']),
                 $defaultOptions,
                 $options['shared'],
                 $options['max_ttl'],
             ]);
+
+        $httpClient = $container->getDefinition($name);
+
+        if (ScopingHttpClient::class === $httpClient->getClass()) {
+            $httpClient->setDecoratedService($name.'.caching', null, 13); // between RetryableHttpClient (10) and ThrottlingHttpClient (15)
+
+            $container->getDefinition($name.'.caching')
+                ->replaceArgument(0, $httpClient->getArgument(0));
+        } else {
+            $container
+                ->getDefinition($name.'.caching')
+                ->setDecoratedService($name, null, 13); // between RetryableHttpClient (10) and ThrottlingHttpClient (15)
+        }
     }
 
     private function registerThrottlingHttpClient(string $rateLimiter, string $name, ContainerBuilder $container): void
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -2298,12 +2298,15 @@ public function testCachingHttpClient()
         $this->assertTrue($container->hasDefinition('bar.caching'));
         $definition = $container->getDefinition('bar.caching');
         $this->assertSame(CachingHttpClient::class, $definition->getClass());
-        $this->assertSame('bar', $definition->getDecoratedService()[0]);
         $arguments = $definition->getArguments();
         $this->assertInstanceOf(Reference::class, $arguments[0]);
-        $this->assertSame('bar.caching.inner', (string) $arguments[0]);
+        $this->assertSame('http_client.transport', (string) $arguments[0]);
         $this->assertInstanceOf(Reference::class, $arguments[1]);
         $this->assertSame('baz', (string) $arguments[1]);
+        $scopedClient = $container->getDefinition('bar');
+
+        $this->assertSame('http_client.transport', (string) $scopedClient->getArgument(0));
+        $this->assertSame('bar.caching', $scopedClient->getDecoratedService()[0]);
     }
 
     public function testHttpClientRetry()
