Switch to php-http/discovery 0.4

- Compatibility with php-http/httplug 1.0 beta

Author: mekras

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## [Unreleased]
 
+- Compatibility with php-http/httplug 1.0 beta
+- Switch to php-http/discovery 0.4
+
 
 ## 0.4.0 - 2015-12-16
 

README.md

@@ -20,12 +20,12 @@ $ composer require php-http/curl-client
 
 ## Usage
 
-### Using [php-http/discovery](https://packagist.org/packages/php-http/discovery):
+### Using [php-http/utils](https://packagist.org/packages/php-http/utils):
 
 ```php
+use Http\Client\Utils\MessageFactory\GuzzleMessageFactory;
+use Http\Client\Utils\StreamFactory\GuzzleStreamFactory;
 use Http\Curl\CurlHttpClient;
-use Http\Discovery\MessageFactory\GuzzleMessageFactory;
-use Http\Discovery\StreamFactory\GuzzleStreamFactory;
 
 $messageFactory = new GuzzleMessageFactory();
 $client = new CurlHttpClient($messageFactory, new GuzzleStreamFactory());
@@ -53,9 +53,9 @@ $response = $client->sendRequest($request);
 You can use [cURL options](http://php.net/curl_setopt) to configure CurlHttpClient:
 
 ```php
+use Http\Client\Utils\MessageFactory\GuzzleMessageFactory;
+use Http\Client\Utils\StreamFactory\GuzzleStreamFactory;
 use Http\Curl\CurlHttpClient;
-use Http\Discovery\MessageFactory\GuzzleMessageFactory;
-use Http\Discovery\StreamFactory\GuzzleStreamFactory;
 
 $options = [
     CURLOPT_CONNECTTIMEOUT => 10, // The number of seconds to wait while trying to connect. 

composer.json

@@ -13,13 +13,14 @@
     "require": {
         "php": ">=5.5",
         "ext-curl": "*",
-        "php-http/httplug": "1.0.0-alpha3",
+        "php-http/httplug": "^1.0.0-alpha3",
         "php-http/message-factory": "^1.0"
     },
     "require-dev": {
         "guzzlehttp/psr7": "^1.0",
         "php-http/adapter-integration-tests": "dev-master#48e5c0ee7b19772ab00060498f91886268b945c4",
-        "php-http/discovery": "dev-master#fd0cbe2ed125cc4f8fcc0378aff9874ce206e858",
+        "php-http/discovery": "^0.4",
+        "php-http/utils": "^0.2",
         "phpunit/phpunit": "^4.8@stable",
         "zendframework/zend-diactoros": "^1.0"
     },

tests/CurlHttpAsyncClientDiactorosTest.php

@@ -2,9 +2,9 @@
 namespace Http\Curl\Tests;
 
 use Http\Client\HttpClient;
+use Http\Client\Utils\MessageFactory\DiactorosMessageFactory;
+use Http\Client\Utils\StreamFactory\DiactorosStreamFactory;
 use Http\Curl\CurlHttpClient;
-use Http\Discovery\MessageFactory\DiactorosMessageFactory;
-use Http\Discovery\StreamFactory\DiactorosStreamFactory;
 use Zend\Diactoros\Request;
 use Zend\Diactoros\Response;
 

tests/CurlHttpAsyncClientGuzzleTest.php

@@ -2,9 +2,9 @@
 namespace Http\Curl\Tests;
 
 use Http\Client\HttpClient;
+use Http\Client\Utils\MessageFactory\GuzzleMessageFactory;
+use Http\Client\Utils\StreamFactory\GuzzleStreamFactory;
 use Http\Curl\CurlHttpClient;
-use Http\Discovery\MessageFactory\GuzzleMessageFactory;
-use Http\Discovery\StreamFactory\GuzzleStreamFactory;
 
 /**
  * Tests for Http\Curl\CurlHttpClient

tests/CurlHttpClientDiactorosTest.php

@@ -2,9 +2,9 @@
 namespace Http\Curl\Tests;
 
 use Http\Client\HttpClient;
+use Http\Client\Utils\MessageFactory\DiactorosMessageFactory;
+use Http\Client\Utils\StreamFactory\DiactorosStreamFactory;
 use Http\Curl\CurlHttpClient;
-use Http\Discovery\MessageFactory\DiactorosMessageFactory;
-use Http\Discovery\StreamFactory\DiactorosStreamFactory;
 use Zend\Diactoros\Request;
 use Zend\Diactoros\Response;
 

tests/CurlHttpClientGuzzleTest.php

@@ -2,9 +2,9 @@
 namespace Http\Curl\Tests;
 
 use Http\Client\HttpClient;
+use Http\Client\Utils\MessageFactory\GuzzleMessageFactory;
+use Http\Client\Utils\StreamFactory\GuzzleStreamFactory;
 use Http\Curl\CurlHttpClient;
-use Http\Discovery\MessageFactory\GuzzleMessageFactory;
-use Http\Discovery\StreamFactory\GuzzleStreamFactory;
 
 /**
  * Tests for Http\Curl\CurlHttpClient