feat: add psr 18 support

Author: thelfensdrfer

.gitignore

@@ -1,6 +1,7 @@
 config.php
 composer.lock
 .phpunit.result.cache
+.phpunit.cache
 test-results
 
 .idea/

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### 2.1.0 (2022/06/15)
+
+* Implemented [PSR-18](https://www.php-fig.org/psr/psr-18/) support
+
 ### 2.0.0 (2022/06/14)
 
 * Switched from httpful to guzzlehttp

README.md

@@ -32,7 +32,7 @@ So you can execute multiple requests without specifying the parameters again.
 
 ### siteId
 
-The ID of your website, single number, list separated through comma "1,4,7", or "all"
+The ID of your website, single number, list separated through comma `"1,4,7"`, or `"all"`.
 
 ### period
 
@@ -50,9 +50,7 @@ If you set the period to `Matomo::PERIOD_RANGE` you can specify the range via
 	$matomo->setRange('2012-01-14', Matomo::DATE_YESTERDAY); //All data from the first date until yesterday
 	$matomo->setRange('2012-01-14'); //All data from the first date until now
 
-__When you use the period range you do not need to specify a date!__
-
-If you set it to something other than `Matomo::PERIOD_RANGE` you can specify the date via
+If you set it to something other than `Matomo::PERIOD_RANGE` you can specify the date via:
 
 	$matomo->setPeriod(x);
 	$matomo->setDate('2012-03-03');

composer.json

@@ -6,7 +6,7 @@
 		"php": ">=8.2",
 		"ext-json": "*",
 		"ext-curl": "*",
-		"guzzlehttp/guzzle": "^7.7"
+		"php-http/guzzle7-adapter": "^1.0"
     },
 	"require-dev": {
         "roave/security-advisories": "dev-latest",

src/Matomo.php

@@ -2,10 +2,12 @@
 
 namespace VisualAppeal;
 
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Psr7\Request;
+use Http\Adapter\Guzzle7\Client as GuzzleAdapter;
 use InvalidArgumentException;
 use JsonException;
+use Psr\Http\Client\ClientExceptionInterface;
+use Psr\Http\Client\ClientInterface;
 
 /**
  * Repository: https://github.com/VisualAppeal/Matomo-PHP-API
@@ -87,24 +89,9 @@ class Matomo
     private bool $_isJsonDecodeAssoc = false;
 
     /**
-     * @var bool If the certificate of the matomo installation should be verified.
+     * @var ClientInterface|null HTTP client interface
      */
-    private bool $_verifySsl = false;
-
-    /**
-     * @var int How many redirects curl should execute until aborting.
-     */
-    private int $_maxRedirects = 5;
-
-    /**
-     * @var int Timeout in seconds.
-     */
-    private int $_timeout = 5;
-
-    /**
-     * @var Client|null Guzzle client
-     */
-    private ?Client $_client = null;
+    private ?ClientInterface $_client = null;
 
     /**
      * Create a new instance.
@@ -117,7 +104,7 @@ class Matomo
      * @param  string  $date
      * @param  string  $rangeStart
      * @param  string|null  $rangeEnd
-     * @param  Client|null  $client
+     * @param  ClientInterface|null  $client
      */
     public function __construct(
         string $site,
@@ -128,7 +115,7 @@ public function __construct(
         string $date = self::DATE_YESTERDAY,
         string $rangeStart = '',
         string $rangeEnd = null,
-        Client $client = null,
+        ClientInterface $client = null,
     ) {
         $this->_site       = $site;
         $this->_token      = $token;
@@ -147,7 +134,7 @@ public function __construct(
         if ($client !== null) {
             $this->setClient($client);
         } else {
-            $this->setClient(new Client());
+            $this->setClient(new GuzzleAdapter);
         }
     }
 
@@ -430,85 +417,17 @@ public function setIsJsonDecodeAssoc(bool $isJsonDecodeAssoc): Matomo
     }
 
     /**
-     * If the certificate of the matomo installation should be verified.
-     *
-     * @return bool
-     */
-    public function getVerifySsl(): bool
-    {
-        return $this->_verifySsl;
-    }
-
-    /**
-     * Set if the certificate of the matomo installation should be verified.
-     *
-     * @param  bool  $verifySsl
-     *
-     * @return Matomo
-     */
-    public function setVerifySsl(bool $verifySsl): Matomo
-    {
-        $this->_verifySsl = $verifySsl;
-
-        return $this;
-    }
-
-    /**
-     * How many redirects curl should execute until aborting.
-     *
-     * @return int
-     */
-    public function getMaxRedirects(): int
-    {
-        return $this->_maxRedirects;
-    }
-
-    /**
-     * Set how many redirects curl should execute until aborting.
-     *
-     * @param  int  $maxRedirects
-     *
-     * @return Matomo
-     */
-    public function setMaxRedirects(int $maxRedirects): Matomo
-    {
-        $this->_maxRedirects = $maxRedirects;
-
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getTimeout(): int
-    {
-        return $this->_timeout;
-    }
-
-    /**
-     * @param  int  $timeout
-     *
-     * @return Matomo
-     */
-    public function setTimeout(int $timeout): Matomo
-    {
-        $this->_timeout = $timeout;
-
-        return $this;
-    }
-
-    /**
-     * @return Client|null
+     * @return ClientInterface|null
      */
-    public function getClient(): ?Client
+    public function getClient(): ?ClientInterface
     {
         return $this->_client;
     }
 
     /**
-     * @param  Client|null  $client
+     * @param  ClientInterface|null  $client
      */
-    public function setClient(?Client $client): void
+    public function setClient(?ClientInterface $client): void
     {
         $this->_client = $client;
     }
@@ -556,13 +475,9 @@ private function _request(
         $format = $overrideFormat ?? $this->_format;
 
         try {
-            $response = $this->_client->get($url, [
-                'verify'          => $this->_verifySsl,
-                'allow_redirects' => [
-                    'max' => $this->_maxRedirects,
-                ],
-            ]);
-        } catch (GuzzleException $e) {
+            $request = new Request('GET', $url);
+            $response = $this->_client->sendRequest($request);
+        } catch (ClientExceptionInterface $e) {
             // Network error, e.g. timeout or connection refused
             throw new InvalidRequestException($e->getMessage(), $e->getCode(), $e);
         }