Merge branch 'jnrfred-fix-compatibility-issue'

Author: miiimooo

.travis.yml

@@ -4,22 +4,17 @@ php:
   - 7.0
   - 7.1
   - 7.2
+  - 7.3
+  - 7.4
+  - 8.0
+  - 8.1
 
 sudo: false
 
 env:
   - TEST=PHP_CodeSniffer
   - TEST=PHPUnit
 
-matrix:
-  exclude:
-    - php: 5.6
-      env: TEST=PHP_CodeSniffer
-    - php: 7.0
-      env: TEST=PHP_CodeSniffer
-    - php: 7.1
-      env: TEST=PHP_CodeSniffer
-
 install:
   - composer install
 

composer.json

@@ -15,10 +15,11 @@
         "psr-4": {"Matomo\\ReportingApi\\": "src/"}
     },
     "require": {
-        "guzzlehttp/guzzle": "~6.0"
+        "guzzlehttp/guzzle": "~7",
+        "phpspec/prophecy-phpunit": "^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0|^6.0|^7.0",
+        "phpunit/phpunit": "^5.0||^6.0||^7.0||^8.0||^9.0",
         "squizlabs/php_codesniffer": "^3.2"
     }
 }

tests/src/HttpClientTest.php

@@ -2,12 +2,14 @@
 
 namespace Matomo\ReportingApi\tests;
 
+use Exception;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Psr7\Response;
-use PHPUnit\Framework\TestCase;
+use InvalidArgumentException;
 use Matomo\ReportingApi\HttpClient;
 use Matomo\ReportingApi\RequestFactoryInterface;
-use Prophecy\Argument;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
@@ -19,6 +21,8 @@
 class HttpClientTest extends TestCase
 {
 
+    use ProphecyTrait;
+
     /**
      * @param array $parameters
      *
@@ -111,11 +115,12 @@ public function testSetUrl($url)
      * @param string $invalid_url
      *   An invalid URL.
      *
-     * @expectedException \InvalidArgumentException
+     *
      * @dataProvider invalidUrlProvider
      */
     public function testInvalidUrl($invalid_url)
     {
+        $this->expectException(InvalidArgumentException::class);
         $this->getHttpClient()->setUrl($invalid_url);
     }
 
@@ -188,21 +193,11 @@ public function testGetMethod($method)
      */
     public function testSetMethod($method)
     {
-        // It is expected that the given HTTP method will be passed to the request factory.
-        $request_factory = $this->prophesize(RequestFactoryInterface::class);
-        $request_factory
-            ->getRequest($method, Argument::any())
-            ->willReturn($this->prophesize(RequestInterface::class)->reveal())
-            ->shouldBeCalled();
-
-        $http_client = $this->getHttpClient(null, $request_factory->reveal());
-        $http_client->setUrl('http://example.com');
-        $result = $http_client->setMethod($method);
-        // Send the request so that we can check if the correct HTTP method is used.
-        $http_client->sendRequest();
+        $http_client = $this->getHttpClient();
+        $http_client->setMethod($method);
 
-        // Check that the client is returned for chaining.
-        $this->assertEquals($http_client, $result);
+        // Check if correct HTTP method is returned by client
+        $this->assertEquals($http_client->getMethod(), $method);
     }
 
     /**
@@ -212,11 +207,13 @@ public function testSetMethod($method)
      *   An unsupported or invalid HTTP method.
      *
      * @covers ::setMethod
-     * @expectedException \InvalidArgumentException
+     *
      * @dataProvider unsupportedHttpMethodsProvider
      */
     public function testUnsupportedHttpMethods($invalid_method)
     {
+        $this->expectException(InvalidArgumentException::class);
+
         $http_client = $this->getHttpClient();
         $http_client->setMethod($invalid_method);
     }
@@ -270,10 +267,11 @@ public function unsupportedHttpMethodsProvider()
      * Tests that an exception is thrown when sending a request without specifying a URL.
      *
      * @covers ::sendRequest
-     * @expectedException \Exception
+     *
      */
     public function testSendRequestWithoutUrl()
     {
+        $this->expectException(Exception::class);
         $this->getHttpClient()
             ->setRequestParameters(['foo' => 'bar'])
             ->setMethod('GET')
@@ -338,7 +336,7 @@ public function sendRequestProvider()
                         'module' => 'API',
                         'method' => 'API.getMatomoVersion',
                     ],
-                ]
+                ],
             ],
             [
                 // The HTTP method to use.
@@ -358,7 +356,7 @@ public function sendRequestProvider()
                         'module' => 'API',
                         'method' => 'API.getMatomoVersion',
                     ],
-                ]
+                ],
             ],
         ];
     }