Merge pull request #314 from ruudk/disable_default_clients

Add configuration option to disable registration of default client

Author: dbu

CHANGELOG.md

@@ -10,6 +10,8 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
   BatchClientInterface if they are enabled on the default/first client.
   (Only available with Httplug 2)
 - Configuration for the content_type plugin
+- Configuration option default_client_autowiring that you can set to false 
+  to prevent autowiring the HttpClient and HttpAsyncClient
 
 ### Changed
 

src/DependencyInjection/Configuration.php

@@ -108,6 +108,10 @@ public function getConfigTreeBuilder()
             ->end()
             ->fixXmlConfig('client')
             ->children()
+                ->booleanNode('default_client_autowiring')
+                    ->defaultTrue()
+                    ->info('Set to false to not autowire HttpClient and HttpAsyncClient.')
+                ->end()
                 ->arrayNode('main_alias')
                     ->addDefaultsIfNotSet()
                     ->info('Configure which service the main alias point to.')

src/DependencyInjection/HttplugExtension.php

@@ -10,6 +10,7 @@
 use Http\Client\Common\Plugin\AuthenticationPlugin;
 use Http\Client\Common\PluginClient;
 use Http\Client\Common\PluginClientFactory;
+use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
 use Http\Message\Authentication\BasicAuth;
 use Http\Message\Authentication\Bearer;
@@ -88,6 +89,11 @@ public function load(array $configs, ContainerBuilder $container)
         $this->configureClients($container, $config);
         $this->configurePlugins($container, $config['plugins']); // must be after clients, as clients.X.plugins might use plugins as templates that will be removed
         $this->configureAutoDiscoveryClients($container, $config);
+
+        if (!$config['default_client_autowiring']) {
+            $container->removeAlias(HttpAsyncClient::class);
+            $container->removeAlias(HttpClient::class);
+        }
     }
 
     /**

tests/Functional/DiscoveryTest.php

@@ -10,6 +10,8 @@
 use Http\Message\StreamFactory;
 use Http\Message\UriFactory;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
+use Matthias\SymfonyDependencyInjectionTest\PhpUnit\ContainerBuilderHasAliasConstraint;
+use PHPUnit\Framework\Constraint\LogicalNot;
 use Symfony\Component\DependencyInjection\Definition;
 
 /**
@@ -71,4 +73,39 @@ public function testNoDiscoveryFallbacks()
         $clientDefinition = $this->container->getDefinition('httplug.client.default');
         $this->assertEquals([HttpClientDiscovery::class, 'find'], $clientDefinition->getFactory());
     }
+
+    public function testEnableAutowiring()
+    {
+        $this->load([
+            'default_client_autowiring' => true,
+        ]);
+
+        $this->assertContainerBuilderHasService('httplug.client.default');
+        $this->assertContainerBuilderHasService('httplug.async_client.default');
+        $this->assertContainerBuilderHasAlias(HttpClient::class);
+        $this->assertContainerBuilderHasAlias(HttpAsyncClient::class);
+    }
+
+    public function testDisableAutowiring()
+    {
+        if (PHP_VERSION_ID <= 70000) {
+            $this->markTestSkipped();
+        }
+
+        $this->load([
+            'default_client_autowiring' => false,
+        ]);
+
+        $this->assertContainerBuilderHasService('httplug.client.default');
+        $this->assertContainerBuilderHasService('httplug.async_client.default');
+
+        self::assertThat(
+            $this->container,
+            new LogicalNot(new ContainerBuilderHasAliasConstraint(HttpClient::class))
+        );
+        self::assertThat(
+            $this->container,
+            new LogicalNot(new ContainerBuilderHasAliasConstraint(HttpAsyncClient::class))
+        );
+    }
 }

tests/Resources/Fixtures/config/full.php

@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('httplug', [
+    'default_client_autowiring' => false,
     'main_alias' => [
         'client'          => 'my_client',
         'message_factory' => 'my_message_factory',

tests/Resources/Fixtures/config/full.xml

@@ -2,6 +2,7 @@
 <container xmlns="http://symfony.com/schema/dic/services">
 
     <config xmlns="http://example.org/schema/dic/httplug">
+        <default-client-autowiring>false</default-client-autowiring>
         <main-alias>
             <client>my_client</client>
             <message-factory>my_message_factory</message-factory>

tests/Resources/Fixtures/config/full.yml

@@ -1,4 +1,5 @@
 httplug:
+    default_client_autowiring: false
     main_alias:
         client: my_client
         message_factory: my_message_factory

tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -12,6 +12,7 @@
 class ConfigurationTest extends AbstractExtensionConfigurationTestCase
 {
     private $emptyConfig = [
+        'default_client_autowiring' => true,
         'main_alias' => [
             'client' => 'httplug.client.default',
             'message_factory' => 'httplug.message_factory.default',
@@ -102,6 +103,7 @@ public function testEmptyConfiguration()
     public function testSupportsAllConfigFormats()
     {
         $expectedConfiguration = [
+            'default_client_autowiring' => false,
             'main_alias' => [
                 'client' => 'my_client',
                 'message_factory' => 'my_message_factory',