Migrate from php-http/discovery and php-http/utils to php-http/message.

Author: mekras

.gitignore

@@ -1,4 +1,6 @@
+.puli/
 build/
 vendor/
 composer.lock
 phpunit.xml
+puli.json

CHANGELOG.md

@@ -1,7 +1,10 @@
 # Change Log
 
-## [Unreleased]
+## 0.7.0 - 2016-01-26
 
+### Changed
+
+- Migrate from `php-http/discovery` and `php-http/utils` to `php-http/message`.
 
 ## 0.6.0 - 2016-01-12
 
@@ -10,7 +13,7 @@
 - Root namespace changed from `Http\Curl` to `Http\Client\Curl`.
 - Main client class name renamed from `CurlHttpClient` to `Client`. 
 - Minimum required [php-http/discovery](https://packagist.org/packages/php-http/discovery)
-   version changed to 0.5. 
+  version changed to 0.5.
 
 
 ## 0.5.0 - 2015-12-18

README.md

@@ -20,30 +20,30 @@ $ composer require php-http/curl-client
 
 ## Usage
 
-### Using [php-http/discovery](https://packagist.org/packages/php-http/discovery):
+### Using [php-http/message](https://packagist.org/packages/php-http/message):
 
 ```php
 use Http\Client\Curl\Client;
-use Http\Discovery\MessageFactoryDiscovery;
-use Http\Discovery\StreamFactoryDiscovery;
+use Http\Message\MessageFactory\DiactorosMessageFactory;
+use Http\Message\StreamFactory\DiactorosStreamFactory;
 
-$messageFactory = MessageFactoryDiscovery::find();
-$streamFactory = StreamFactoryDiscovery::find();
-$client = new Client($messageFactory, $streamFactory);
+$messageFactory = new DiactorosMessageFactory();
+$client = new Client($messageFactory, new DiactorosStreamFactory());
 
 $request = $messageFactory->createRequest('GET', 'http://example.com/');
 $response = $client->sendRequest($request);
 ```
 
-### Using [mekras/httplug-diactoros-bridge](https://packagist.org/packages/mekras/httplug-diactoros-bridge):
+### Using [php-http/discovery](https://packagist.org/packages/php-http/discovery):
 
 ```php
 use Http\Client\Curl\Client;
-use Mekras\HttplugDiactorosBridge\DiactorosMessageFactory;
-use Mekras\HttplugDiactorosBridge\DiactorosStreamFactory;
+use Http\Discovery\MessageFactoryDiscovery;
+use Http\Discovery\StreamFactoryDiscovery;
 
-$messageFactory = new DiactorosMessageFactory();
-$client = new Client($messageFactory, new DiactorosStreamFactory());
+$messageFactory = MessageFactoryDiscovery::find();
+$streamFactory = StreamFactoryDiscovery::find();
+$client = new Client($messageFactory, $streamFactory);
 
 $request = $messageFactory->createRequest('GET', 'http://example.com/');
 $response = $client->sendRequest($request);

composer.json

@@ -10,17 +10,18 @@
             "email": "m.krasilnikov@yandex.ru"
         }
     ],
+    "prefer-stable": true,
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.5",
         "ext-curl": "*",
-        "php-http/httplug": "^1.0.0-alpha3",
+        "php-http/httplug": "^1.0",
         "php-http/message-factory": "^1.0"
     },
     "require-dev": {
         "guzzlehttp/psr7": "^1.0",
-        "php-http/adapter-integration-tests": "dev-master#a7fcf3e8b6d6f4f5172f15e3bf62a4ee17e8c877",
-        "php-http/discovery": "^0.5",
-        "php-http/utils": "^0.2",
+        "php-http/adapter-integration-tests": "0.3",
+        "php-http/message": "^0.2",
         "phpunit/phpunit": "^4.8@stable",
         "zendframework/zend-diactoros": "^1.0"
     },
@@ -40,7 +41,5 @@
     "scripts": {
         "test": "vendor/bin/phpunit",
         "test-ci": "vendor/bin/phpunit --coverage-clover build/coverage.xml"
-    },
-    "prefer-stable": true,
-    "minimum-stability": "dev"
+    }
 }

tests/HttpAsyncClientDiactorosTest.php

@@ -3,8 +3,8 @@
 
 use Http\Client\Curl\Client;
 use Http\Client\HttpClient;
-use Http\Client\Utils\MessageFactory\DiactorosMessageFactory;
-use Http\Client\Utils\StreamFactory\DiactorosStreamFactory;
+use Http\Message\MessageFactory\DiactorosMessageFactory;
+use Http\Message\StreamFactory\DiactorosStreamFactory;
 use Zend\Diactoros\Request;
 use Zend\Diactoros\Response;
 

tests/HttpAsyncClientGuzzleTest.php

@@ -3,8 +3,8 @@
 
 use Http\Client\Curl\Client;
 use Http\Client\HttpClient;
-use Http\Client\Utils\MessageFactory\GuzzleMessageFactory;
-use Http\Client\Utils\StreamFactory\GuzzleStreamFactory;
+use Http\Message\MessageFactory\GuzzleMessageFactory;
+use Http\Message\StreamFactory\GuzzleStreamFactory;
 
 /**
  * Tests for Http\Curl\Client

tests/HttpClientDiactorosTest.php

@@ -3,8 +3,8 @@
 
 use Http\Client\Curl\Client;
 use Http\Client\HttpClient;
-use Http\Client\Utils\MessageFactory\DiactorosMessageFactory;
-use Http\Client\Utils\StreamFactory\DiactorosStreamFactory;
+use Http\Message\MessageFactory\DiactorosMessageFactory;
+use Http\Message\StreamFactory\DiactorosStreamFactory;
 use Zend\Diactoros\Request;
 use Zend\Diactoros\Response;
 

tests/HttpClientGuzzleTest.php

@@ -3,8 +3,8 @@
 
 use Http\Client\Curl\Client;
 use Http\Client\HttpClient;
-use Http\Client\Utils\MessageFactory\GuzzleMessageFactory;
-use Http\Client\Utils\StreamFactory\GuzzleStreamFactory;
+use Http\Message\MessageFactory\GuzzleMessageFactory;
+use Http\Message\StreamFactory\GuzzleStreamFactory;
 
 /**
  * Tests for Http\Curl\Client

tests/PromiseCoreTest.php

@@ -42,7 +42,7 @@ function (ResponseInterface $response) {
                 return $response->withAddedHeader('X-Test', 'bar');
             }
         );
-        static::assertEquals('foo, bar', $core->getResponse()->getHeaderLine('X-Test'));
+        static::assertEquals('foo,bar', $core->getResponse()->getHeaderLine('X-Test'));
     }
 
     /**