remove http client interface

Author: barryvdh

composer.json

@@ -43,8 +43,7 @@
         "php-http/message": "^1.5",
         "php-http/discovery": "^1.2.1",
         "symfony/http-foundation": "^2.1|^3|^4",
-        "moneyphp/money": "^3.1",
-        "psr/http-client": "^0.1.0"
+        "moneyphp/money": "^3.1"
     },
     "require-dev": {
         "omnipay/tests": "^3",

src/Common/Http/Client.php

@@ -41,11 +41,8 @@ public function __construct($httpClient = null, RequestFactory $requestFactory =
      * @param array $headers
      * @param string|array|resource|StreamInterface|null $body
      * @param string $protocolVersion
-     *
-     * @throws \Psr\Http\Client\Exception\NetworkException
-     * @throws \Psr\Http\Client\Exception\RequestException
-     *
      * @return ResponseInterface
+     * @throws \Http\Client\Exception
      */
     public function request(
         string $method,
@@ -62,8 +59,7 @@ public function request(
     /**
      * @param RequestInterface $request
      * @return ResponseInterface
-     * @throws \Psr\Http\Client\Exception\NetworkException
-     * @throws \Psr\Http\Client\Exception\RequestException
+     * @throws \Http\Client\Exception
      */
     private function sendRequest(RequestInterface $request)
     {

src/Common/Http/ClientInterface.php

@@ -2,8 +2,8 @@
 
 namespace Omnipay\Common\Http;
 
-use Psr\Http\Client\Exception\NetworkException;
-use Psr\Http\Client\Exception\RequestException;
+use Omnipay\Common\Http\Exception\NetworkException;
+use Omnipay\Common\Http\Exception\RequestException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;

src/Common/Http/Exception/NetworkException.php

@@ -3,8 +3,7 @@
 namespace Omnipay\Common\Http\Exception;
 
 use Omnipay\Common\Http\Exception;
-use Psr\Http\Client\Exception\NetworkException as PsrNetworkException;
 
-class NetworkException extends Exception implements PsrNetworkException
+class NetworkException extends Exception
 {
 }

src/Common/Http/Exception/RequestException.php

@@ -3,8 +3,7 @@
 namespace Omnipay\Common\Http\Exception;
 
 use Omnipay\Common\Http\Exception;
-use Psr\Http\Client\Exception\RequestException as PsrRequestException;
 
-class RequestException extends Exception implements PsrRequestException
+class RequestException extends Exception
 {
 }

tests/Omnipay/Common/Http/ClientTest.php

@@ -9,7 +9,6 @@
 use Http\Client\HttpClient;
 use Http\Message\RequestFactory;
 use Omnipay\Tests\TestCase;
-use Psr\Http\Client\Exception\RequestException;
 
 class ClientTest extends TestCase
 {
@@ -68,7 +67,7 @@ public function testSendException()
             ->with($request)
             ->andThrow(new \Exception('Something went wrong'));
 
-        $this->expectException(RequestException::class);
+        $this->expectException(\Omnipay\Common\Http\Exception\RequestException::class);
         $this->expectExceptionMessage('Something went wrong');
 
         $client->request('GET', '/path');
@@ -95,7 +94,7 @@ public function testSendNetworkException()
             ->with($request)
             ->andThrow(new NetworkException('Something went wrong', $request));
 
-        $this->expectException(\Psr\Http\Client\Exception\NetworkException::class);
+        $this->expectException(\Omnipay\Common\Http\Exception\NetworkException::class);
         $this->expectExceptionMessage('Something went wrong');
 
         $client->request('GET', '/path');