PHPStan level max

Author: curry684

bin/prepare-commit

@@ -2,11 +2,11 @@
 set -e
 cd $(dirname $0)/..
 
-php-cs-fixer fix
+vendor/bin/php-cs-fixer fix
 vendor/bin/phpstan
 XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-text
 
 [ ! -f "./infection.phar" ] && bin/install-infection
-./infection.phar --threads=4
+./infection.phar --threads=max
 
 echo "All good, ready for commit!"

composer.json

@@ -22,16 +22,17 @@
         "league/oauth2-client": "^2.4.1"
     },
     "require-dev": {
-        "guzzlehttp/psr7": "^2.4.1",
+        "friendsofphp/php-cs-fixer": "^3.37.1",
+        "guzzlehttp/psr7": "^2.6.1",
         "http-interop/http-factory-guzzle": "^1.2",
-        "mockery/mockery": "^1.5.1",
-        "m4tthumphrey/php-gitlab-api": "^11.8",
+        "m4tthumphrey/php-gitlab-api": "^11.12",
+        "mockery/mockery": "^1.6.6",
         "php-http/guzzle7-adapter": "^1.0.0",
-        "phpunit/phpunit": "^10.4.2",
-        "phpstan/phpstan": "^1.8.10",
-        "phpstan/phpstan-mockery": "^1.1",
-        "phpstan/extension-installer": "^1.2",
-        "phpstan/phpstan-phpunit": "^1.1.1"
+        "phpstan/extension-installer": "^1.3.1",
+        "phpstan/phpstan": "^1.10.41",
+        "phpstan/phpstan-mockery": "^1.1.1",
+        "phpstan/phpstan-phpunit": "^1.3.15",
+        "phpunit/phpunit": "^10.4.2"
     },
     "suggest": {
         "m4tthumphrey/php-gitlab-api": "For further API usage using the acquired OAuth2 token"
@@ -52,6 +53,7 @@
         }
     },
     "config": {
+        "sort-packages": true,
         "allow-plugins": {
             "phpstan/extension-installer": true,
             "php-http/discovery": true

phpstan.neon

@@ -1,5 +1,5 @@
 parameters:
-    level: 8
+    level: max
     paths:
     - src
     - test

src/Provider/Exception/GitlabIdentityProviderException.php

@@ -20,41 +20,14 @@
  */
 final class GitlabIdentityProviderException extends IdentityProviderException
 {
-    /**
-     * Creates client exception from response.
-     *
-     * @param array<string, mixed>|string $data Parsed response data
-     */
-    public static function clientException(ResponseInterface $response, array|string $data): IdentityProviderException
-    {
-        return self::fromResponse(
-            $response,
-            $data['message'] ?? $response->getReasonPhrase()
-        );
-    }
-
-    /**
-     * Creates oauth exception from response.
-     *
-     * @param ResponseInterface $response Response received from upstream
-     * @param array<string, mixed> $data Parsed response data
-     */
-    public static function oauthException(ResponseInterface $response, array $data): IdentityProviderException
-    {
-        return self::fromResponse(
-            $response,
-            $data['error'] ?? $response->getReasonPhrase()
-        );
-    }
-
     /**
      * Creates identity exception from response.
      *
      * @param ResponseInterface $response Response received from upstream
-     * @param string|null $message        Parsed message
+     * @param ?string $message Parsed message
      */
-    private static function fromResponse(ResponseInterface $response, string $message = null): IdentityProviderException
+    public static function fromResponse(ResponseInterface $response, string $message = null): IdentityProviderException
     {
-        return new self($message ?? self::class, $response->getStatusCode(), $response->getBody()->getContents());
+        return new self($message ?? $response->getReasonPhrase() ?: self::class, $response->getStatusCode(), $response->getBody()->getContents());
     }
 }

src/Provider/Gitlab.php

@@ -90,15 +90,17 @@ protected function getScopeSeparator(): string
      * Check a provider response for errors.
      *
      * @param ResponseInterface $response Parsed response data
-     * @param array<string, mixed> $data
+     * @param array{error?: string, message?: string}|mixed $data
      * @throws IdentityProviderException
      */
     protected function checkResponse(ResponseInterface $response, mixed $data): void
     {
-        if ($response->getStatusCode() >= 400) {
-            throw GitlabIdentityProviderException::clientException($response, $data);
+        if (!is_array($data)) {
+            throw GitlabIdentityProviderException::fromResponse($response, 'Corrupted response');
+        } elseif ($response->getStatusCode() >= 400) {
+            throw GitlabIdentityProviderException::fromResponse($response, $data['message'] ?? $response->getReasonPhrase());
         } elseif (isset($data['error'])) {
-            throw GitlabIdentityProviderException::oauthException($response, $data);
+            throw GitlabIdentityProviderException::fromResponse($response, $data['error']);
         }
     }
 

test/src/Provider/GitlabTest.php

@@ -272,4 +272,19 @@ public function testExceptionThrownWhenOAuthErrorReceived(): void
         $this->expectExceptionMessage('bad_verification_code');
         $token = $this->provider->getAccessToken('authorization_code', ['code' => 'mock_authorization_code']);
     }
+
+    public function testExceptionThrownWhenUnknownErrorReceived(): void
+    {
+        $response = new Response(200, ['content-type' => 'json'], '684');
+
+        $client = m::mock('GuzzleHttp\ClientInterface');
+        $client->shouldReceive('send')
+            ->times(1)
+            ->andReturn($response);
+        $this->provider->setHttpClient($client);
+
+        $this->expectException(IdentityProviderException::class);
+        $this->expectExceptionMessage('Corrupted response');
+        $token = $this->provider->getAccessToken('authorization_code', ['code' => 'mock_authorization_code']);
+    }
 }