Removed the generic factory

Author: Nyholm

ClientFactory/ClientFactoryInterface.php

@@ -2,29 +2,10 @@
 
 namespace Http\HttplugBundle\ClientFactory;
 
-use Http\Client\HttpClient;
-use Http\HttplugBundle\Exception\InvalidConfiguration;
-
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
 interface ClientFactoryInterface
 {
-    /**
-     * Configure and return a client.
-     *
-     * @param array $config
-     *
-     * @return HttpClient
-     *
-     * @throws InvalidConfiguration
-     */
     public function createClient(array $config = array());
-
-    /**
-     * Return the name of the client.
-     *
-     * @return string
-     */
-    public function getName();
 }

ClientFactory/DummyClient.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Http\HttplugBundle\ClientFactory;
+
+/**
+ * This client is used as a placeholder for the dependency injection. It will never be used.
+ *
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ */
+class DummyClient
+{
+}

ClientFactory/DummyFactory.php

@@ -8,23 +8,19 @@
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-class Guzzle5Factory implements ClientFactoryInterface
+class Guzzle5Factory
 {
     /**
      * {@inheritdoc}
      */
     public function createClient(array $config = array())
     {
+        if (!class_exists('Http\Adapter\Guzzle5HttpAdapter')) {
+            throw new \LogicException('To use the Guzzle5 adapter you need to install the "php-http/guzzle5-adapter" package.');
+        }
+
         $client = new Client($config);
 
         return new Guzzle5HttpAdapter($client);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'guzzle5';
-    }
 }

ClientFactory/GenericClientFactory.php

@@ -12,13 +12,12 @@ class Guzzle6Factory implements ClientFactoryInterface
 {
     public function createClient(array $config = array())
     {
+        if (!class_exists('Http\Adapter\Guzzle6HttpAdapter')) {
+            throw new \LogicException('To use the Guzzle6 adapter you need to install the "php-http/guzzle6-adapter" package.');
+        }
+
         $client = new Client($config);
 
         return new Guzzle6HttpAdapter($client);
     }
-
-    public function getName()
-    {
-        return 'guzzle6';
-    }
 }

ClientFactory/Guzzle5Factory.php

@@ -4,13 +4,12 @@
 
 use Symfony\Component\Config\Definition\ArrayNode;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
-use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 
 /**
- * This class contains the configuration information for the bundle
+ * This class contains the configuration information for the bundle.
  *
  * This information is solely responsible for how the different configuration
  * sections are normalized, and merged.
@@ -86,14 +85,13 @@ protected function configureClients(ArrayNodeDefinition $root)
                 ->useAttributeAsKey('name')
                 ->prototype('array')
                 ->children()
-                    ->scalarNode('adapter')
+                    ->scalarNode('factory')
                         ->isRequired()
                         ->cannotBeEmpty()
                         ->info('The name of the adapter to use. There must be a factory corresponding to this name. Example values: guzzle5, guzzle6')
                     ->end()
                     ->variableNode('config')->end()
                 ->end()
             ->end();
-
     }
 }

ClientFactory/Guzzle6Factory.php

@@ -2,7 +2,7 @@
 
 namespace Http\HttplugBundle\DependencyInjection;
 
-use Http\HttplugBundle\ClientFactory\DummyFactory;
+use Http\HttplugBundle\ClientFactory\DummyClient;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
@@ -37,35 +37,11 @@ public function load(array $configs, ContainerBuilder $container)
             $container->setAlias(sprintf('httplug.%s', $type), $id);
         }
 
-        // Configure services
+        // Configure client services
         foreach ($config['clients'] as $name => $arguments) {
-            $this->verifyDependencies($arguments['adapter']);
-            $def = $container->register('httplug.'.$name, DummyFactory::class);
-            $def->setFactory([new Reference('httplug.client.factory'), 'getClient'])
-                ->addArgument($arguments['adapter'])
+            $def = $container->register('httplug.client.'.$name, DummyClient::class);
+            $def->setFactory([new Reference($arguments['factory']), 'createClient'])
                 ->addArgument($arguments['config']);
         }
     }
-
-    /**
-     * Make sure we got all the dependencies installed.
-     *
-     * @param $adapterName
-     */
-    protected function verifyDependencies($adapterName)
-    {
-        $map = [
-            'guzzle5'=>['package'=>'php-http/guzzle5-adapter', 'class'=>'Http\Adapter\Guzzle5HttpAdapter'],
-            'guzzle6'=>['package'=>'php-http/guzzle6-adapter', 'class'=>'Http\Adapter\Guzzle6HttpAdapter'],
-        ];
-
-        if (!isset($map[$adapterName])) {
-            // This is none of our adapters. We have to assume the user has configured one of his own.
-            return;
-        }
-
-        if (!class_exists($map[$adapterName]['class'])) {
-            throw new \LogicException(sprintf('To use the "%s" adapter you need to install the "%s" package. ', $adapterName, $map[$adapterName]['package']));
-        }
-    }
 }

