[FrameworkBundle] Fix mocking decorated services in tests

nicolas-grekas · nicolas-grekas · commit f0c97d854fca · 2026-01-07T11:53:24.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php
@@ -34,7 +34,10 @@ public function process(ContainerBuilder $container)
         $definitions = $container->getDefinitions();
 
         foreach ($definitions as $id => $definition) {
-            if ($id && '.' !== $id[0] && (!$definition->isPublic() || $definition->isPrivate() || $definition->hasTag('container.private')) && !$definition->hasErrors() && !$definition->isAbstract()) {
+            if ($inner = $definition->getTag('container.decorator')[0]['inner'] ?? null) {
+                $privateServices[$inner] = new Reference($inner, ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE);
+            }
+            if ($id && '.' !== $id[0] && ($definition->isPrivate() || $definition->hasTag('container.private')) && !$definition->hasErrors() && !$definition->isAbstract()) {
                 $privateServices[$id] = new Reference($id, ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE);
             }
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php b/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php
@@ -71,15 +71,11 @@ public function set(string $id, mixed $service): void
         $container = $this->getPublicContainer();
         $renamedId = $this->renamedIds[$id] ?? $id;
 
-        try {
+        if (!$this->getPrivateContainer()->has($renamedId)) {
             $container->set($renamedId, $service);
-        } catch (InvalidArgumentException $e) {
-            if (!str_starts_with($e->getMessage(), "The \"$renamedId\" service is private")) {
-                throw $e;
-            }
-            if (isset($container->privates[$renamedId])) {
-                throw new InvalidArgumentException(\sprintf('The "%s" service is already initialized, you cannot replace it.', $id));
-            }
+        } elseif (isset($container->privates[$renamedId])) {
+            throw new InvalidArgumentException(\sprintf('The "%s" service is already initialized, you cannot replace it.', $id));
+        } else {
             $container->privates[$renamedId] = $service;
         }
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/HttpClientMockingController.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/HttpClientMockingController.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller;
+
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+class HttpClientMockingController
+{
+    public function __invoke(HttpClientInterface $httpClient): Response
+    {
+        $response = $httpClient->request('GET', 'https://example.com/');
+
+        return new Response($response->getContent());
+    }
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml
@@ -65,6 +65,10 @@ http_client_call:
     path:     /http_client_call
     defaults: { _controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\HttpClientController::index }
 
+http_client_mock:
+    path:     /http_client_mock
+    defaults: { _controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\HttpClientMockingController }
+
 uid:
     resource: "../../Controller/UidController.php"
     type: "attribute"
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/HttpClientTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/HttpClientTest.php
@@ -11,6 +11,10 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\MockResponse;
+
 class HttpClientTest extends AbstractWebTestCase
 {
     public function testHttpClientAssertions()
@@ -30,4 +34,15 @@ public function testHttpClientAssertions()
 
         $this->assertHttpClientRequestCount(6, 'symfony.http_client');
     }
+
+    public function testHttpClientCanBeOverriddenInWebTestCase()
+    {
+        $browser = $this->createClient(['test_case' => 'HttpClient', 'root_config' => 'config.yml', 'debug' => true]);
+        $mockedContent = 'Request Mocked successfully!';
+        static::getContainer()->set(HttpClientInterface::class, new MockHttpClient(new MockResponse($mockedContent)));
+
+        $browser->request('GET', '/http_client_mock');
+
+        self::assertSame($mockedContent, $browser->getResponse()->getContent());
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/HttpClient/services.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/HttpClient/services.yml
@@ -5,5 +5,8 @@ services:
     Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\HttpClientController:
         tags: ['controller.service_arguments']
 
+    Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\HttpClientMockingController:
+        tags: ['controller.service_arguments']
+
     Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Tests\MockClientCallback:
         class: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Tests\MockClientCallback

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,10 @@ public function process(ContainerBuilder $container)`
`34`	`34`	`$definitions = $container->getDefinitions();`
`35`	`35`
`36`	`36`	`foreach ($definitions as $id => $definition) {`
`37`		`- if ($id && '.' !== $id[0] && (!$definition->isPublic() \|\| $definition->isPrivate() \|\| $definition->hasTag('container.private')) && !$definition->hasErrors() && !$definition->isAbstract()) {`
	`37`	`+ if ($inner = $definition->getTag('container.decorator')[0]['inner'] ?? null) {`
	`38`	`+ $privateServices[$inner] = new Reference($inner, ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE);`
	`39`	`+ }`
	`40`	`+ if ($id && '.' !== $id[0] && ($definition->isPrivate() \|\| $definition->hasTag('container.private')) && !$definition->hasErrors() && !$definition->isAbstract()) {`
`38`	`41`	`$privateServices[$id] = new Reference($id, ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE);`
`39`	`42`	`}`
`40`	`43`	`}`