Throw invalid argument exception if request is not found

Author: sagikazarmark

spec/BatchResultSpec.php

@@ -36,7 +36,7 @@ function it_has_a_response_for_a_request(RequestInterface $request, ResponseInte
     {
         $new = $this->addResponse($request, $response);
 
-        $this->getResponseFor($request)->shouldReturn(null);
+        $this->shouldThrow('Http\Client\Exception\InvalidArgumentException')->duringGetResponseFor($request);
         $this->hasResponseFor($request)->shouldReturn(false);
         $new->getResponseFor($request)->shouldReturn($response);
         $new->hasResponseFor($request)->shouldReturn(true);

spec/Exception/BatchExceptionSpec.php

@@ -34,7 +34,7 @@ function it_throws_an_exception_if_the_result_is_already_set()
 
     function it_has_an_exception_for_a_request(RequestInterface $request, Exception $exception)
     {
-        $this->getExceptionFor($request)->shouldReturn(null);
+        $this->shouldThrow('Http\Client\Exception\InvalidArgumentException')->duringGetExceptionFor($request);
         $this->hasExceptionFor($request)->shouldReturn(false);
 
         $this->addException($request, $exception);

src/BatchResult.php

@@ -2,6 +2,7 @@
 
 namespace Http\Client;
 
+use Http\Client\Exception\InvalidArgumentException;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
@@ -39,17 +40,21 @@ public function getResponses()
     }
 
     /**
-     * Returns a response of a request or null if not found
+     * Returns a response of a request
      *
      * @param RequestInterface $request
      *
-     * @return ResponseInterface|null
+     * @return ResponseInterface
+     *
+     * @throws InvalidArgumentException
      */
     public function getResponseFor(RequestInterface $request)
     {
-        if ($this->responses->contains($request)) {
-            return $this->responses[$request];
+        if (!$this->responses->contains($request)) {
+            throw new InvalidArgumentException('No response can be found for the given request');
         }
+
+        return $this->responses[$request];
     }
 
     /**

src/Exception/BatchException.php

@@ -105,17 +105,21 @@ public function getExceptions()
     }
 
     /**
-     * Returns an exception for a request or null if not found
+     * Returns an exception for a request
      *
      * @param RequestInterface $request
      *
-     * @return Exception|null
+     * @return Exception
+     *
+     * @throws InvalidArgumentException
      */
     public function getExceptionFor(RequestInterface $request)
     {
-        if ($this->exceptions->contains($request)) {
-            return $this->exceptions[$request];
+        if (!$this->exceptions->contains($request)) {
+            throw new InvalidArgumentException('No exception can be found for the given request');
         }
+
+        return $this->exceptions[$request];
     }
 
     /**