minor #37967 [FrameworkBundle] Do not pass the base uri twice to scoped http clients (fancyweb)

fabpot · fabpot · commit 943cbd804e74 · 2020-08-30T08:53:37.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [FrameworkBundle] Do not pass the base uri twice to scoped http clients | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - I looked at my dumped scoped http client PHP file and I noticed the base uri was passed two times. I thought there was a bug somewhere in my configuration. Actually, we only need to pass it as the method argument here. Commits ------- e2fce0d [FrameworkBundle] Do not pass the base uri twice to scoped http clients
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2009,9 +2009,12 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
             unset($scopeConfig['scope']);
 
             if (null === $scope) {
+                $baseUri = $scopeConfig['base_uri'];
+                unset($scopeConfig['base_uri']);
+
                 $container->register($name, ScopingHttpClient::class)
                     ->setFactory([ScopingHttpClient::class, 'forBaseUri'])
-                    ->setArguments([new Reference($httpClientId), $scopeConfig['base_uri'], $scopeConfig])
+                    ->setArguments([new Reference($httpClientId), $baseUri, $scopeConfig])
                     ->addTag('http_client.client')
                 ;
             } else {
