Migrate Psalm to PHPStan

Author: tvdijen

.github/workflows/php.yml

@@ -52,9 +52,8 @@ jobs:
         with:
           # Should be the higest supported version, so we can use the newest tools
           php-version: '8.3'
-          tools: composer, composer-require-checker, composer-unused, phpcs, psalm
-          # optional performance gain for psalm: opcache
-          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, opcache, openssl, pcre, posix, spl, xml
+          tools: composer, composer-require-checker, composer-unused, phpcs
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, spl, xml
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
@@ -86,27 +85,13 @@ jobs:
       - name: PHP Code Sniffer
         run: phpcs
 
-      - name: Psalm
-        continue-on-error: true
-        run: |
-          psalm -c psalm.xml \
-          --show-info=true \
-          --shepherd \
-          --php-version=${{ steps.setup-php.outputs.php-version }}
-
-      - name: Psalm (testsuite)
+      - name: PHPStan
         run: |
-          psalm -c psalm-dev.xml \
-          --show-info=true \
-          --shepherd \
-          --php-version=${{ steps.setup-php.outputs.php-version }}
+          vendor/bin/phpstan analyze -c phpstan.neon --debug
 
-      - name: Psalter
+      - name: PHPStan (testsuite)
         run: |
-          psalm --alter \
-          --issues=UnnecessaryVarAnnotation \
-          --dry-run \
-          --php-version=${{ steps.setup-php.outputs.php-version }}
+          vendor/bin/phpstan analyze -c phpstan-dev.neon --debug
 
   security:
     name: Security checks

phpstan-dev.neon

@@ -0,0 +1,4 @@
+parameters:
+  level: 9
+  paths:
+    - tests

phpstan.neon

@@ -0,0 +1,4 @@
+parameters:
+  level: 6
+  paths:
+    - src

psalm-dev.xml

@@ -44,8 +44,8 @@ class Twitter extends Auth\Source
     /**
      * Constructor for this authentication source.
      *
-     * @param array $info  Information about this authentication source.
-     * @param array $config  Configuration.
+     * @param array<mixed> $info  Information about this authentication source.
+     * @param array<mixed> $config  Configuration.
      */
     public function __construct(array $info, array $config)
     {
@@ -67,7 +67,7 @@ public function __construct(array $info, array $config)
     /**
      * Log-in using Twitter platform
      *
-     * @param array &$state  Information about the current authentication.
+     * @param array<mixed> &$state  Information about the current authentication.
      */
     public function authenticate(array &$state): void
     {
@@ -78,7 +78,7 @@ public function authenticate(array &$state): void
     /**
      * Retrieve temporary credentials
      *
-     * @param array &$state  Information about the current authentication.
+     * @param array<mixed> &$state  Information about the current authentication.
      */
     private function temporaryCredentials(array &$state): never
     {
@@ -110,7 +110,7 @@ private function temporaryCredentials(array &$state): never
 
 
     /**
-     * @param array &$state
+     * @param array<mixed> &$state
      * @param \Symfony\Component\HttpFoundation\Request $request
      */
     public function finalStep(array &$state, Request $request): void

psalm.xml

@@ -8,9 +8,10 @@
 use SimpleSAML\Auth;
 use SimpleSAML\Configuration;
 use SimpleSAML\Error;
+use SimpleSAML\HTTP\RunnableResponse;;
 use SimpleSAML\Module\authtwitter\Auth\Source\Twitter as TwitterSource;
 use SimpleSAML\Session;
-use Symfony\Component\HttpFoundation\{Request, StreamedResponse};
+use Symfony\Component\HttpFoundation\Request;;
 
 /**
  * Controller class for the authtwitter module.
@@ -54,7 +55,7 @@ public function linkback(Request $request): StreamedResponse
         $state = Auth\State::loadState(base64_decode($authState), TwitterSource::STAGE_INIT);
 
         // Find authentication source
-        if (is_null($state) || !array_key_exists(TwitterSource::AUTHID, $state)) {
+        if (!array_key_exists(TwitterSource::AUTHID, $state)) {
             throw new Error\BadRequest('No data in state for ' . TwitterSource::AUTHID);
         }
 
@@ -80,10 +81,6 @@ public function linkback(Request $request): StreamedResponse
             );
         }
 
-        return new StreamedResponse(
-            function () use (&$state): never {
-                Auth\Source::completeAuth($state);
-            },
-        );
+        return new RunnableResponse([Auth\Source::class, 'completeAuth'], [$state]);
     }
 }