Add Psalm

Author: loevgaard

.github/workflows/build.yaml

@@ -57,6 +57,7 @@ jobs:
                     - "8.1"
 
                 dependencies:
+                    - "lowest"
                     - "highest"
 
         steps:
@@ -94,6 +95,7 @@ jobs:
                     - "8.1"
 
                 dependencies:
+                    - "lowest"
                     - "highest"
 
         steps:
@@ -113,4 +115,4 @@ jobs:
                     dependency-versions: "${{ matrix.dependencies }}"
 
             -   name: "Static analysis"
-                run: "composer phpstan"
+                run: "composer analyse"

composer.json

@@ -23,11 +23,11 @@
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.28",
-        "phpstan/phpstan": "^0.12.64",
         "phpunit/phpunit": "^9.4.3",
         "sylius-labs/coding-standard": "^4.2",
         "symfony/cache": "^6.0",
-        "symfony/http-client": "^6.0"
+        "symfony/http-client": "^6.0",
+        "vimeo/psalm": "^4.26"
     },
     "provide": {
         "symfony/http-client-implementation": "^2.3.1"
@@ -44,8 +44,8 @@
         }
     },
     "scripts": {
+        "analyse": "psalm",
         "check-style": "ecs check",
-        "fix-style": "ecs check --fix",
-        "phpstan": "vendor/bin/phpstan analyse --level max src tests"
+        "fix-style": "ecs check --fix"
     }
 }

psalm.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<psalm
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    errorLevel="1"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    phpVersion="8.1"
+>
+    <projectFiles>
+        <directory name="src"/>
+        <ignoreFiles>
+            <directory name="vendor"/>
+        </ignoreFiles>
+    </projectFiles>
+</psalm>

src/GrantType/TokensExtractor.php

@@ -31,7 +31,15 @@ private function extractTokens(ResponseInterface $response): Tokens
             throw new OAuthException('Error when calling token endpoint.', 0, $e);
         }
 
-        $token = json_decode($responseBody, true);
+        try {
+            $token = json_decode($responseBody, true, 512, \JSON_THROW_ON_ERROR);
+        } catch (\JsonException $e) {
+            throw new OAuthException(
+                'Error when parsing token endpoint JSON response. JSON error was: ' . $e->getMessage(),
+                0,
+                $e,
+            );
+        }
 
         if ($token === null && $responseBody !== 'null') {
             throw new OAuthException('Error when parsing token endpoint JSON response.');
@@ -41,6 +49,6 @@ private function extractTokens(ResponseInterface $response): Tokens
             throw new OAuthException('Access token not found in token endpoint response.');
         }
 
-        return new Tokens($token['access_token'], $token['refresh_token'] ?? null);
+        return new Tokens($token['access_token'], isset($token['refresh_token']) && is_string($token['refresh_token']) ? $token['refresh_token'] : null);
     }
 }

src/OAuthHttpClient.php

@@ -17,7 +17,7 @@
 use Symfony\Contracts\HttpClient\ResponseInterface;
 use Symfony\Contracts\HttpClient\ResponseStreamInterface;
 
-class OAuthHttpClient implements HttpClientInterface
+final class OAuthHttpClient implements HttpClientInterface
 {
     private HttpClientInterface $client;
 
@@ -61,9 +61,6 @@ public function setCache(TokensCacheInterface $cache): self
         return $this;
     }
 
-    /**
-     * @param array<string, mixed> $options
-     */
     public function request(string $method, string $url, array $options = []): ResponseInterface
     {
         $grant = $this->grant;

src/RequestSigner/HeaderRequestSigner.php

@@ -18,6 +18,10 @@ public function __construct(string $headerName, string $headerValueFormat)
 
     public function modify(array &$options, string $token): void
     {
+        if (!array_key_exists('headers', $options) || !is_array($options['headers'])) {
+            return;
+        }
+
         $options['headers'][$this->headerName] = str_replace('{token}', $token, $this->headerValueFormat);
     }
 }

src/RequestSigner/RequestSignerInterface.php

@@ -6,8 +6,5 @@
 
 interface RequestSignerInterface
 {
-    /**
-     * @param array<string, mixed> $options
-     */
     public function modify(array &$options, string $token): void;
 }

src/TokensCache/MemoryTokensCache.php

@@ -9,7 +9,7 @@
 
 class MemoryTokensCache implements TokensCacheInterface
 {
-    private ?Tokens $tokens;
+    private ?Tokens $tokens = null;
 
     public function get(GrantTypeInterface $grant): Tokens
     {