typehint psr exceptions (#161)

* typehint psr exceptions

* cs

Author: dbu

src/BatchClient.php

@@ -4,11 +4,9 @@
 
 namespace Http\Client\Common;
 
-use Http\Client\Exception;
 use Http\Client\Common\Exception\BatchException;
+use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Client\ClientInterface;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
 
 final class BatchClient implements BatchClientInterface
 {
@@ -22,20 +20,15 @@ public function __construct(ClientInterface $client)
         $this->client = $client;
     }
 
-    public function sendRequest(RequestInterface $request): ResponseInterface
-    {
-        return $this->client->sendRequest($request);
-    }
-
     public function sendRequests(array $requests): BatchResult
     {
         $batchResult = new BatchResult();
 
         foreach ($requests as $request) {
             try {
-                $response = $this->sendRequest($request);
+                $response = $this->client->sendRequest($request);
                 $batchResult = $batchResult->addResponse($request, $response);
-            } catch (Exception $e) {
+            } catch (ClientExceptionInterface $e) {
                 $batchResult = $batchResult->addException($request, $e);
             }
         }

src/BatchClientInterface.php

@@ -4,7 +4,6 @@
 
 namespace Http\Client\Common;
 
-use Http\Client\HttpClient;
 use Http\Client\Common\Exception\BatchException;
 use Psr\Http\Message\RequestInterface;
 
@@ -15,7 +14,7 @@
  *
  * @author Joel Wurtz <jwurtz@jolicode.com>
  */
-interface BatchClientInterface extends HttpClient
+interface BatchClientInterface
 {
     /**
      * Send several requests.

src/BatchResult.php

@@ -4,7 +4,7 @@
 
 namespace Http\Client\Common;
 
-use Http\Client\Exception;
+use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
@@ -102,7 +102,7 @@ public function hasExceptions(): bool
     /**
      * Returns all exceptions for the unsuccessful requests.
      *
-     * @return Exception[]
+     * @return ClientExceptionInterface[]
      */
     public function getExceptions(): array
     {
@@ -129,7 +129,7 @@ public function isFailed(RequestInterface $request): bool
      *
      * @throws \UnexpectedValueException If request was not part of the batch or was successful
      */
-    public function getExceptionFor(RequestInterface $request): Exception
+    public function getExceptionFor(RequestInterface $request): ClientExceptionInterface
     {
         try {
             return $this->exceptions[$request];
@@ -143,7 +143,7 @@ public function getExceptionFor(RequestInterface $request): Exception
      *
      * @return BatchResult the new BatchResult with this request-exception pair added to it
      */
-    public function addException(RequestInterface $request, Exception $exception): self
+    public function addException(RequestInterface $request, ClientExceptionInterface $exception): self
     {
         $new = clone $this;
         $new->exceptions->attach($request, $exception);

src/HttpClientPool/HttpClientPoolItem.php

@@ -55,7 +55,7 @@ class HttpClientPoolItem implements HttpClient, HttpAsyncClient
 
     /**
      * @param ClientInterface|HttpAsyncClient $client
-     * @param null|int                        $reenableAfter Number of seconds until this client is enabled again after an error
+     * @param int|null                        $reenableAfter Number of seconds until this client is enabled again after an error
      */
     public function __construct($client, $reenableAfter = null)
     {

src/HttpMethodsClient.php

@@ -21,10 +21,6 @@ final class HttpMethodsClient implements HttpMethodsClientInterface
      */
     private $requestFactory;
 
-    /**
-     * @param ClientInterface $httpClient     The client to send requests with
-     * @param RequestFactory  $requestFactory The message factory to create requests
-     */
     public function __construct(ClientInterface $httpClient, RequestFactory $requestFactory)
     {
         $this->httpClient = $httpClient;

src/Plugin/RequestMatcherPlugin.php

@@ -22,12 +22,12 @@ final class RequestMatcherPlugin implements Plugin
     private $requestMatcher;
 
     /**
-     * @var null|Plugin
+     * @var Plugin|null
      */
     private $successPlugin;
 
     /**
-     * @var null|Plugin
+     * @var Plugin|null
      */
     private $failurePlugin;