fix tests

Author: dbu

spec/HttpMethodsClientSpec.php

@@ -3,9 +3,9 @@
 namespace spec\Http\Client\Common;
 
 use Http\Client\Common\HttpMethodsClient;
-use Http\Client\HttpClient;
-use Http\Message\RequestFactory;
 use PhpSpec\ObjectBehavior;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
@@ -19,7 +19,7 @@ class HttpMethodsClientSpec extends ObjectBehavior
         'body' => 'body',
     ];
 
-    public function let(HttpClient $client, RequestFactory $requestFactory)
+    public function let(ClientInterface $client, RequestFactoryInterface $requestFactory)
     {
         $this->beAnInstanceOf(
             HttpMethodsClient::class, [
@@ -29,42 +29,42 @@ public function let(HttpClient $client, RequestFactory $requestFactory)
         );
     }
 
-    public function it_sends_a_get_request(HttpClient $client, RequestFactory $requestFactory, RequestInterface $request, ResponseInterface $response)
+    public function it_sends_a_get_request(ClientInterface $client, RequestFactoryInterface $requestFactory, RequestInterface $request, ResponseInterface $response)
     {
         $this->assert($client, $requestFactory, $request, $response, 'get');
     }
 
-    public function it_sends_a_head_request(HttpClient $client, RequestFactory $requestFactory, RequestInterface $request, ResponseInterface $response)
+    public function it_sends_a_head_request(ClientInterface $client, RequestFactoryInterface $requestFactory, RequestInterface $request, ResponseInterface $response)
     {
         $this->assert($client, $requestFactory, $request, $response, 'head');
     }
 
-    public function it_sends_a_trace_request(HttpClient $client, RequestFactory $requestFactory, RequestInterface $request, ResponseInterface $response)
+    public function it_sends_a_trace_request(ClientInterface $client, RequestFactoryInterface $requestFactory, RequestInterface $request, ResponseInterface $response)
     {
         $this->assert($client, $requestFactory, $request, $response, 'trace');
     }
 
-    public function it_sends_a_post_request(HttpClient $client, RequestFactory $requestFactory, RequestInterface $request, ResponseInterface $response)
+    public function it_sends_a_post_request(ClientInterface $client, RequestFactoryInterface $requestFactory, RequestInterface $request, ResponseInterface $response)
     {
         $this->assert($client, $requestFactory, $request, $response, 'post', self::$requestData['body']);
     }
 
-    public function it_sends_a_put_request(HttpClient $client, RequestFactory $requestFactory, RequestInterface $request, ResponseInterface $response)
+    public function it_sends_a_put_request(ClientInterface $client, RequestFactoryInterface $requestFactory, RequestInterface $request, ResponseInterface $response)
     {
         $this->assert($client, $requestFactory, $request, $response, 'put', self::$requestData['body']);
     }
 
-    public function it_sends_a_patch_request(HttpClient $client, RequestFactory $requestFactory, RequestInterface $request, ResponseInterface $response)
+    public function it_sends_a_patch_request(ClientInterface $client, RequestFactoryInterface $requestFactory, RequestInterface $request, ResponseInterface $response)
     {
         $this->assert($client, $requestFactory, $request, $response, 'patch', self::$requestData['body']);
     }
 
-    public function it_sends_a_delete_request(HttpClient $client, RequestFactory $requestFactory, RequestInterface $request, ResponseInterface $response)
+    public function it_sends_a_delete_request(ClientInterface $client, RequestFactoryInterface $requestFactory, RequestInterface $request, ResponseInterface $response)
     {
         $this->assert($client, $requestFactory, $request, $response, 'delete', self::$requestData['body']);
     }
 
-    public function it_sends_an_options_request(HttpClient $client, RequestFactory $requestFactory, RequestInterface $request, ResponseInterface $response)
+    public function it_sends_an_options_request(ClientInterface $client, RequestFactoryInterface $requestFactory, RequestInterface $request, ResponseInterface $response)
     {
         $this->assert($client, $requestFactory, $request, $response, 'options', self::$requestData['body']);
     }
@@ -74,15 +74,15 @@ public function it_sends_an_options_request(HttpClient $client, RequestFactory $
      *
      * As there is no data provider in phpspec, we keep separate methods to get new mocks for each test.
      */
-    private function assert(HttpClient $client, RequestFactory $requestFactory, RequestInterface $request, ResponseInterface $response, string $method, string $body = null)
+    private function assert(ClientInterface $client, RequestFactoryInterface $requestFactory, RequestInterface $request, ResponseInterface $response, string $method, string $body = null)
     {
         $client->sendRequest($request)->shouldBeCalled()->willReturn($response);
         $this->mockFactory($requestFactory, $request, strtoupper($method), $body);
 
         $this->$method(self::$requestData['uri'], self::$requestData['headers'], self::$requestData['body'])->shouldReturnAnInstanceOf(ResponseInterface::class);
     }
 
-    private function mockFactory(RequestFactory $requestFactory, RequestInterface $request, string $method, string $body = null)
+    private function mockFactory(RequestFactoryInterface $requestFactory, RequestInterface $request, string $method, string $body = null)
     {
         $requestFactory->createRequest($method, self::$requestData['uri'], self::$requestData['headers'], $body)->willReturn($request);
     }