Merge pull request #45 from php-http/default-bugifx

dbu · dbu · commit 5251e6471dac · 2016-02-25T10:23:46.000-05:00
Bugfix, circular reference with client named 'default'
diff --git a/DependencyInjection/HttplugExtension.php b/DependencyInjection/HttplugExtension.php
@@ -89,9 +89,12 @@ private function configureClients(ContainerBuilder $container, array $config)
             }
         }
 
-        // Alias the first client to httplug.client.default
+        // If we have clients configured
         if ($first !== null) {
-            $container->setAlias('httplug.client.default', 'httplug.client.'.$first);
+            if ($first !== 'default') {
+                // Alias the first client to httplug.client.default
+                $container->setAlias('httplug.client.default', 'httplug.client.'.$first);
+            }
         } elseif (isset($config['_inject_collector_plugin'])) {
             // No client was configured. Make sure to inject history plugin to the auto discovery client.
             $container->register('httplug.client', PluginClient::class)

Original file line number	Diff line number	Diff line change
`@@ -89,9 +89,12 @@ private function configureClients(ContainerBuilder $container, array $config)`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`
`92`		`- // Alias the first client to httplug.client.default`
	`92`	`+ // If we have clients configured`
`93`	`93`	`if ($first !== null) {`
`94`		`- $container->setAlias('httplug.client.default', 'httplug.client.'.$first);`
	`94`	`+ if ($first !== 'default') {`
	`95`	`+ // Alias the first client to httplug.client.default`
	`96`	`+ $container->setAlias('httplug.client.default', 'httplug.client.'.$first);`
	`97`	`+ }`
`95`	`98`	`} elseif (isset($config['_inject_collector_plugin'])) {`
`96`	`99`	`// No client was configured. Make sure to inject history plugin to the auto discovery client.`
`97`	`100`	`$container->register('httplug.client', PluginClient::class)`