[HttpClient] Use decoration instead of class replacement for mock factory

GaryPEGEOT · nicolas-grekas · commit 9a9823c99ac3 · 2020-12-08T18:14:23.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2071,8 +2071,8 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
         }
 
         if ($responseFactoryId = $config['mock_response_factory'] ?? null) {
-            $container->getDefinition($httpClientId)
-                ->setClass(MockHttpClient::class)
+            $container->register($httpClientId.'.mock_client', MockHttpClient::class)
+                ->setDecoratedService($httpClientId, null, -10) // lower priority than TraceableHttpClient
                 ->setArguments([new Reference($responseFactoryId)]);
         }
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1611,14 +1611,15 @@ public function testHttpClientMockResponseFactory()
     {
         $container = $this->createContainerFromFile('http_client_mock_response_factory');
 
-        $definition = $container->getDefinition('http_client');
+        $definition = $container->getDefinition('http_client.mock_client');
 
         $this->assertSame(MockHttpClient::class, $definition->getClass());
         $this->assertCount(1, $definition->getArguments());
 
         $argument = $definition->getArgument(0);
 
         $this->assertInstanceOf(Reference::class, $argument);
+        $this->assertSame('http_client', current($definition->getDecoratedService()));
         $this->assertSame('my_response_factory', (string) $argument);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2071,8 +2071,8 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder`
`2071`	`2071`	`}`
`2072`	`2072`
`2073`	`2073`	`if ($responseFactoryId = $config['mock_response_factory'] ?? null) {`
`2074`		`- $container->getDefinition($httpClientId)`
`2075`		`- ->setClass(MockHttpClient::class)`
	`2074`	`+ $container->register($httpClientId.'.mock_client', MockHttpClient::class)`
	`2075`	`+ ->setDecoratedService($httpClientId, null, -10) // lower priority than TraceableHttpClient`
`2076`	`2076`	`->setArguments([new Reference($responseFactoryId)]);`
`2077`	`2077`	`}`
`2078`	`2078`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1611,14 +1611,15 @@ public function testHttpClientMockResponseFactory()`
`1611`	`1611`	`{`
`1612`	`1612`	`$container = $this->createContainerFromFile('http_client_mock_response_factory');`
`1613`	`1613`
`1614`		`- $definition = $container->getDefinition('http_client');`
	`1614`	`+ $definition = $container->getDefinition('http_client.mock_client');`
`1615`	`1615`
`1616`	`1616`	`$this->assertSame(MockHttpClient::class, $definition->getClass());`
`1617`	`1617`	`$this->assertCount(1, $definition->getArguments());`
`1618`	`1618`
`1619`	`1619`	`$argument = $definition->getArgument(0);`
`1620`	`1620`
`1621`	`1621`	`$this->assertInstanceOf(Reference::class, $argument);`
	`1622`	`+ $this->assertSame('http_client', current($definition->getDecoratedService()));`
`1622`	`1623`	`$this->assertSame('my_response_factory', (string) $argument);`
`1623`	`1624`	`}`
`1624`	`1625`