Merge pull request #12 from simplesamlphp/feature/replace-psalm

Feature/replace psalm

Author: tvdijen

.github/workflows/php.yml

@@ -115,7 +115,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, spl, xml
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, spl, xml, zip
           tools: composer
           ini-values: error_reporting=E_ALL
           coverage: none
@@ -162,9 +162,8 @@ jobs:
         with:
           # Should be the higest supported version, so we can use the newest tools
           php-version: '8.4'
-          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, phpstan
+          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"
@@ -196,27 +195,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
 
-      - 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
 
   security:
     name: Security checks

1

@@ -0,0 +1,31 @@
+# This is a combination of 2 commits.
+# This is the 1st commit message:
+
+#eplace psalm with phpstan
+
+# This is the commit message #2:
+
+Replace psalm with phpstan
+
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# Date:      Mon Aug 18 21:58:48 2025 +0200
+#
+# interactive rebase in progress; onto 1a4ff67
+# Last commands done (5 commands done):
+#    pick 9e85746 Replace psalm with phpstan
+#    squash e07af03 Replace psalm with phpstan
+# No commands remaining.
+# You are currently rebasing branch 'feature/replace-psalm' on '1a4ff67'.
+#
+# Changes to be committed:
+#	modified:   .github/workflows/php.yml
+#	new file:   phpstan-dev.neon
+#	new file:   phpstan.neon
+#	deleted:    psalm-dev.xml
+#	deleted:    psalm.xml
+#	modified:   src/Client.php
+#	modified:   src/Controller/CDC.php
+#	modified:   src/Server.php
+#

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

@@ -35,7 +35,7 @@ class CDC extends Auth\ProcessingFilter
     /**
      * Initialize this filter.
      *
-     * @param array $config  Configuration information about this filter.
+     * @param array<mixed> $config  Configuration information about this filter.
      * @param mixed $reserved  For future use.
      */
     public function __construct(array $config, $reserved)
@@ -54,7 +54,7 @@ public function __construct(array $config, $reserved)
     /**
      * Redirect to page setting CDC.
      *
-     * @param array &$state  The request state.
+     * @param array<mixed> &$state  The request state.
      */
     public function process(array &$state): void
     {

psalm.xml

@@ -12,17 +12,10 @@
 
 class Client
 {
-    /**
-     * Our CDC domain.
-     *
-     * @var string
-     */
-    private string $domain;
-
     /**
      * The CDC server we send requests to.
      *
-     * @var Server
+     * @var \SimpleSAML\Module\cdc\Server
      */
     private Server $server;
 
@@ -32,17 +25,17 @@ class Client
      *
      * @param string $domain  The domain we should query the server for.
      */
-    public function __construct(string $domain)
-    {
-        $this->domain = $domain;
+    public function __construct(
+        protected string $domain,
+    ) {
         $this->server = new Server($domain);
     }
 
 
     /**
      * Receive a CDC response.
      *
-     * @return array|null  The response, or NULL if no response is received.
+     * @return array<mixed>|null  The response, or NULL if no response is received.
      */
     public function getResponse(): ?array
     {
@@ -55,7 +48,7 @@ public function getResponse(): ?array
      *
      * @param string $returnTo  The URL we should return to afterwards.
      * @param string $op  The operation we are performing.
-     * @param array $params  Additional parameters.
+     * @param array<mixed> $params  Additional parameters.
      */
     public function sendRequest(string $returnTo, string $op, array $params = []): void
     {

src/Auth/Process/CDC.php

@@ -88,10 +88,6 @@ public function resume(Request $request): RunnableResponse
         }
 
         $state = Auth\State::loadState($response['id'], 'cdc:resume');
-        if (is_null($state)) {
-            throw new Error\NoState();
-        }
-
         return new RunnableResponse([Auth\ProcessingChain::class, 'resumeProcessing'], [$state]);
     }
 }