Update to last change of httplug

  - Remove Body implementation according to #3
  - Remove options from sendRequest
  - Readapt BatchResult with changes from BatchResult / BatchException

Author: joelwurtz

spec/BatchRequestSpec.php

@@ -2,52 +2,52 @@
 
 namespace spec\Http\Client\Utils;
 
-use Http\Client\HttpPsrClient;
+use Http\Client\HttpClient;
 use Http\Client\Utils\BatchRequest;
 use PhpSpec\ObjectBehavior;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
 class BatchRequestSpec extends ObjectBehavior
 {
-    function let(HttpPsrClient $client)
+    function let(HttpClient $client)
     {
         $this->beAnInstanceOf('spec\Http\Client\Utils\BatchRequestStub', [$client]);
     }
 
-    function it_send_multiple_request_using_send_request(HttpPsrClient $client, RequestInterface $request1, RequestInterface $request2, ResponseInterface $response1, ResponseInterface $response2)
+    function it_send_multiple_request_using_send_request(HttpClient $client, RequestInterface $request1, RequestInterface $request2, ResponseInterface $response1, ResponseInterface $response2)
     {
-        $client->sendRequest($request1, [])->willReturn($response1);
-        $client->sendRequest($request2, [])->willReturn($response2);
+        $client->sendRequest($request1)->willReturn($response1);
+        $client->sendRequest($request2)->willReturn($response2);
 
-        $this->sendRequests([$request1, $request2], [])->shouldReturnAnInstanceOf('\Http\Client\BatchResult');
+        $this->sendRequests([$request1, $request2])->shouldReturnAnInstanceOf('Http\Client\BatchResult');
     }
 
-    function it_throw_batch_exception_if_one_or_more_request_failed(HttpPsrClient $client, RequestInterface $request1, RequestInterface $request2, ResponseInterface $response)
+    function it_throw_batch_exception_if_one_or_more_request_failed(HttpClient $client, RequestInterface $request1, RequestInterface $request2, ResponseInterface $response)
     {
-        $client->sendRequest($request1, [])->willReturn($response);
-        $client->sendRequest($request2, [])->willThrow('\Http\Client\Exception\HttpException');
+        $client->sendRequest($request1)->willReturn($response);
+        $client->sendRequest($request2)->willThrow('Http\Client\Exception\HttpException');
 
-        $this->shouldThrow('\Http\Client\Exception\BatchException')->duringSendRequests([$request1, $request2], []);
+        $this->shouldThrow('Http\Client\Exception\BatchException')->duringSendRequests([$request1, $request2]);
     }
 }
 
-class BatchRequestStub implements HttpPsrClient
+class BatchRequestStub implements HttpClient
 {
     use BatchRequest;
 
     protected $client;
 
-    public function __construct(HttpPsrClient $client)
+    public function __construct(HttpClient $client)
     {
         $this->client = $client;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function sendRequest(RequestInterface $request, array $options = [])
+    public function sendRequest(RequestInterface $request)
     {
-        return $this->client->sendRequest($request, $options);
+        return $this->client->sendRequest($request);
     }
 }

spec/BatchResultSpec.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace spec\Http\Client;
+namespace spec\Http\Client\Utils;
 
+use Http\Client\Exception;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use PhpSpec\ObjectBehavior;
@@ -10,15 +11,16 @@ class BatchResultSpec extends ObjectBehavior
 {
     function it_is_initializable()
     {
-        $this->shouldHaveType('Http\Client\BatchResult');
+        $this->beAnInstanceOf('Http\Client\Utils\BatchResult');
+        $this->shouldImplement('Http\Client\BatchResult');
     }
 
     function it_is_immutable(RequestInterface $request, ResponseInterface $response)
     {
         $new = $this->addResponse($request, $response);
 
         $this->getResponses()->shouldReturn([]);
-        $new->shouldHaveType('Http\Client\BatchResult');
+        $new->shouldHaveType('Http\Client\Utils\BatchResult');
         $new->getResponses()->shouldReturn([$response]);
     }
 
@@ -36,9 +38,18 @@ function it_has_a_response_for_a_request(RequestInterface $request, ResponseInte
     {
         $new = $this->addResponse($request, $response);
 
-        $this->shouldThrow('Http\Client\Exception\UnexpectedValueException')->duringGetResponseFor($request);
+        $this->shouldThrow('UnexpectedValueException')->duringGetResponseFor($request);
         $this->hasResponseFor($request)->shouldReturn(false);
         $new->getResponseFor($request)->shouldReturn($response);
         $new->hasResponseFor($request)->shouldReturn(true);
     }
+
+    function it_keeps_exception_after_add_request(RequestInterface $request1, Exception $exception, RequestInterface $request2, ResponseInterface $response)
+    {
+        $new = $this->addException($request1, $exception);
+        $new = $new->addResponse($request2, $response);
+
+        $new->getResponseFor($request2)->shouldReturn($response);
+        $new->getExceptionFor($request1)->shouldReturn($exception);
+    }
 }