Merge pull request #163 from Nyholm/issue-160

Updated the exceptions we are using

Author: dbu

src/Plugin/HistoryPlugin.php

@@ -5,8 +5,8 @@
 namespace Http\Client\Common\Plugin;
 
 use Http\Client\Common\Plugin;
-use Http\Client\Exception;
 use Http\Promise\Promise;
+use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
@@ -40,7 +40,7 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
             $journal->addSuccess($request, $response);
 
             return $response;
-        }, function (Exception $exception) use ($request, $journal) {
+        }, function (ClientExceptionInterface $exception) use ($request, $journal) {
             $journal->addFailure($request, $exception);
 
             throw $exception;

src/Plugin/Journal.php

@@ -4,7 +4,7 @@
 
 namespace Http\Client\Common\Plugin;
 
-use Http\Client\Exception;
+use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
@@ -26,8 +26,8 @@ public function addSuccess(RequestInterface $request, ResponseInterface $respons
     /**
      * Record a failed call.
      *
-     * @param RequestInterface $request   Request use to make the call
-     * @param Exception        $exception Exception returned by the call
+     * @param RequestInterface         $request   Request use to make the call
+     * @param ClientExceptionInterface $exception Exception returned by the call
      */
-    public function addFailure(RequestInterface $request, Exception $exception);
+    public function addFailure(RequestInterface $request, ClientExceptionInterface $exception);
 }

src/Plugin/RetryPlugin.php

@@ -5,9 +5,9 @@
 namespace Http\Client\Common\Plugin;
 
 use Http\Client\Common\Plugin;
-use Http\Client\Exception;
 use Http\Client\Exception\HttpException;
 use Http\Promise\Promise;
+use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -74,7 +74,7 @@ public function __construct(array $config = [])
                 // do not retry client errors
                 return $response->getStatusCode() >= 500 && $response->getStatusCode() < 600;
             },
-            'exception_decider' => function (RequestInterface $request, Exception $e) {
+            'exception_decider' => function (RequestInterface $request, ClientExceptionInterface $e) {
                 // do not retry client errors
                 return !$e instanceof HttpException || $e->getCode() >= 500 && $e->getCode() < 600;
             },
@@ -124,7 +124,7 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
             }
 
             return $response;
-        }, function (Exception $exception) use ($request, $next, $first, $chainIdentifier) {
+        }, function (ClientExceptionInterface $exception) use ($request, $next, $first, $chainIdentifier) {
             if (!array_key_exists($chainIdentifier, $this->retryStorage)) {
                 $this->retryStorage[$chainIdentifier] = 0;
             }
@@ -156,7 +156,7 @@ public static function defaultErrorResponseDelay(RequestInterface $request, Resp
     /**
      * @param int $retries The number of retries we made before. First time this get called it will be 0.
      */
-    public static function defaultExceptionDelay(RequestInterface $request, Exception $e, int $retries): int
+    public static function defaultExceptionDelay(RequestInterface $request, ClientExceptionInterface $e, int $retries): int
     {
         return pow(2, $retries) * 500000;
     }