#22: Cannot create the client using HttpClientDiscovery

Author: mekras

composer.json

@@ -18,13 +18,16 @@
         "php-http/httplug": "^1.0",
         "php-http/message-factory": "^1.0"
     },
+    "suggest": {
+        "php-http/discovery": "Allow automatically discover needed HTTPlug implementations"
+    },
     "require-dev": {
         "guzzlehttp/psr7": "^1.0",
         "php-http/adapter-integration-tests": "0.4.*",
         "php-http/message": "^1.2",
         "php-http/discovery": "~0.8.0",
         "phpunit/phpunit": "^4.8",
-        "puli/composer-plugin": "1.0.0-beta9",
+        "puli/composer-plugin": "^1.0@beta,>=1.0.0-beta9",
         "zendframework/zend-diactoros": "^1.0"
     },
     "autoload": {

puli.json

@@ -188,6 +188,11 @@
             "installer": "composer",
             "env": "dev"
         },
+        "symfony/filesystem": {
+            "install-path": "vendor/symfony/filesystem",
+            "installer": "composer",
+            "env": "dev"
+        },
         "symfony/process": {
             "install-path": "vendor/symfony/process",
             "installer": "composer",

src/Client.php

@@ -5,6 +5,8 @@
 use Http\Client\Exception\RequestException;
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
+use Http\Discovery\MessageFactoryDiscovery;
+use Http\Discovery\StreamFactoryDiscovery;
 use Http\Message\MessageFactory;
 use Http\Message\StreamFactory;
 use Http\Promise\Promise;
@@ -24,6 +26,11 @@
  */
 class Client implements HttpClient, HttpAsyncClient
 {
+    /**
+     * @access private
+     */
+    const DEPENDENCY_MSG = 'You should either provide $%s argument or install "php-http/discovery"';
+
     /**
      * cURL options
      *
@@ -62,19 +69,35 @@ class Client implements HttpClient, HttpAsyncClient
     /**
      * Create new client
      *
-     * @param MessageFactory $messageFactory HTTP Message factory
-     * @param StreamFactory  $streamFactory  HTTP Stream factory
-     * @param array          $options        cURL options (see http://php.net/curl_setopt)
+     * @param MessageFactory|null $messageFactory HTTP Message factory
+     * @param StreamFactory|null  $streamFactory  HTTP Stream factory
+     * @param array               $options        cURL options (see http://php.net/curl_setopt)
+     *
+     * @throws \LogicException If some factory not provided and php-http/discovery not installed
      *
      * @since 1.0
      */
     public function __construct(
-        MessageFactory $messageFactory,
-        StreamFactory $streamFactory,
+        MessageFactory $messageFactory = null,
+        StreamFactory $streamFactory = null,
         array $options = []
     ) {
+        if (null === $messageFactory) {
+            if (!class_exists(MessageFactoryDiscovery::class)) {
+                throw new \LogicException(sprintf(self::DEPENDENCY_MSG, 'messageFactory'));
+            }
+            $messageFactory = MessageFactoryDiscovery::find();
+        }
         $this->messageFactory = $messageFactory;
+
+        if (null === $streamFactory) {
+            if (!class_exists(StreamFactoryDiscovery::class)) {
+                throw new \LogicException(sprintf(self::DEPENDENCY_MSG, 'streamFactory'));
+            }
+            $streamFactory = StreamFactoryDiscovery::find();
+        }
         $this->streamFactory = $streamFactory;
+
         $this->options = $options;
     }
 

tests/ClientTest.php

@@ -30,4 +30,14 @@ public function testExpectHeader()
 
         static::assertContains('Expect:', $headers);
     }
+
+    /**
+     * Discovery should be used if no factory given.
+     */
+    public function testFactoryDiscovery()
+    {
+        $client = new Client;
+
+        static::assertInstanceOf(Client::class, $client);
+    }
 }