Upgrade to phpstan v2

.github/workflows/install_in_craftcms.yaml

@@ -16,7 +16,7 @@ jobs:
             # see https://github.com/shivammathur/setup-php
             -   uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.0
+                    php-version: 8.2
                     coverage: none
 
             -   run: git clone https://github.com/craftcms/cms.git --depth 1

composer.json

@@ -2,13 +2,13 @@
     "name": "craftcms/rector",
     "description": "Rector sets to automate Craft CMS upgrades",
     "require": {
-        "rector/rector": "^1.0.0"
+        "rector/rector": "^2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.0",
         "craftcms/cms": "^4.0.0|^5.0.0",
         "craftcms/ecs": "dev-main",
-        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan": "^2.0",
         "symfony/var-exporter": "^6.0"
     },
     "autoload": {
@@ -34,4 +34,4 @@
             "craftcms/plugin-installer": true
         }
     }
-}
+}

phpstan.neon

@@ -1,8 +1,6 @@
 parameters:
     level: 8
 
-    checkGenericClassInNonGenericObjectType: false
-
     paths:
         - ecs.php
         - scripts
@@ -11,6 +9,8 @@ parameters:
         - tests
 
     ignoreErrors:
+        - identifier: missingType.generics
+
         - '#expects string, ((.*?)string|string(.*?)) given#'
 
         # false positives on static calls

scripts/signature-builder.php

@@ -47,7 +47,7 @@ function normalizeNamespace(string $namespace): string
     $excludeNamespaces = array_map(fn($namespace) => normalizeNamespace($namespace), explode(',', $excludeNamespaces));
 }
 
-$filterNamespace = function($class) use ($namespaces, $excludeNamespaces): bool {
+$filterNamespace = function ($class) use ($namespaces, $excludeNamespaces): bool {
     if ($namespaces) {
         $include = false;
         foreach ($namespaces as $namespace) {
@@ -174,16 +174,24 @@ public function build(array $classes): array
         return $this->signatures;
     }
 
+    private function serializeTypeCallback(string $className): callable
+    {
+        return function (ReflectionNamedType|ReflectionIntersectionType $type) use ($className): string {
+            if ($type instanceof ReflectionIntersectionType) {
+                return implode('|', array_map($this->serializeTypeCallback($className), $type->getTypes()));
+            }
+            $name = $type->getName();
+            return $name === 'self' ? $className : $name;
+        };
+    }
+
     private function serializeType(?ReflectionType $type, string $className): ?string
     {
         if ($type === null) {
             return null;
         }
         if ($type instanceof ReflectionUnionType) {
-            return implode('|', array_map(function(ReflectionNamedType $type) use ($className) {
-                $name = $type->getName();
-                return $name === 'self' ? $className : $name;
-            }, $type->getTypes()));
+            return implode('|', array_map($this->serializeTypeCallback($className), $type->getTypes()));
         }
         // todo:
 //        if ($type instanceof ReflectionIntersectionType) {
@@ -213,7 +221,7 @@ private function analyzeClass(ReflectionClass $class): void
 
         $parentClass = $class->getParentClass() ?: null;
         $properties = $class->getProperties(ReflectionProperty::IS_PUBLIC | ReflectionProperty::IS_PROTECTED);
-        usort($properties, fn(ReflectionProperty $a, ReflectionProperty$b) => $a->getName() <=> $b->getName());
+        usort($properties, fn(ReflectionProperty $a, ReflectionProperty $b) => $a->getName() <=> $b->getName());
 
         foreach ($properties as $property) {
             $declaringClass = $property->getDeclaringClass();

scripts/signature-diff.php

@@ -113,16 +113,25 @@ private function includeMethodParamType(string $className, string $method, int $
         return !isset($oldParams[$position]) || $paramType !== $this->serializeType($oldParams[$position]->getType(), $className);
     }
 
+    private function serializeTypeCallback(string $className): callable
+    {
+        return function (ReflectionNamedType|ReflectionIntersectionType $type) use ($className): string {
+            if ($type instanceof ReflectionIntersectionType) {
+                return implode('|', array_map($this->serializeTypeCallback($className), $type->getTypes()));
+            }
+            $name = $type->getName();
+            return $name === 'self' ? $className : $name;
+        };
+    }
+
     private function serializeType(?ReflectionType $type, string $className): ?string
     {
         if ($type === null) {
             return null;
         }
+
         if ($type instanceof ReflectionUnionType) {
-            return implode('|', array_map(function(ReflectionNamedType $type) use ($className) {
-                $name = $type->getName();
-                return $name === 'self' ? $className : $name;
-            }, $type->getTypes()));
+            return implode('|', array_map($this->serializeTypeCallback($className), $type->getTypes()));
         }
         // todo:
 //        if ($type instanceof ReflectionIntersectionType) {

sets/craft-cms-50.php

@@ -9,7 +9,6 @@
 use Rector\Arguments\ValueObject\ArgumentAdder;
 use Rector\Arguments\ValueObject\RemoveMethodCallParam;
 use Rector\Config\RectorConfig;
-use Rector\ValueObject\Visibility;
 use Rector\Renaming\Rector\ClassConstFetch\RenameClassConstFetchRector;
 use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
 use Rector\Renaming\Rector\Name\RenameClassRector;
@@ -20,6 +19,7 @@
 use Rector\Renaming\ValueObject\RenameClassConstFetch;
 use Rector\Renaming\ValueObject\RenameProperty;
 use Rector\Renaming\ValueObject\RenameStaticMethod;
+use Rector\ValueObject\Visibility;
 use Rector\Visibility\Rector\ClassMethod\ChangeMethodVisibilityRector;
 use Rector\Visibility\ValueObject\ChangeMethodVisibility;
 

src/SetList.php

@@ -4,9 +4,7 @@
 
 namespace craft\rector;
 
-use Rector\Set\Contract\SetListInterface;
-
-final class SetList implements SetListInterface
+final class SetList
 {
     /**
      * @var string

src/SignatureConfigurator.php

@@ -76,7 +76,7 @@ public static function configure(RectorConfig $rectorConfig, string $name): void
 
     private static function type(string $type): Type
     {
-        if (! isset(self::$types[$type])) {
+        if (!isset(self::$types[$type])) {
             self::$types[$type] = self::createType($type);
         }