feat: added support for php8.2 by exchanging the http library with guzzlehttp

Author: thelfensdrfer

.github/workflows/tests.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php-versions: ['8.0', '8.1']
+        php-versions: ['8.0', '8.1', '8.2']
 
     name: PHPUnit ${{ matrix.php-versions }}
 

composer.json

@@ -3,14 +3,14 @@
 	"description": "API wrapper for matomo",
 	"license": "MIT",
 	"require": {
-		"php": ">=8.0",
+		"php": ">=8.2",
 		"ext-json": "*",
 		"ext-curl": "*",
-		"voku/httpful": "^2.4"
+		"guzzlehttp/guzzle": "^7.7"
     },
 	"require-dev": {
         "roave/security-advisories": "dev-latest",
-        "phpunit/phpunit": "^9.0"
+        "phpunit/phpunit": "^10.1"
 	},
     "scripts": {
         "test": "phpunit"

src/Matomo.php

@@ -2,9 +2,9 @@
 
 namespace VisualAppeal;
 
-use Httpful\Exception\NetworkErrorException;
-use Httpful\Request;
-use Httpful\Response;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Psr7\Response;
 use InvalidArgumentException;
 use JsonException;
 
@@ -104,6 +104,11 @@ class Matomo
      */
     private int $_timeout = 5;
 
+    /**
+     * @var Client|null Guzzle client
+     */
+    private ?Client $_client = null;
+
     /**
      * Create a new instance.
      *
@@ -115,6 +120,7 @@ class Matomo
      * @param  string  $date
      * @param  string  $rangeStart
      * @param  string|null  $rangeEnd
+     * @param  Client|null  $client
      */
     public function __construct(
         string $site,
@@ -124,7 +130,8 @@ public function __construct(
         string $period = self::PERIOD_DAY,
         string $date = self::DATE_YESTERDAY,
         string $rangeStart = '',
-        string $rangeEnd = null
+        string $rangeEnd = null,
+        Client $client = null,
     ) {
         $this->_site       = $site;
         $this->_token      = $token;
@@ -139,6 +146,12 @@ public function __construct(
         } else {
             $this->setDate($date);
         }
+
+        if ($client !== null) {
+            $this->setClient($client);
+        } else {
+            $this->setClient(new Client());
+        }
     }
 
     /**
@@ -359,8 +372,8 @@ public function setRange(string $rangeStart = null, string $rangeEnd = null): Ma
         $this->_rangeEnd   = $rangeEnd;
 
         if (is_null($rangeEnd)) {
-            if (str_contains($rangeStart, 'last')
-                || str_contains($rangeStart, 'previous')
+            if (str_contains($rangeStart ?? '', 'last')
+                || str_contains($rangeStart ?? '', 'previous')
             ) {
                 $this->setDate($rangeStart);
             } else {
@@ -487,6 +500,22 @@ public function setTimeout(int $timeout): Matomo
         return $this;
     }
 
+    /**
+     * @return Client|null
+     */
+    public function getClient(): ?Client
+    {
+        return $this->_client;
+    }
+
+    /**
+     * @param  Client|null  $client
+     */
+    public function setClient(?Client $client): void
+    {
+        $this->_client = $client;
+    }
+
     /**
      * Reset all default variables.
      */
@@ -527,28 +556,21 @@ private function _request(
             throw new InvalidRequestException('Could not parse URL!');
         }
 
-        // Build the request
-        $req = Request::get($url)
-                      ->followRedirects($this->_maxRedirects)
-                      ->withTimeout($this->_timeout);
-
-        if ($this->_verifySsl) {
-            $req->enableStrictSSL();
-        } else {
-            $req->disableStrictSSL();
-        }
-
-        // Send the request
         try {
-            $response = $req->send();
-        } catch (NetworkErrorException $e) {
+            $response = $this->_client->get($url, [
+                'verify'          => $this->_verifySsl,
+                'allow_redirects' => [
+                    'max' => $this->_maxRedirects,
+                ],
+            ]);
+        } catch (GuzzleException $e) {
             // Network error, e.g. timeout or connection refused
             throw new InvalidRequestException($e->getMessage(), $e->getCode(), $e);
         }
 
         // Validate if the response was successful
         if ($response->getStatusCode() !== 200) {
-            throw new InvalidRequestException($response->getRawBody(), $response->getStatusCode());
+            throw new InvalidRequestException($response->getBody(), $response->getStatusCode());
         }
 
         // Sometimes the response was unsuccessful, but the status code was 200
@@ -589,7 +611,7 @@ private function _parseUrl(string $method, array $params = []): string
             if (is_array($value)) {
                 $params[$key] = urlencode(implode(',', $value));
             } else {
-                $params[$key] = urlencode($value);
+                $params[$key] = urlencode($value ?? '');
             }
         }
 
@@ -664,7 +686,7 @@ private function _parseResponse(Response $response, string $overrideFormat = nul
         $format = $overrideFormat ?? $this->_format;
 
         return match ($format) {
-            self::FORMAT_JSON => json_decode($response, $this->_isJsonDecodeAssoc, 512,
+            self::FORMAT_JSON => json_decode($response->getBody(), $this->_isJsonDecodeAssoc, 512,
                 JSON_THROW_ON_ERROR),
             default => $response,
         };