Use http based promise in emulated trait and specs

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Add HttpClientPool client to leverage load balancing and fallback mechanism [see the documentation](http://docs.php-http.org/en/latest/components/client-common.html) for more details
 
 ### Changed
+- Fix Emulated Trait to use Http based promise which respect the HttpAsyncClient interface
 - RedirectPlugin: use the full URL instead of the URI to properly keep track of redirects
 
 ## 1.2.1 - 2016-07-26

composer.json

@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": ">=5.4",
-        "php-http/httplug": "^1.0",
+        "php-http/httplug": "^1.1",
         "php-http/message-factory": "^1.0",
         "php-http/message": "^1.2",
         "symfony/options-resolver": "^2.6 || ^3.0"

spec/EmulatedHttpAsyncClientSpec.php

@@ -36,14 +36,14 @@ function it_emulates_a_successful_request(
     ) {
         $httpClient->sendRequest($request)->willReturn($response);
 
-        $this->sendAsyncRequest($request)->shouldReturnAnInstanceOf('Http\Promise\FulfilledPromise');
+        $this->sendAsyncRequest($request)->shouldReturnAnInstanceOf('Http\Client\Promise\HttpFulfilledPromise');
     }
 
     function it_emulates_a_failed_request(HttpClient $httpClient, RequestInterface $request)
     {
         $httpClient->sendRequest($request)->willThrow('Http\Client\Exception\TransferException');
 
-        $this->sendAsyncRequest($request)->shouldReturnAnInstanceOf('Http\Promise\RejectedPromise');
+        $this->sendAsyncRequest($request)->shouldReturnAnInstanceOf('Http\Client\Promise\HttpRejectedPromise');
     }
 
     function it_decorates_the_underlying_client(

spec/HttpClientPoolItemSpec.php

@@ -6,8 +6,8 @@
 use Http\Client\Exception\TransferException;
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
+use Http\Client\Promise\HttpRejectedPromise;
 use Http\Promise\Promise;
-use Http\Promise\RejectedPromise;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use Psr\Http\Message\RequestInterface;
@@ -60,10 +60,10 @@ public function it_disable_himself_on_send_async_request(HttpAsyncClient $httpAs
     {
         $this->beConstructedWith($httpAsyncClient);
 
-        $promise = new RejectedPromise(new TransferException());
+        $promise = new HttpRejectedPromise(new TransferException());
         $httpAsyncClient->sendAsyncRequest($request)->willReturn($promise);
 
-        $this->sendAsyncRequest($request)->shouldReturnAnInstanceOf('Http\Promise\RejectedPromise');
+        $this->sendAsyncRequest($request)->shouldReturnAnInstanceOf('Http\Client\Promise\HttpRejectedPromise');
         $this->isDisabled()->shouldReturn(true);
         $this->shouldThrow('Http\Client\Exception\RequestException')->duringSendAsyncRequest($request);
     }
@@ -84,12 +84,12 @@ public function it_reactivate_himself_on_send_async_request(HttpAsyncClient $htt
     {
         $this->beConstructedWith($httpAsyncClient, 0);
 
-        $promise = new RejectedPromise(new TransferException());
+        $promise = new HttpRejectedPromise(new TransferException());
         $httpAsyncClient->sendAsyncRequest($request)->willReturn($promise);
 
-        $this->sendAsyncRequest($request)->shouldReturnAnInstanceOf('Http\Promise\RejectedPromise');
+        $this->sendAsyncRequest($request)->shouldReturnAnInstanceOf('Http\Client\Promise\HttpRejectedPromise');
         $this->isDisabled()->shouldReturn(false);
-        $this->sendAsyncRequest($request)->shouldReturnAnInstanceOf('Http\Promise\RejectedPromise');
+        $this->sendAsyncRequest($request)->shouldReturnAnInstanceOf('Http\Client\Promise\HttpRejectedPromise');
     }
 
     public function it_increments_request_count(HttpAsyncClient $httpAsyncClient, RequestInterface $request, ResponseInterface $response)

spec/Plugin/AddHostPluginSpec.php

@@ -4,10 +4,7 @@
 
 use Http\Message\StreamFactory;
 use Http\Message\UriFactory;
-use Http\Promise\FulfilledPromise;
 use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
 use PhpSpec\ObjectBehavior;
 

spec/Plugin/CookiePluginSpec.php

@@ -2,7 +2,7 @@
 
 namespace spec\Http\Client\Common\Plugin;
 
-use Http\Promise\FulfilledPromise;
+use Http\Client\Promise\HttpFulfilledPromise;
 use Http\Message\Cookie;
 use Http\Message\CookieJar;
 use Http\Promise\Promise;
@@ -141,7 +141,7 @@ function it_loads_cookie_when_cookie_is_secure(RequestInterface $request, UriInt
     function it_saves_cookie(RequestInterface $request, ResponseInterface $response, UriInterface $uri)
     {
         $next = function () use ($response) {
-            return new FulfilledPromise($response->getWrappedObject());
+            return new HttpFulfilledPromise($response->getWrappedObject());
         };
 
         $response->hasHeader('Set-Cookie')->willReturn(true);
@@ -164,7 +164,7 @@ function it_throws_exception_on_invalid_expires_date(
         UriInterface $uri
     ) {
         $next = function () use ($response) {
-            return new FulfilledPromise($response->getWrappedObject());
+            return new HttpFulfilledPromise($response->getWrappedObject());
         };
 
         $response->hasHeader('Set-Cookie')->willReturn(true);
@@ -177,7 +177,7 @@ function it_throws_exception_on_invalid_expires_date(
         $uri->getPath()->willReturn('/');
 
         $promise = $this->handleRequest($request, $next, function () {});
-        $promise->shouldReturnAnInstanceOf('Http\Promise\RejectedPromise');
+        $promise->shouldReturnAnInstanceOf('Http\Client\Promise\HttpRejectedPromise');
         $promise->shouldThrow('Http\Client\Exception\TransferException')->duringWait();
     }
 }

spec/Plugin/DecoderPluginSpec.php

@@ -2,7 +2,7 @@
 
 namespace spec\Http\Client\Common\Plugin;
 
-use Http\Promise\FulfilledPromise;
+use Http\Client\Promise\HttpFulfilledPromise;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
@@ -31,7 +31,7 @@ function it_decodes(RequestInterface $request, ResponseInterface $response, Stre
         $request->withHeader('TE', ['gzip', 'deflate', 'compress', 'chunked'])->shouldBeCalled()->willReturn($request);
         $request->withHeader('Accept-Encoding', ['gzip', 'deflate', 'compress'])->shouldBeCalled()->willReturn($request);
         $next = function () use($response) {
-            return new FulfilledPromise($response->getWrappedObject());
+            return new HttpFulfilledPromise($response->getWrappedObject());
         };
 
         $response->hasHeader('Transfer-Encoding')->willReturn(true);
@@ -53,7 +53,7 @@ function it_decodes_gzip(RequestInterface $request, ResponseInterface $response,
         $request->withHeader('TE', ['gzip', 'deflate', 'compress', 'chunked'])->shouldBeCalled()->willReturn($request);
         $request->withHeader('Accept-Encoding', ['gzip', 'deflate', 'compress'])->shouldBeCalled()->willReturn($request);
         $next = function () use($response) {
-            return new FulfilledPromise($response->getWrappedObject());
+            return new HttpFulfilledPromise($response->getWrappedObject());
         };
 
         $response->hasHeader('Transfer-Encoding')->willReturn(false);
@@ -75,7 +75,7 @@ function it_decodes_deflate(RequestInterface $request, ResponseInterface $respon
         $request->withHeader('TE', ['gzip', 'deflate', 'compress', 'chunked'])->shouldBeCalled()->willReturn($request);
         $request->withHeader('Accept-Encoding', ['gzip', 'deflate', 'compress'])->shouldBeCalled()->willReturn($request);
         $next = function () use($response) {
-            return new FulfilledPromise($response->getWrappedObject());
+            return new HttpFulfilledPromise($response->getWrappedObject());
         };
 
         $response->hasHeader('Transfer-Encoding')->willReturn(false);
@@ -97,7 +97,7 @@ function it_decodes_inflate(RequestInterface $request, ResponseInterface $respon
         $request->withHeader('TE', ['gzip', 'deflate', 'compress', 'chunked'])->shouldBeCalled()->willReturn($request);
         $request->withHeader('Accept-Encoding', ['gzip', 'deflate', 'compress'])->shouldBeCalled()->willReturn($request);
         $next = function () use($response) {
-            return new FulfilledPromise($response->getWrappedObject());
+            return new HttpFulfilledPromise($response->getWrappedObject());
         };
 
         $response->hasHeader('Transfer-Encoding')->willReturn(false);
@@ -121,7 +121,7 @@ function it_does_not_decode_with_content_encoding(RequestInterface $request, Res
         $request->withHeader('TE', ['gzip', 'deflate', 'compress', 'chunked'])->shouldBeCalled()->willReturn($request);
         $request->withHeader('Accept-Encoding', ['gzip', 'deflate', 'compress'])->shouldNotBeCalled();
         $next = function () use($response) {
-            return new FulfilledPromise($response->getWrappedObject());
+            return new HttpFulfilledPromise($response->getWrappedObject());
         };
 
         $response->hasHeader('Transfer-Encoding')->willReturn(false);

spec/Plugin/ErrorPluginSpec.php

@@ -2,7 +2,7 @@
 
 namespace spec\Http\Client\Common\Plugin;
 
-use Http\Promise\FulfilledPromise;
+use Http\Client\Promise\HttpFulfilledPromise;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use PhpSpec\ObjectBehavior;
@@ -27,12 +27,12 @@ function it_throw_client_error_exception_on_4xx_error(RequestInterface $request,
 
         $next = function (RequestInterface $receivedRequest) use($request, $response) {
             if (Argument::is($request->getWrappedObject())->scoreArgument($receivedRequest)) {
-                return new FulfilledPromise($response->getWrappedObject());
+                return new HttpFulfilledPromise($response->getWrappedObject());
             }
         };
 
         $promise = $this->handleRequest($request, $next, function () {});
-        $promise->shouldReturnAnInstanceOf('Http\Promise\RejectedPromise');
+        $promise->shouldReturnAnInstanceOf('Http\Client\Promise\HttpRejectedPromise');
         $promise->shouldThrow('Http\Client\Common\Exception\ClientErrorException')->duringWait();
     }
 
@@ -43,12 +43,12 @@ function it_throw_server_error_exception_on_5xx_error(RequestInterface $request,
 
         $next = function (RequestInterface $receivedRequest) use($request, $response) {
             if (Argument::is($request->getWrappedObject())->scoreArgument($receivedRequest)) {
-                return new FulfilledPromise($response->getWrappedObject());
+                return new HttpFulfilledPromise($response->getWrappedObject());
             }
         };
 
         $promise = $this->handleRequest($request, $next, function () {});
-        $promise->shouldReturnAnInstanceOf('Http\Promise\RejectedPromise');
+        $promise->shouldReturnAnInstanceOf('Http\Client\Promise\HttpRejectedPromise');
         $promise->shouldThrow('Http\Client\Common\Exception\ServerErrorException')->duringWait();
     }
 
@@ -58,10 +58,10 @@ function it_returns_response(RequestInterface $request, ResponseInterface $respo
 
         $next = function (RequestInterface $receivedRequest) use($request, $response) {
             if (Argument::is($request->getWrappedObject())->scoreArgument($receivedRequest)) {
-                return new FulfilledPromise($response->getWrappedObject());
+                return new HttpFulfilledPromise($response->getWrappedObject());
             }
         };
 
-        $this->handleRequest($request, $next, function () {})->shouldReturnAnInstanceOf('Http\Promise\FulfilledPromise');
+        $this->handleRequest($request, $next, function () {})->shouldReturnAnInstanceOf('Http\Client\Promise\HttpFulfilledPromise');
     }
 }

spec/Plugin/HistoryPluginSpec.php

@@ -4,8 +4,8 @@
 
 use Http\Client\Exception\TransferException;
 use Http\Client\Common\Plugin\Journal;
-use Http\Promise\FulfilledPromise;
-use Http\Promise\RejectedPromise;
+use Http\Client\Promise\HttpFulfilledPromise;
+use Http\Client\Promise\HttpRejectedPromise;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use PhpSpec\ObjectBehavior;
@@ -32,7 +32,7 @@ function it_records_success(Journal $journal, RequestInterface $request, Respons
     {
         $next = function (RequestInterface $receivedRequest) use($request, $response) {
             if (Argument::is($request->getWrappedObject())->scoreArgument($receivedRequest)) {
-                return new FulfilledPromise($response->getWrappedObject());
+                return new HttpFulfilledPromise($response->getWrappedObject());
             }
         };
 
@@ -46,7 +46,7 @@ function it_records_failure(Journal $journal, RequestInterface $request)
         $exception = new TransferException();
         $next = function (RequestInterface $receivedRequest) use($request, $exception) {
             if (Argument::is($request->getWrappedObject())->scoreArgument($receivedRequest)) {
-                return new RejectedPromise($exception);
+                return new HttpRejectedPromise($exception);
             }
         };