Merge pull request #18 from php-http/discovery

Remove hard discovery dependency

Author: joelwurtz

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log
 
 
+## UNRELEASED
+
+### Removed
+
+- Hard discovery dependency
+
+
 ## 0.3.0 - 2016-01-21
 
 ### Changed

composer.json

@@ -17,15 +17,18 @@
     "require": {
         "php": ">=5.4",
         "php-http/httplug": "^1.0",
-        "php-http/discovery": "^0.7",
         "guzzlehttp/guzzle": "^5.1"
     },
     "require-dev": {
         "ext-curl": "*",
         "php-http/adapter-integration-tests": "^0.3",
         "guzzlehttp/ringphp": "^1.1",
         "php-http/client-common": "^0.1.1",
-        "guzzlehttp/psr7": "^1.2"
+        "guzzlehttp/psr7": "^1.2",
+        "php-http/discovery": "^0.7"
+    },
+    "suggest": {
+        "php-http/discovery": "Used for message factory discovery"
     },
     "provide": {
         "php-http/client-implementation": "1.0"

src/Client.php

@@ -36,6 +36,10 @@ class Client implements HttpClient
      */
     public function __construct(ClientInterface $client = null, MessageFactory $messageFactory = null)
     {
+        if (null === $messageFactory and false === class_exists('Http\Discovery\MessageFactoryDiscovery')) {
+            throw new \LogicException('No message factory provided and no discovery service is present to guess it, maybe you need to install php-http/discovery package?');
+        }
+
         $this->client = $client ?: new GuzzleClient();
         $this->messageFactory = $messageFactory ?: MessageFactoryDiscovery::find();
     }