Merge pull request #10 from Nyholm/stable

Updated to stable versions of Httplug

Author: sagikazarmark

composer.json

@@ -12,14 +12,15 @@
     ],
     "require": {
         "php": ">=5.4",
-        "php-http/client-common": "^0.1.1",
+        "php-http/httplug": "^1.0",
         "react/http-client": "^0.4.8",
         "react/dns": "^0.4.1",
         "react/stream": "^0.4.3"
     },
     "require-dev": {
         "guzzlehttp/psr7": "^1.0",
-        "php-http/adapter-integration-tests": "dev-master"
+        "php-http/adapter-integration-tests": "^0.3.1",
+        "puli/composer-plugin": "1.0.0-beta9"
     },
     "autoload": {
         "psr-4": {
@@ -45,5 +46,5 @@
         "test-ci": "vendor/bin/phpunit --coverage-clover build/coverage.xml"
     },
     "prefer-stable": true,
-    "minimum-stability": "dev"
+    "minimum-stability": "beta"
 }

src/Client.php

@@ -2,6 +2,7 @@
 
 namespace Http\Adapter\React;
 
+use Psr\Http\Message\ResponseInterface;
 use React\EventLoop\LoopInterface;
 use React\Promise\Deferred;
 use React\HttpClient\Client as ReactClient;
@@ -46,8 +47,8 @@ class Client implements HttpClient, HttpAsyncClient
     /**
      * Initialize the React client.
      *
+     * @param MessageFactory     $messageFactory
      * @param LoopInterface|null $loop     React Event loop
-     * @param Resolver           $resolver React async DNS resolver
      * @param ReactClient        $client   React client to use
      */
     public function __construct(

src/Promise.php

@@ -76,7 +76,7 @@ function (Exception $error) {
      * @param callable|null $onFulfilled
      * @param callable|null $onRejected
      *
-     * @return ReactPromiseAdapter
+     * @return Promise
      */
     public function then(callable $onFulfilled = null, callable $onRejected = null)
     {
@@ -106,7 +106,7 @@ public function getState()
      *
      * @param LoopInterface $loop
      *
-     * @return ReactPromiseAdapter
+     * @return Promise
      */
     public function setLoop(LoopInterface $loop)
     {

src/ReactFactory.php

@@ -47,7 +47,7 @@ public static function buildDnsResolver(
      * Build a React Http Client.
      *
      * @param LoopInterface $loop
-     * @param Resolver      $dns
+     * @param DnsResolver   $dns
      *
      * @return HttpClient
      */

tests/AsyncClientTest.php

@@ -2,6 +2,7 @@
 
 namespace Http\Adapter\React\Tests;
 
+use Http\Client\HttpClient;
 use Http\Discovery\MessageFactoryDiscovery;
 use Http\Client\Tests\HttpAsyncClientTest;
 use Http\Adapter\React\Client;

tests/ClientTest.php

@@ -2,9 +2,10 @@
 
 namespace Http\Adapter\React\Tests;
 
-use Http\Discovery\MessageFactoryDiscovery;
+use Http\Client\HttpClient;
 use Http\Client\Tests\HttpClientTest;
 use Http\Adapter\React\Client;
+use Http\Discovery\MessageFactoryDiscovery;
 
 /**
  * @author Stéphane Hulard <[email protected]>