Allow you to configure a client without a factory (#257)

* Allow you to configure a client without a factory

* cs

* Fixed tests

* Update HttplugExtension.php

* Update HttplugExtensionTest.php

* FIxed typo

* Added changelog

* Removed date

Author: Nyholm

CHANGELOG.md

@@ -2,11 +2,12 @@
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
 
-## 1.10.0 (unreleased) - 2018-03-09
+## 1.10.0 - 2018-03-27
 
 ### Added
 
 - Allow to configure the `AddPathPlugin` per client, under the `add_path` configuration key.
+- Allow to configure clients with a `service` instead of a factory. 
 
 ## 1.9.0 - 2018-03-06
 

DependencyInjection/Configuration.php

@@ -179,12 +179,22 @@ private function configureClients(ArrayNodeDefinition $root)
                     })
                     ->thenInvalid('If you want to use the "config" key you must also specify a valid "factory".')
                 ->end()
+                ->validate()
+                    ->ifTrue(function ($config) {
+                        return !empty($config['service']) && ('httplug.factory.auto' !== $config['factory'] || !empty($config['config']));
+                    })
+                    ->thenInvalid('If you want to use the "service" key you cannot specify "factory" or "config".')
+                ->end()
                 ->children()
                     ->scalarNode('factory')
                         ->defaultValue('httplug.factory.auto')
                         ->cannotBeEmpty()
                         ->info('The service id of a factory to use when creating the adapter.')
                     ->end()
+                    ->scalarNode('service')
+                        ->defaultNull()
+                        ->info('The service id of the client to use.')
+                    ->end()
                     ->booleanNode('flexible_client')
                         ->defaultFalse()
                         ->info('Set to true to get the client wrapped in a FlexibleHttpClient which emulates async or sync behavior.')

DependencyInjection/HttplugExtension.php

@@ -306,12 +306,16 @@ private function configureClient(ContainerBuilder $container, $clientName, array
             }
         }
 
-        $container
-            ->register($serviceId.'.client', HttpClient::class)
-            ->setFactory([new Reference($arguments['factory']), 'createClient'])
-            ->addArgument($arguments['config'])
-            ->setPublic(false)
-        ;
+        if (empty($arguments['service'])) {
+            $container
+                ->register($serviceId.'.client', HttpClient::class)
+                ->setFactory([new Reference($arguments['factory']), 'createClient'])
+                ->addArgument($arguments['config'])
+                ->setPublic(false);
+        } else {
+            $container
+                ->setAlias($serviceId.'.client', new Alias($arguments['service'], false));
+        }
 
         $container
             ->register($serviceId, PluginClient::class)

Tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -118,6 +118,7 @@ public function testSupportsAllConfigFormats()
                 'test' => [
                     'factory' => 'httplug.factory.guzzle6',
                     'http_methods_client' => true,
+                    'service' => null,
                     'flexible_client' => false,
                     'batch_client' => false,
                     'plugins' => [

Tests/Unit/DependencyInjection/HttplugExtensionTest.php

@@ -240,6 +240,21 @@ public function testCachePluginConfigCacheKeyGeneratorReference()
         $this->assertSame('header_cache_key_generator', (string) $config['cache_key_generator']);
     }
 
+    public function testUsingServiceKeyForClients()
+    {
+        $this->load([
+            'clients' => [
+                'acme' => [
+                    'service' => 'my_custom_client',
+                ],
+            ],
+        ]);
+
+        $client = $this->container->getAlias('httplug.client.acme.client');
+        $this->assertEquals('my_custom_client', (string) $client);
+        $this->assertFalse($client->isPublic());
+    }
+
     private function verifyProfilingDisabled()
     {
         $def = $this->container->findDefinition('httplug.client');