Merge 95c829d into 5183cf8

Author: joelwurtz

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 2.0.0 - Unreleased
+
+- The HttpAsyncClient now returns a HttpPromise (instead of a Promise)
+
+## 1.1.0 - Unreleased
+
+- Added HttpPromise interface to enforce value of rejected and resolved promise
+- Added HttpFulfilledPromise and HttpRejectedPromise which respect the HttpAsyncClient interface
 
 ## 1.0.0 - 2016-01-26
 

src/HttpAsyncClient.php

@@ -19,7 +19,7 @@ interface HttpAsyncClient
      *
      * @param RequestInterface $request
      *
-     * @return Promise Resolves a PSR-7 Response or fails with an Http\Client\Exception.
+     * @return Promise Promise Resolves a PSR-7 Response or fails with an Http\Client\Exception.
      *
      * @throws \Exception If processing the request is impossible (eg. bad configuration).
      */

src/Promise/HttpFulfilledPromise.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Http\Client\Promise;
+
+use Http\Client\Exception;
+use Psr\Http\Message\ResponseInterface;
+
+final class HttpFulfilledPromise implements HttpPromise
+{
+    /**
+     * @var ResponseInterface
+     */
+    private $response;
+
+    /**
+     * @param ResponseInterface $response
+     */
+    public function __construct(ResponseInterface $response)
+    {
+        $this->response = $response;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function then(callable $onFulfilled = null, callable $onRejected = null)
+    {
+        if (null === $onFulfilled) {
+            return $this;
+        }
+
+        try {
+            return new self($onFulfilled($this->response));
+        } catch (Exception $e) {
+            return new HttpRejectedPromise($e);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getState()
+    {
+        return HttpPromise::FULFILLED;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function wait($unwrap = true)
+    {
+        if ($unwrap) {
+            return $this->response;
+        }
+    }
+}

src/Promise/HttpPromise.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Http\Client\Promise;
+
+use Http\Client\Exception;
+use Http\Promise\Promise;
+use Psr\Http\Message\ResponseInterface;
+
+interface HttpPromise extends Promise
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @return HttpPromise A new resolved http promise with value of the executed callback (onFulfilled / onRejected).
+     */
+    public function then(callable $onFulfilled = null, callable $onRejected = null);
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return ResponseInterface Resolved response, null if $unwrap is set to false
+     *
+     * @throws Exception The http exception if $unwrap is set to true and the request failed.
+     */
+    public function wait($unwrap = true);
+}

src/Promise/HttpRejectedPromise.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Http\Client\Promise;
+
+use Http\Client\Exception;
+
+final class HttpRejectedPromise implements HttpPromise
+{
+    /**
+     * @var Exception
+     */
+    private $exception;
+
+    /**
+     * @param Exception $exception
+     */
+    public function __construct(Exception $exception)
+    {
+        $this->exception = $exception;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function then(callable $onFulfilled = null, callable $onRejected = null)
+    {
+        if (null === $onRejected) {
+            return $this;
+        }
+
+        try {
+            return new HttpFulfilledPromise($onRejected($this->exception));
+        } catch (Exception $e) {
+            return new self($e);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getState()
+    {
+        return HttpPromise::REJECTED;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function wait($unwrap = true)
+    {
+        if ($unwrap) {
+            throw $this->exception;
+        }
+    }
+}