Add custom UnexpectedValueException, throw exception when 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->shouldThrow('Http\Client\Exception\InvalidArgumentException')->duringGetResponseFor($request);
+        $this->shouldThrow('Http\Client\Exception\UnexpectedValueException')->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->shouldThrow('Http\Client\Exception\InvalidArgumentException')->duringGetExceptionFor($request);
+        $this->shouldThrow('Http\Client\Exception\UnexpectedValueException')->duringGetExceptionFor($request);
         $this->hasExceptionFor($request)->shouldReturn(false);
 
         $this->addException($request, $exception);

spec/Exception/UnexpectedValueExceptionSpec.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace spec\Http\Client\Exception;
+
+use PhpSpec\ObjectBehavior;
+
+class UnexpectedValueExceptionSpec extends ObjectBehavior
+{
+    function it_is_initializable()
+    {
+        $this->shouldHaveType('Http\Client\Exception\UnexpectedValueException');
+    }
+
+    function it_is_invalid_argument_exception()
+    {
+        $this->shouldHaveType('UnexpectedValueException');
+    }
+
+    function it_is_exception()
+    {
+        $this->shouldImplement('Http\Client\Exception');
+    }
+}

src/BatchResult.php

@@ -2,7 +2,7 @@
 
 namespace Http\Client;
 
-use Http\Client\Exception\InvalidArgumentException;
+use Http\Client\Exception\UnexpectedValueException;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
@@ -46,15 +46,15 @@ public function getResponses()
      *
      * @return ResponseInterface
      *
-     * @throws InvalidArgumentException
+     * @throws UnexpectedValueException
      */
     public function getResponseFor(RequestInterface $request)
     {
-        if (!$this->responses->contains($request)) {
-            throw new InvalidArgumentException('No response can be found for the given request');
+        try {
+            return $this->responses[$request];
+        } catch (\UnexpectedValueException $e) {
+            throw new UnexpectedValueException('Request not found', $e->getCode(), $e);
         }
-
-        return $this->responses[$request];
     }
 
     /**

src/Exception/BatchException.php

@@ -111,15 +111,15 @@ public function getExceptions()
      *
      * @return Exception
      *
-     * @throws InvalidArgumentException
+     * @throws UnexpectedValueException
      */
     public function getExceptionFor(RequestInterface $request)
     {
-        if (!$this->exceptions->contains($request)) {
-            throw new InvalidArgumentException('No exception can be found for the given request');
+        try {
+            return $this->exceptions[$request];
+        } catch (\UnexpectedValueException $e) {
+            throw new UnexpectedValueException('Request not found', $e->getCode(), $e);
         }
-
-        return $this->exceptions[$request];
     }
 
     /**

src/Exception/UnexpectedValueException.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Http\Client\Exception;
+
+use Http\Client\Exception;
+
+/**
+ * Custom Unexpected Value exception
+ *
+ * @author Márk Sági-Kazár <mark.sagikazar@gmail.com>
+ */
+class UnexpectedValueException extends \UnexpectedValueException implements Exception
+{
+}