Merge pull request #3 from php-http/feature/promise

Use new promise package and make update with new interface

Author: sagikazarmark

composer.json

@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": ">=5.4",
-        "php-http/httplug": "^1.0.0-alpha2",
+        "php-http/httplug": "1.0.0-alpha3",
         "php-http/message-factory": "^0.4@dev",
         "react/http-client": "^0.4.8",
         "react/dns": "^0.4.1",

src/ReactHttpAdapter.php

@@ -9,9 +9,9 @@
 use React\HttpClient\Response as ReactResponse;
 use Http\Client\HttpClient;
 use Http\Client\HttpAsyncClient;
-use Http\Client\Promise;
 use Http\Client\Exception\HttpException;
 use Http\Client\Exception\RequestException;
+use Http\Promise\Promise;
 use Http\Message\MessageFactory;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;
@@ -62,13 +62,8 @@ public function __construct(
     public function sendRequest(RequestInterface $request)
     {
         $promise = $this->sendAsyncRequest($request);
-        $promise->wait();
 
-        if ($promise->getState() == Promise::REJECTED) {
-            throw $promise->getException();
-        }
-
-        return $promise->getResponse();
+        return $promise->wait();
     }
 
     /**

src/ReactPromiseAdapter.php

@@ -4,8 +4,8 @@
 
 use React\EventLoop\LoopInterface;
 use React\Promise\PromiseInterface as ReactPromise;
-use Http\Client\Promise;
 use Http\Client\Exception;
+use Http\Promise\Promise;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -91,22 +91,6 @@ public function getState()
         return $this->state;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getResponse()
-    {
-        return $this->response;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getException()
-    {
-        return $this->exception;
-    }
-
     /**
      * Set EventLoop used for synchronous processing
      * @param LoopInterface $loop
@@ -121,13 +105,21 @@ public function setLoop(LoopInterface $loop)
     /**
      * {@inheritdoc}
      */
-    public function wait()
+    public function wait($unwrap = true)
     {
         if (null === $this->loop) {
             throw new \LogicException("You must set the loop before wait!");
         }
         while (Promise::PENDING === $this->getState()) {
             $this->loop->tick();
         }
+
+        if ($unwrap) {
+            if (Promise::REJECTED == $this->getState()) {
+                throw $this->exception;
+            }
+
+            return $this->response;
+        }
     }
 }