Merge pull request #81 from php-http/no-puli

Require discovery 0.9 and do not handle Puli.

Author: dbu

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 1.1.1 - 2016-06-30
+
+### Changed
+
+- Removed Puli logic and require `php-http/discovery:0.9` which makes Puli optional.
 
 ## 1.1.0 - 2016-05-19
 

DependencyInjection/Compiler/DiscoveryPass.php

@@ -3,14 +3,15 @@
 namespace Http\HttplugBundle\DependencyInjection\Compiler;
 
 use Http\Client\HttpClient;
-use Http\HttplugBundle\HttplugFactory;
+use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\MessageFactoryDiscovery;
+use Http\Discovery\StreamFactoryDiscovery;
+use Http\Discovery\UriFactoryDiscovery;
 use Http\Message\MessageFactory;
 use Http\Message\StreamFactory;
 use Http\Message\UriFactory;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * Adds fallback and discovery services.
@@ -31,55 +32,32 @@ final class DiscoveryPass implements CompilerPassInterface
         'stream_factory' => StreamFactory::class,
     ];
 
+    /**
+     * Factories by type.
+     *
+     * @var array
+     */
+    private $factoryClasses = [
+        'client' => HttpClientDiscovery::class,
+        'message_factory' => MessageFactoryDiscovery::class,
+        'uri_factory' => UriFactoryDiscovery::class,
+        'stream_factory' => StreamFactoryDiscovery::class,
+    ];
+
     /**
      * {@inheritdoc}
      */
     public function process(ContainerBuilder $container)
     {
-        $useDiscovery = false;
-
         foreach ($this->services as $service => $class) {
             $serviceId = sprintf('httplug.%s.default', $service);
 
             if (false === $container->has($serviceId)) {
-                // Register and create factory for the first time
-                if (false === $useDiscovery) {
-                    $this->registerFactory($container);
-
-                    $factory = [
-                        new Reference('httplug.factory'),
-                        'find',
-                    ];
-
-                    $useDiscovery = true;
-                }
-
+                // Register and create factory for service
                 $definition = $container->register($serviceId, $class);
-
-                $definition->setFactory($factory);
+                $definition->setFactory([$this->factoryClasses[$service], 'find']);
                 $definition->addArgument($class);
             }
         }
     }
-
-    /**
-     * @param ContainerBuilder $container
-     *
-     * @throws RuntimeException
-     */
-    private function registerFactory(ContainerBuilder $container)
-    {
-        if (false === $container->has('puli.discovery')) {
-            throw new RuntimeException(
-                'You need to install puli/symfony-bundle or add configuration at httplug.classes in order to use this bundle. Refer to http://docs.php-http.org/en/latest/integrations/symfony-bundle.html#discovery-of-factory-classes'
-            );
-        }
-
-        $definition = $container->register('httplug.factory', HttplugFactory::class);
-
-        $definition
-            ->addArgument(new Reference('puli.discovery'))
-            ->setPublic(false)
-        ;
-    }
 }

HttplugFactory.php

@@ -14,11 +14,7 @@ public function registerBundles()
             new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new \Http\HttplugBundle\HttplugBundle(),
         ];
-
-        if (false === defined('HHVM_VERSION')) {
-            $bundles[] = new \Puli\SymfonyBundle\PuliBundle();
-        }
-
+        
         return $bundles;
     }
 

Tests/Resources/app/AppKernel.php

@@ -4,7 +4,6 @@
 
 use Http\Client\HttpClient;
 use Http\HttplugBundle\DependencyInjection\Compiler\DiscoveryPass;
-use Http\HttplugBundle\HttplugFactory;
 use Http\Message\MessageFactory;
 use Http\Message\StreamFactory;
 use Http\Message\UriFactory;
@@ -24,12 +23,8 @@ protected function registerCompilerPass(ContainerBuilder $container)
 
     public function testDiscoveryFallbacks()
     {
-        $this->setDefinition('puli.discovery', new Definition('Puli\Discovery\Api\Discovery'));
-
         $this->compile();
 
-        $this->assertContainerBuilderHasService('httplug.factory', HttplugFactory::class);
-
         $this->assertContainerBuilderHasService('httplug.client.default', HttpClient::class);
         $this->assertContainerBuilderHasService('httplug.message_factory.default', MessageFactory::class);
         $this->assertContainerBuilderHasService('httplug.uri_factory.default', UriFactory::class);
@@ -38,13 +33,10 @@ public function testDiscoveryFallbacks()
 
     public function testDiscoveryPartialFallbacks()
     {
-        $this->setDefinition('puli.discovery', new Definition('Puli\Discovery\Api\Discovery'));
         $this->setDefinition('httplug.client.default', new Definition('Http\Adapter\Guzzle6\Client'));
 
         $this->compile();
 
-        $this->assertContainerBuilderHasService('httplug.factory', HttplugFactory::class);
-
         $this->assertContainerBuilderHasService('httplug.client.default', 'Http\Adapter\Guzzle6\Client');
         $this->assertContainerBuilderHasService('httplug.message_factory.default', MessageFactory::class);
         $this->assertContainerBuilderHasService('httplug.uri_factory.default', UriFactory::class);
@@ -59,18 +51,5 @@ public function testNoDiscoveryFallbacks()
         $this->setDefinition('httplug.stream_factory.default', new Definition(StreamFactory::class));
 
         $this->compile();
-
-        $this->assertContainerBuilderNotHasService('httplug.factory');
-    }
-
-    /**
-     * Overridden test as we have dependencies in this compiler pass.
-     *
-     * @test
-     * @expectedException \RuntimeException
-     */
-    public function compilation_should_not_fail_with_empty_container()
-    {
-        $this->compile();
     }
 }