#25: Make discovery a hard dependency

Author: mekras

composer.json

@@ -17,15 +17,12 @@
         "ext-curl": "*",
         "php-http/httplug": "^1.0",
         "php-http/message-factory": "^1.0.2",
-        "php-http/message": "^1.2"
-    },
-    "suggest": {
-        "php-http/discovery": "Allow automatically discover needed HTTPlug implementations"
+        "php-http/message": "^1.2",
+        "php-http/discovery": "^1.0"
     },
     "require-dev": {
         "guzzlehttp/psr7": "^1.0",
         "php-http/client-integration-tests": "^0.5.1",
-        "php-http/discovery": "^1.0",
         "phpunit/phpunit": "^4.8",
         "zendframework/zend-diactoros": "^1.0"
     },

src/Client.php

@@ -26,11 +26,6 @@
  */
 class Client implements HttpClient, HttpAsyncClient
 {
-    /**
-     * @access private
-     */
-    const DEPENDENCY_MSG = 'You should either provide $%s argument or install "php-http/discovery"';
-
     /**
      * cURL options
      *
@@ -73,7 +68,6 @@ class Client implements HttpClient, HttpAsyncClient
      * @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
      * @throws \Http\Discovery\Exception\NotFoundException If factory discovery failed.
      *
      * @since 1.0
@@ -83,22 +77,8 @@ public function __construct(
         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->messageFactory = $messageFactory ?: MessageFactoryDiscovery::find();
+        $this->streamFactory = $streamFactory ?: StreamFactoryDiscovery::find();
         $this->options = $options;
     }