Add compatibility with guzzle v7 (#59)

Improved checkstyle
Fixed test for guzzle v7

Co-authored-by: Jose Manuel Cardona <[email protected]>

Author: joskfg

.travis.yml

@@ -4,12 +4,12 @@ sudo: false
 
 matrix:
   include:
-    - php: 7.1
-      env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
     - php: 7.2
       env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
     - php: 7.3
       env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
+    - php: 7.4
+      env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
     - php: master
       env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=false
   allow_failures:

composer.json

@@ -10,7 +10,7 @@
   },
   "require": {
     "php": ">=7.0",
-    "guzzlehttp/guzzle": "^6.3",
+    "guzzlehttp/guzzle": "^6.3 || ^7.0",
     "softonic/guzzle-oauth2-middleware": "^1.1"
   },
   "require-dev": {

docker-compose.yml

@@ -1,19 +1,31 @@
-version: '3.2'
+version: "3.7"
 
 services:
+  php:
+    volumes:
+    - ./:/app
+    image: composer:2.0
+
+  install:
+    volumes:
+    - ./:/app
+    image: composer:2.0
+    command: composer install
+
+  phpunit:
+    volumes:
+    - ./:/app
+    image: composer:2.0
+    command: composer phpunit
+
   test:
     volumes:
-      - ./:/app
-    image: ricc/composer-prestissimo:latest
-    command: composer run test
+    - ./:/app
+    image: composer:2.0
+    command: composer run tests
 
   fixcs:
     volumes:
-      - ./:/app
-    image: ricc/composer-prestissimo:latest
+    - ./:/app
+    image: composer:2.0
     command: composer run fix-cs
-
-  psysh:
-    volumes:
-      - ./:/app
-    image: ricc/psysh:latest

tests/ClientTest.php

@@ -2,8 +2,18 @@
 
 namespace Softonic\GraphQL\Test;
 
+use Exception;
+use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Exception\ServerException;
+use GuzzleHttp\Exception\TransferException;
 use PHPUnit\Framework\TestCase;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use RuntimeException;
 use Softonic\GraphQL\Client;
+use Softonic\GraphQL\Response;
+use Softonic\GraphQL\ResponseBuilder;
+use UnexpectedValueException;
 
 class ClientTest extends TestCase
 {
@@ -13,18 +23,18 @@ class ClientTest extends TestCase
 
     public function setUp()
     {
-        $this->httpClient = $this->createMock(\GuzzleHttp\ClientInterface::class);
-        $this->mockGraphqlResponseBuilder = $this->createMock(\Softonic\GraphQL\ResponseBuilder::class);
+        $this->httpClient = $this->createMock(ClientInterface::class);
+        $this->mockGraphqlResponseBuilder = $this->createMock(ResponseBuilder::class);
         $this->client = new Client($this->httpClient, $this->mockGraphqlResponseBuilder);
     }
 
     public function testSimpleQueryWhenHasNetworkErrors()
     {
         $this->httpClient->expects($this->once())
             ->method('request')
-            ->willThrowException(new \GuzzleHttp\Exception\TransferException('library error'));
+            ->willThrowException(new TransferException('library error'));
 
-        $this->expectException(\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Network Error.');
 
         $query = $this->getSimpleQuery();
@@ -35,9 +45,10 @@ public function testCanRetrievePreviousExceptionWhenSimpleQueryHasErrors()
     {
         $previousException = null;
         try {
-            $originalException = new \GuzzleHttp\Exception\ServerException(
+            $originalException = new ServerException(
                 'Server side error',
-                $this->createMock(\Psr\Http\Message\RequestInterface::class)
+                $this->createMock(RequestInterface::class),
+                $this->createMock(ResponseInterface::class)
             );
 
             $this->httpClient->expects($this->once())
@@ -46,7 +57,7 @@ public function testCanRetrievePreviousExceptionWhenSimpleQueryHasErrors()
 
             $query = $this->getSimpleQuery();
             $this->client->query($query);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $previousException = $e->getPrevious();
         } finally {
             $this->assertSame($originalException, $previousException);
@@ -57,11 +68,11 @@ public function testSimpleQueryWhenInvalidJsonIsReceived()
     {
         $query = $this->getSimpleQuery();
 
-        $mockHttpResponse = $this->createMock(\Psr\Http\Message\ResponseInterface::class);
+        $mockHttpResponse = $this->createMock(ResponseInterface::class);
         $this->mockGraphqlResponseBuilder->expects($this->once())
             ->method('build')
             ->with($mockHttpResponse)
-            ->willThrowException(new \UnexpectedValueException('Invalid JSON response.'));
+            ->willThrowException(new UnexpectedValueException('Invalid JSON response.'));
         $this->httpClient->expects($this->once())
             ->method('request')
             ->with(
@@ -75,16 +86,16 @@ public function testSimpleQueryWhenInvalidJsonIsReceived()
             )
             ->willReturn($mockHttpResponse);
 
-        $this->expectException(\UnexpectedValueException::class);
+        $this->expectException(UnexpectedValueException::class);
         $this->expectExceptionMessage('Invalid JSON response.');
 
         $this->client->query($query);
     }
 
     public function testSimpleQuery()
     {
-        $mockResponse = $this->createMock(\Softonic\GraphQL\Response::class);
-        $mockHttpResponse = $this->createMock(\Psr\Http\Message\ResponseInterface::class);
+        $mockResponse = $this->createMock(Response::class);
+        $mockHttpResponse = $this->createMock(ResponseInterface::class);
 
         $response = [
             'data' => [
@@ -114,13 +125,13 @@ public function testSimpleQuery()
             ->willReturn($mockHttpResponse);
 
         $response = $this->client->query($query);
-        $this->assertInstanceOf(\Softonic\GraphQL\Response::class, $response);
+        $this->assertInstanceOf(Response::class, $response);
     }
 
     public function testQueryWithVariables()
     {
-        $mockResponse = $this->createMock(\Softonic\GraphQL\Response::class);
-        $mockHttpResponse = $this->createMock(\Psr\Http\Message\ResponseInterface::class);
+        $mockResponse = $this->createMock(Response::class);
+        $mockHttpResponse = $this->createMock(ResponseInterface::class);
 
         $response = [
             'data' => [
@@ -155,7 +166,7 @@ public function testQueryWithVariables()
             ->willReturn($mockHttpResponse);
 
         $response = $this->client->query($query, $variables);
-        $this->assertInstanceOf(\Softonic\GraphQL\Response::class, $response);
+        $this->assertInstanceOf(Response::class, $response);
     }
 
     private function getSimpleQuery()