DependencyInjection/CompilerPass/ClientFactoryPass.php

@@ -2,7 +2,6 @@
 
 namespace Http\HttplugBundle;
 
-use Http\HttplugBundle\DependencyInjection\CompilerPass\ClientFactoryPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
@@ -11,13 +10,4 @@
  */
 class HttplugBundle extends Bundle
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function build(ContainerBuilder $container)
-    {
-        parent::build($container);
-        $container->addCompilerPass(new ClientFactoryPass());
-
-    }
 }

DependencyInjection/Configuration.php

@@ -77,7 +77,7 @@ You can configure your clients with some good default options. The clients are l
 httplug:
   clients: 
     my_guzzle5: 
-      adapter: guzzle5
+      factory: 'httplug.factory.guzzle5'
       config:
         # These options are given to Guzzle without validation. 
         base_url: 'http://google.se/'
@@ -87,17 +87,16 @@ httplug:
           headers:
             Content-Type: 'application/json'
     acme: 
-      adapter: guzzle6
+      factory: 'httplug.factory.guzzle6'
       config:
-        # These options are given to Guzzle without validation. 
         base_url: 'http://google.se/'
 
 ```
 
 ```php
 
-$httpClient = $this->container->get('httplug.my_guzzle5');
-$httpClient = $this->container->get('httplug.acme');
+$httpClient = $this->container->get('httplug.client.my_guzzle5');
+$httpClient = $this->container->get('httplug.client.acme');
 ```
 
 ### Use for Reusable Bundles

DependencyInjection/HttplugExtension.php

@@ -4,13 +4,9 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="httplug.client.factory" class="Http\HttplugBundle\ClientFactory\GenericClientFactory" />
 
         <!-- ClientFactories -->
-        <service id="httplug.client.factory.guzzle5" class="Http\HttplugBundle\ClientFactory\Guzzle5Factory" public="false">
-            <tag name="httplug.client_factory" />
-        </service>
-        <service id="httplug.client.factory.guzzle6" class="Http\HttplugBundle\ClientFactory\Guzzle6Factory" public="false">
-            <tag name="httplug.client_factory" /></service>
+        <service id="httplug.factory.guzzle5" class="Http\HttplugBundle\ClientFactory\Guzzle5Factory" public="false" />
+        <service id="httplug.factory.guzzle6" class="Http\HttplugBundle\ClientFactory\Guzzle6Factory" public="false" />
     </services>
 </container>

HttplugBundle.php

@@ -15,7 +15,7 @@
     "prefer-stable": true,
     "require": {
         "php": ">=5.4",
-        "php-http/discovery": "^0.4",
+        "php-http/discovery": "^0.5",
         "php-http/client-implementation": "^1.0",
         "php-http/message-factory": "^1.0",
         "php-http/plugins": "dev-master",
@@ -24,7 +24,7 @@
     "require-dev": {
         "phpunit/phpunit": "^4.4",
         "php-http/guzzle6-adapter": "dev-master",
-        "php-http/message": "dev-master",
+        "php-http/message": "^0.2",
         "php-http/client-common": "^0.1",
         "symfony/symfony": "^2.7|^3.0",
         "polishsymfonycommunity/symfony-mocker-container": "~1.0",