Remove BatchResult implementation, remove custom SPL exceptions, use SPL exceptions where possible

Author: sagikazarmark

spec/BatchResultSpec.php

@@ -24,21 +24,22 @@ function it_is_an_exception()
         $this->shouldImplement('Http\Client\Exception');
     }
 
-    function it_has_a_result()
+    function it_throws_an_exception_if_the_result_is_not_available()
     {
-        $this->setResult($result = new BatchResult());
-        $this->getResult()->shouldReturn($result);
+        $this->shouldThrow('RuntimeException')->duringGetResult();
     }
 
-    function it_throws_an_exception_if_the_result_is_already_set()
+    function it_throws_an_exception_if_the_result_is_already_set(BatchResult $batchResult)
     {
+        $this->setResult($batchResult);
+
         $this->getResult()->shouldHaveType('Http\Client\BatchResult');
-        $this->shouldThrow('Http\Client\Exception\InvalidArgumentException')->duringSetResult(new BatchResult());
+        $this->shouldThrow('RuntimeException')->duringSetResult($batchResult);
     }
 
     function it_has_an_exception_for_a_request(RequestInterface $request, Exception $exception)
     {
-        $this->shouldThrow('Http\Client\Exception\UnexpectedValueException')->duringGetExceptionFor($request);
+        $this->shouldThrow('UnexpectedValueException')->duringGetExceptionFor($request);
         $this->hasExceptionFor($request)->shouldReturn(false);
 
         $this->addException($request, $exception);
@@ -56,8 +57,11 @@ function it_has_exceptions(RequestInterface $request, Exception $exception)
         $this->getExceptions()->shouldReturn([$exception]);
     }
 
-    function it_checks_if_a_request_failed(RequestInterface $request, Exception $exception)
+    function it_checks_if_a_request_failed(RequestInterface $request, Exception $exception, BatchResult $batchResult)
     {
+        $batchResult->hasResponseFor($request)->willReturn(false);
+        $this->setResult($batchResult);
+
         $this->isSuccessful($request)->shouldReturn(false);
         $this->isFailed($request)->shouldReturn(false);
 

spec/Exception/BatchExceptionSpec.php

@@ -2,7 +2,7 @@
 
 namespace Http\Client;
 
-use Http\Client\Exception\UnexpectedValueException;
+use Http\Client\Exception;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
@@ -11,33 +11,14 @@
  *
  * @author Márk Sági-Kazár <[email protected]>
  */
-final class BatchResult
+interface BatchResult
 {
-    /**
-     * @var \SplObjectStorage
-     */
-    private $responses;
-
-    public function __construct()
-    {
-        $this->responses = new \SplObjectStorage();
-    }
-
     /**
      * Returns all successful responses
      *
      * @return ResponseInterface[]
      */
-    public function getResponses()
-    {
-        $responses = [];
-
-        foreach ($this->responses as $request) {
-            $responses[] = $this->responses[$request];
-        }
-
-        return $responses;
-    }
+    public function getResponses();
 
     /**
      * Returns a response of a request
@@ -46,26 +27,16 @@ public function getResponses()
      *
      * @return ResponseInterface
      *
-     * @throws UnexpectedValueException
+     * @throws \UnexpectedValueException If request is not found
      */
-    public function getResponseFor(RequestInterface $request)
-    {
-        try {
-            return $this->responses[$request];
-        } catch (\UnexpectedValueException $e) {
-            throw new UnexpectedValueException('Request not found', $e->getCode(), $e);
-        }
-    }
+    public function getResponseFor(RequestInterface $request);
 
     /**
      * Checks if there are any successful responses at all
      *
      * @return boolean
      */
-    public function hasResponses()
-    {
-        return $this->responses->count() > 0;
-    }
+    public function hasResponses();
 
     /**
      * Checks if there is a response of a request
@@ -74,10 +45,7 @@ public function hasResponses()
      *
      * @return ResponseInterface
      */
-    public function hasResponseFor(RequestInterface $request)
-    {
-        return $this->responses->contains($request);
-    }
+    public function hasResponseFor(RequestInterface $request);
 
     /**
      * Adds a response in an immutable way
@@ -89,16 +57,5 @@ public function hasResponseFor(RequestInterface $request)
      *
      * @internal
      */
-    public function addResponse(RequestInterface $request, ResponseInterface $response)
-    {
-        $new = clone $this;
-        $new->responses->attach($request, $response);
-
-        return $new;
-    }
-
-    public function __clone()
-    {
-        $this->responses = clone $this->responses;
-    }
+    public function addResponse(RequestInterface $request, ResponseInterface $response);
 }

spec/Exception/InvalidArgumentExceptionSpec.php

@@ -36,11 +36,13 @@ public function __construct()
      * Note that the BatchResult may contains 0 responses if all requests failed.
      *
      * @return BatchResult
+     *
+     * @throws \RuntimeException If the BatchResult is not available
      */
     public function getResult()
     {
         if (!isset($this->result)) {
-            $this->result = new BatchResult();
+            throw new \RuntimeException('BatchResult is not available');
         }
 
         return $this->result;
@@ -51,14 +53,14 @@ public function getResult()
      *
      * @param BatchResult $result
      *
-     * @throws InvalidArgumentException If the BatchResult is already set
+     * @throws \RuntimeException If the BatchResult is already set
      *
      * @internal
      */
     public function setResult(BatchResult $result)
     {
         if (isset($this->result)) {
-            throw new InvalidArgumentException('BatchResult is already set');
+            throw new \RuntimeException('BatchResult is already set');
         }
 
         $this->result = $result;
@@ -111,14 +113,14 @@ public function getExceptions()
      *
      * @return Exception
      *
-     * @throws UnexpectedValueException
+     * @throws \UnexpectedValueException If request is not found
      */
     public function getExceptionFor(RequestInterface $request)
     {
         try {
             return $this->exceptions[$request];
         } catch (\UnexpectedValueException $e) {
-            throw new UnexpectedValueException('Request not found', $e->getCode(), $e);
+            throw new \UnexpectedValueException('Request not found', $e->getCode(), $e);
         }
     }