Use PHPStan instead of Psalm

Author: sebastianbergmann

.gitattributes

@@ -1,14 +1,14 @@
-/.github        export-ignore
-/.phive         export-ignore
-/.psalm         export-ignore
-/build          export-ignore
-/.gitattributes export-ignore
-/.gitignore     export-ignore
-/.php-cs-fixer.dist.php   export-ignore
-/build.xml      export-ignore
-/phpunit.xml    export-ignore
-/tests          export-ignore
-/tools          export-ignore
-/tools/*        binary
+/.github                export-ignore
+/.phive                 export-ignore
+/build                  export-ignore
+/.gitattributes         export-ignore
+/.gitignore             export-ignore
+/.php-cs-fixer.dist.php export-ignore
+/build.xml              export-ignore
+/phpstan.neon           export-ignore
+/phpunit.xml            export-ignore
+/tests                  export-ignore
+/tools                  export-ignore
+/tools/*                binary
 
 *.php diff=php

.github/workflows/ci.yml

@@ -31,8 +31,8 @@ jobs:
       - name: Run PHP-CS-Fixer
         run: ./tools/php-cs-fixer fix --dry-run --show-progress=dots --using-cache=no --verbose
 
-  type-checker:
-    name: Type Checker
+  static-analysis:
+    name: Static Analysis
 
     runs-on: ubuntu-latest
 
@@ -49,8 +49,8 @@ jobs:
       - name: Install dependencies with Composer
         run: ./tools/composer update --no-interaction --no-ansi --no-progress
 
-      - name: Run Psalm
-        run: ./tools/psalm --config=.psalm/config.xml --no-progress --shepherd --show-info=false --stats
+      - name: Run PHPStan
+        run: ./tools/phpstan analyse --no-progress --error-format=github
 
   tests:
     name: Tests

.phive/phars.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="php-cs-fixer" version="^3.0" installed="3.41.1" location="./tools/php-cs-fixer" copy="true"/>
-  <phar name="psalm" version="^5.0" installed="5.18.0" location="./tools/psalm" copy="true"/>
-  <phar name="composer" version="^2.0.3" installed="2.6.6" location="./tools/composer" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.59" installed="3.59.3" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="composer" version="^2.7" installed="2.7.7" location="./tools/composer" copy="true"/>
+  <phar name="phpstan" version="^1.11" installed="1.11.5" location="./tools/phpstan" copy="true"/>
 </phive>

.psalm/baseline.xml

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

.psalm/config.xml

@@ -54,15 +54,15 @@ public function endRange(): int
     }
 
     /**
-     * @psalm-return list<Line>
+     * @return list<Line>
      */
     public function lines(): array
     {
         return $this->lines;
     }
 
     /**
-     * @psalm-param list<Line> $lines
+     * @param list<Line> $lines
      */
     public function setLines(array $lines): void
     {

phpstan.neon

@@ -19,24 +19,24 @@
 final class Diff implements IteratorAggregate
 {
     /**
-     * @psalm-var non-empty-string
+     * @var non-empty-string
      */
     private string $from;
 
     /**
-     * @psalm-var non-empty-string
+     * @var non-empty-string
      */
     private string $to;
 
     /**
-     * @psalm-var list<Chunk>
+     * @var list<Chunk>
      */
     private array $chunks;
 
     /**
-     * @psalm-param non-empty-string $from
-     * @psalm-param non-empty-string $to
-     * @psalm-param list<Chunk> $chunks
+     * @param non-empty-string $from
+     * @param non-empty-string $to
+     * @param list<Chunk>      $chunks
      */
     public function __construct(string $from, string $to, array $chunks = [])
     {
@@ -46,31 +46,31 @@ public function __construct(string $from, string $to, array $chunks = [])
     }
 
     /**
-     * @psalm-return non-empty-string
+     * @return non-empty-string
      */
     public function from(): string
     {
         return $this->from;
     }
 
     /**
-     * @psalm-return non-empty-string
+     * @return non-empty-string
      */
     public function to(): string
     {
         return $this->to;
     }
 
     /**
-     * @psalm-return list<Chunk>
+     * @return list<Chunk>
      */
     public function chunks(): array
     {
         return $this->chunks;
     }
 
     /**
-     * @psalm-param list<Chunk> $chunks
+     * @param list<Chunk> $chunks
      */
     public function setChunks(array $chunks): void
     {

src/Chunk.php

@@ -46,13 +46,13 @@ final class StrictUnifiedDiffOutputBuilder implements DiffOutputBuilderInterface
     private bool $collapseRanges;
 
     /**
-     * @psalm-var positive-int
+     * @var positive-int
      */
     private int $commonLineThreshold;
     private string $header;
 
     /**
-     * @psalm-var positive-int
+     * @var positive-int
      */
     private int $contextLines;
 

src/Diff.php

@@ -30,7 +30,7 @@ final class UnifiedDiffOutputBuilder extends AbstractChunkOutputBuilder
     private int $commonLineThreshold = 6;
 
     /**
-     * @psalm-var positive-int
+     * @var positive-int
      */
     private int $contextLines = 3;
     private string $header;