fix: update tests

thelfensdrfer · thelfensdrfer · commit 8330f8c4dc7c · 2023-05-28T11:03:15.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 config.php
 composer.lock
 .phpunit.result.cache
+test-results
 
 .idea/
 /build/
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="tests/bootstrap.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" verbose="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">./src</directory>
-    </include>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="tests/bootstrap.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage>
     <report>
       <html outputDirectory="build/coverage/"/>
     </report>
@@ -12,4 +9,9 @@
     <directory>tests</directory>
   </testsuite>
   <logging/>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/src/Matomo.php b/src/Matomo.php
@@ -14,8 +14,6 @@
  */
 class Matomo
 {
-    public const ERROR_EMPTY = 11;
-
     public const PERIOD_DAY = 'day';
     public const PERIOD_WEEK = 'week';
     public const PERIOD_MONTH = 'month';
@@ -539,7 +537,7 @@ public function reset(): Matomo
      * @param  string  $method  HTTP method
      * @param  array  $params  Query parameters
      * @param  array  $optional  Optional arguments for this api call
-     * @param  string|null  $format  Override the response format
+     * @param  string|null  $overrideFormat  Override the response format
      *
      * @return bool|object
      * @@throws InvalidRequestException|JsonException|InvalidResponseException
@@ -549,13 +547,15 @@ private function _request(
         string $method,
         array $params = [],
         array $optional = [],
-        string $format = null
+        string $overrideFormat = null
     ): mixed {
         $url = $this->_parseUrl($method, $params + $optional);
         if ($url === '') {
             throw new InvalidRequestException('Could not parse URL!');
         }
 
+        $format = $overrideFormat ?? $this->_format;
+
         try {
             $response = $this->_client->get($url, [
                 'verify'          => $this->_verifySsl,
@@ -570,12 +570,14 @@ private function _request(
 
         // Validate if the response was successful
         if ($response->getStatusCode() !== 200) {
-            throw new InvalidRequestException($response->getBody(), $response->getStatusCode());
+            throw new InvalidRequestException($response->getBody()->getContents(),
+                $response->getStatusCode());
         }
 
         // Sometimes the response was unsuccessful, but the status code was 200
         if ($format === self::FORMAT_JSON) {
             $valid = $this->_isValidResponse($response);
+
             if ($valid !== true) {
                 throw new InvalidResponseException($valid.' ('.$this->_parseUrl($method, $params)
                                                    .')', 403);
@@ -654,22 +656,24 @@ private function _parseUrl(string $method, array $params = []): string
      *
      * @param  mixed  $response
      *
-     * @return bool|int
+     * @return bool|string
      * @throws JsonException
      */
-    private function _isValidResponse(Response $response): bool|int
+    private function _isValidResponse(Response $response): bool|string
     {
-        if (is_null($response->getRawBody())) {
-            return self::ERROR_EMPTY;
+        $body = $response->getBody()->getContents();
+
+        if ($body === '') {
+            return 'Empty response!';
         }
 
-        $result = json_decode($response->getRawBody(), true, 512, JSON_THROW_ON_ERROR);
+        $result = json_decode($body, true, 512, JSON_THROW_ON_ERROR);
 
-        if ( ! isset($result['result']) || ($result['result'] !== 'error')) {
-            return true;
+        if (isset($result['result']) && (strtolower($result['result']) === 'error')) {
+            return $result['message'];
         }
 
-        return $result['message'];
+        return true;
     }
 
     /**
@@ -686,7 +690,8 @@ private function _parseResponse(Response $response, string $overrideFormat = nul
         $format = $overrideFormat ?? $this->_format;
 
         return match ($format) {
-            self::FORMAT_JSON => json_decode($response->getBody(), $this->_isJsonDecodeAssoc, 512,
+            self::FORMAT_JSON => json_decode($response->getBody()->getContents(),
+                $this->_isJsonDecodeAssoc, 512,
                 JSON_THROW_ON_ERROR),
             default => $response,
         };
diff --git a/tests/MatomoTest.php b/tests/MatomoTest.php
@@ -178,17 +178,16 @@ public function testNoPeriodOrDate(): void
     /**
      * Test that an exception is thrown with an invalid access token.
      *
-     * @throws JsonException|InvalidResponseException
+     * @throws JsonException|InvalidRequestException|InvalidResponseException
      */
     public function testInvalidAccessToken(): void
     {
         $this->_matomo->setToken('403');
+        $this->assertTrue(true);
 
-        try {
-            $this->_matomo->getVisitsSummary();
-        } catch (InvalidRequestException $e) {
-            $this->assertEquals(403, $e->getCode());
-        }
+        $this->_matomo->getVisitsSummary();
+
+        $this->fail('No exception thrown.');
     }
 
     /**
