psalm est mort, vive le phpstan!

Author: Kirill Nesmeyanov

composer.json

@@ -19,11 +19,13 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.53",
+        "phpstan/extension-installer": "^1.3",
+        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan-strict-rules": "^1.5",
         "phpunit/phpunit": "^10.5",
         "rector/rector": "^1.0",
-        "symfony/var-dumper": "^5.6|^6.0|^7.0",
-        "type-lang/printer": "^1.0",
-        "vimeo/psalm": "^5.23"
+        "symfony/var-dumper": "^5.4|^6.0|^7.0",
+        "type-lang/printer": "^1.0"
     },
     "autoload-dev": {
         "psr-4": {
@@ -43,6 +45,9 @@
         "optimize-autoloader": true,
         "preferred-install": {
             "*": "dist"
+        },
+        "allow-plugins": {
+            "phpstan/extension-installer": true
         }
     },
     "scripts": {
@@ -53,8 +58,8 @@
         "test:functional": "phpunit --testsuite=functional",
 
         "linter": "@linter:check",
-        "linter:check": "psalm --no-cache",
-        "linter:fix": "psalm --no-cache --alter",
+        "linter:check": "phpstan analyse --configuration phpstan.neon",
+        "linter:baseline": "phpstan analyse --configuration phpstan.neon --generate-baseline",
 
         "phpcs": "@phpcs:check",
         "phpcs:check": "php-cs-fixer fix --config=.php-cs-fixer.php --allow-risky=yes --dry-run --verbose --diff",

phpstan.neon

@@ -0,0 +1,12 @@
+includes:
+  - phar://phpstan.phar/conf/bleedingEdge.neon
+parameters:
+  level: 9
+  strictRules:
+    allRules: true
+  fileExtensions:
+    - php
+  paths:
+    - src
+  tmpDir: vendor/.cache.phpstan
+  reportUnmatchedIgnoredErrors: false

psalm.xml

@@ -110,7 +110,10 @@ private function convertNamedType(\ReflectionNamedType $type): TypeStatement
 
     private function convertNonNullNamedType(\ReflectionNamedType $type): TypeStatement
     {
-        $identifier = new Identifier($type->getName());
+        /** @var non-empty-string $name */
+        $name = $type->getName();
+
+        $identifier = new Identifier($name);
 
         if ($type->isBuiltin() || $identifier->isSpecial() || $identifier->isBuiltin()) {
             return new NamedTypeNode(new Name($identifier));
@@ -121,6 +124,7 @@ private function convertNonNullNamedType(\ReflectionNamedType $type): TypeStatem
 
     /**
      * @throws ReaderExceptionInterface
+     * @return UnionTypeNode<TypeStatement>
      */
     private function convertUnionType(\ReflectionUnionType $type): UnionTypeNode
     {
@@ -135,6 +139,7 @@ private function convertUnionType(\ReflectionUnionType $type): UnionTypeNode
 
     /**
      * @throws ReaderExceptionInterface
+     * @return IntersectionTypeNode<TypeStatement>
      */
     private function convertIntersectionType(\ReflectionIntersectionType $type): IntersectionTypeNode
     {