Update to PHPstan 2 and Rector 2

.github/workflows/functional_test__rector_examples.yml

@@ -18,9 +18,6 @@ jobs:
             fail-fast: false
             matrix:
                 include:
-                    - php-version: "8.0"
-                      drupal: "^9.2"
-                      fixture: "d9"
                     - php-version: "8.1"
                       drupal: "^10.0"
                       fixture: "d10"

.github/workflows/phpstan.yml

@@ -15,6 +15,15 @@ jobs:
         name: Static analysis with PHPStan
         # START: SHARED SETUP
         runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                include:
+                    - php-version: "8.2"
+                      rector: "^1"
+                      phpstan-config: phpstan-1.neon
+                    - php-version: "8.2"
+                      rector: "^2"
+                      phpstan-config: phpstan.neon
         steps:
             -   uses: actions/checkout@v3
             -   uses: shivammathur/setup-php@v2
@@ -28,5 +37,5 @@ jobs:
             #     uses: mxschmitt/action-tmate@v2
             # END: SHARED SETUP
 
-            - run: composer install
-            - run: composer phpstan
+            - run: composer require rector/rector:${{ matrix.rector }} --dev
+            - run: vendor/bin/phpstan analyse -c ${{ matrix.phpstan-config }}

.github/workflows/phpunit.yml

@@ -12,18 +12,21 @@ on:
 
 jobs:
     tests:
-        name: 'PHPUnit | PHP ${{ matrix.php-version }}'
+        name: 'PHPUnit | rector/rector:${{ matrix.rector }}'
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version:
-                    - "8.2"
+                include:
+                    - php-version: "8.2"
+                      rector: "^1"
+                    - php-version: "8.2"
+                      rector: "^2"
         steps:
             -   uses: actions/checkout@v3
             -   uses: shivammathur/setup-php@v2
                 with:
                     php-version: ${{ matrix.php-version }}
                     coverage: none
                     tools: composer:v2
-            - run: composer install
+            - run: composer require rector/rector:${{ matrix.rector }} --dev
             - run: composer test

composer.json

@@ -9,7 +9,7 @@
         "ast"
     ],
     "require": {
-        "rector/rector": "^1.0",
+        "rector/rector": "^1 || ^2",
         "webflo/drupal-finder": "^1.2"
     },
     "license": "MIT",
@@ -76,9 +76,9 @@
         "php": "^8.2",
         "cweagans/composer-patches": "^1.7.2",
         "friendsofphp/php-cs-fixer": "^3.58",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.0",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
+        "phpstan/extension-installer": "^1.4.3",
+        "phpstan/phpstan": "^1.12 || ^2.0",
+        "phpstan/phpstan-deprecation-rules": "^1.2 || ^2.0",
         "phpunit/phpunit": "^10.0",
         "symfony/yaml": "^5 || ^6 || ^7",
         "symplify/vendor-patches": "^11.0"

config/drupal-10/drupal-10.0-deprecations.php

@@ -9,6 +9,12 @@
 use Rector\Symfony\Set\TwigSetList;
 
 return static function (RectorConfig $rectorConfig): void {
+    if (defined('TwigSetList::TWIG_24')) {
+        $twigSet = TwigSetList::TWIG_24;
+    } else {
+        $twigSet = TwigSetList::TWIG_240;
+    }
+
     $rectorConfig->sets([
         PHPUnitSetList::PHPUNIT_90,
         SymfonySetList::SYMFONY_50,
@@ -19,7 +25,7 @@
         SymfonySetList::SYMFONY_60,
         SymfonySetList::SYMFONY_61,
         SymfonySetList::SYMFONY_62,
-        TwigSetList::TWIG_240,
+        $twigSet,
     ]);
 
     $rectorConfig->rule(ShouldCallParentMethodsRector::class);

config/drupal-9/drupal-9.0-deprecations.php

@@ -15,14 +15,20 @@
         return new AddCommentService();
     });
 
+    if (defined('TwigSetList::TWIG_24')) {
+        $twigSet = TwigSetList::TWIG_24;
+    } else {
+        $twigSet = TwigSetList::TWIG_240;
+    }
+
     $rectorConfig->sets([
         PHPUnitSetList::PHPUNIT_80,
         SymfonySetList::SYMFONY_40,
         SymfonySetList::SYMFONY_41,
         SymfonySetList::SYMFONY_42,
         SymfonySetList::SYMFONY_43,
         SymfonySetList::SYMFONY_44,
-        TwigSetList::TWIG_240,
+        $twigSet,
     ]);
     $rectorConfig->rule(ProtectedStaticModulesPropertyRector::class);
 

phpstan-1-baseline.neon

@@ -0,0 +1,159 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Access to undefined constant Rector\\\\Symfony\\\\Set\\\\TwigSetList\\:\\:TWIG_24\\.$#"
+			count: 1
+			path: config/drupal-10/drupal-10.0-deprecations.php
+
+		-
+			message: "#^Access to undefined constant Rector\\\\Symfony\\\\Set\\\\TwigSetList\\:\\:TWIG_24\\.$#"
+			count: 1
+			path: config/drupal-9/drupal-9.0-deprecations.php
+
+		-
+			message: """
+				#^Call to deprecated method locateRoot\\(\\) of class DrupalFinder\\\\DrupalFinder\\:
+				Will be removed in v2\\. Future usage should instantiate
+				  a new DrupalFinder object by passing the starting path to its
+				  constructor\\.$#
+			"""
+			count: 1
+			path: config/drupal-phpunit-bootstrap-file.php
+
+		-
+			message: "#^Function drupal_phpunit_contrib_extension_directory_roots\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: config/drupal-phpunit-bootstrap-file.php
+
+		-
+			message: "#^Function drupal_phpunit_find_extension_directories\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: config/drupal-phpunit-bootstrap-file.php
+
+		-
+			message: "#^Function drupal_phpunit_get_extension_namespaces\\(\\) has parameter \\$dirs with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: config/drupal-phpunit-bootstrap-file.php
+
+		-
+			message: "#^Function drupal_phpunit_get_extension_namespaces\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: config/drupal-phpunit-bootstrap-file.php
+
+		-
+			message: "#^Function drupal_phpunit_populate_class_loader\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: config/drupal-phpunit-bootstrap-file.php
+
+		-
+			message: "#^Function drupal_phpunit_populate_class_loader\\(\\) has parameter \\$drupalRoot with no type specified\\.$#"
+			count: 1
+			path: config/drupal-phpunit-bootstrap-file.php
+
+		-
+			message: "#^Function drupal_phpunit_populate_class_loader\\(\\) has parameter \\$vendorRoot with no type specified\\.$#"
+			count: 1
+			path: config/drupal-phpunit-bootstrap-file.php
+
+		-
+			message: """
+				#^Instantiation of deprecated class DrupalFinder\\\\DrupalFinder\\:
+				in drupal\\-finder\\:1\\.3\\.0 and is removed from drupal\\-finder\\:2\\.0\\.0\\.
+				  Use \\\\DrupalFinder\\\\DrupalFinderComposerRuntime instead\\.$#
+			"""
+			count: 1
+			path: config/drupal-phpunit-bootstrap-file.php
+
+		-
+			message: """
+				#^Call to deprecated method locateRoot\\(\\) of class DrupalFinder\\\\DrupalFinder\\:
+				Will be removed in v2\\. Future usage should instantiate
+				  a new DrupalFinder object by passing the starting path to its
+				  constructor\\.$#
+			"""
+			count: 1
+			path: rector.php
+
+		-
+			message: """
+				#^Instantiation of deprecated class DrupalFinder\\\\DrupalFinder\\:
+				in drupal\\-finder\\:1\\.3\\.0 and is removed from drupal\\-finder\\:2\\.0\\.0\\.
+				  Use \\\\DrupalFinder\\\\DrupalFinderComposerRuntime instead\\.$#
+			"""
+			count: 1
+			path: rector.php
+
+		-
+			message: "#^Access to an undefined property PhpParser\\\\Node\\\\Expr\\:\\:\\$value\\.$#"
+			count: 2
+			path: src/Drupal8/Rector/Deprecation/DBRector.php
+
+		-
+			message: "#^Call to an undefined method PHPStan\\\\Type\\\\Type\\:\\:getValue\\(\\)\\.$#"
+			count: 1
+			path: src/Drupal8/Rector/Deprecation/DrupalSetMessageRector.php
+
+		-
+			message: "#^Access to an undefined property PhpParser\\\\Node\\\\Expr\\:\\:\\$expr\\.$#"
+			count: 1
+			path: src/Drupal8/Rector/Deprecation/EntityLoadRector.php
+
+		-
+			message: "#^Access to an undefined property PhpParser\\\\Node\\\\Expr\\:\\:\\$expr\\.$#"
+			count: 2
+			path: src/Drupal8/Rector/Deprecation/EntityManagerRector.php
+
+		-
+			message: "#^Access to an undefined property PhpParser\\\\Node\\\\Expr\\:\\:\\$name\\.$#"
+			count: 3
+			path: src/Drupal8/Rector/Deprecation/EntityManagerRector.php
+
+		-
+			message: "#^Method DrupalRector\\\\Drupal8\\\\Rector\\\\Deprecation\\\\EntityManagerRector\\:\\:getServiceByMethodName\\(\\) has no return type specified\\.$#"
+			count: 1
+			path: src/Drupal8/Rector/Deprecation/EntityManagerRector.php
+
+		-
+			message: "#^PHPDoc tag @param references unknown parameter\\: \\$node$#"
+			count: 1
+			path: src/Drupal8/Rector/Deprecation/EntityManagerRector.php
+
+		-
+			message: "#^Parameter \\#1 \\$assign of method DrupalRector\\\\Drupal8\\\\Rector\\\\Deprecation\\\\EntityManagerRector\\:\\:findInstanceByNameInAssign\\(\\) expects PhpParser\\\\Node\\\\Expr\\\\Assign, PhpParser\\\\Node\\\\Expr given\\.$#"
+			count: 1
+			path: src/Drupal8/Rector/Deprecation/EntityManagerRector.php
+
+		-
+			message: "#^Parameter \\#1 \\$assign of method DrupalRector\\\\Drupal8\\\\Rector\\\\Deprecation\\\\EntityManagerRector\\:\\:replaceInstanceByNameInAssign\\(\\) expects PhpParser\\\\Node\\\\Expr\\\\Assign, PhpParser\\\\Node\\\\Expr given\\.$#"
+			count: 1
+			path: src/Drupal8/Rector/Deprecation/EntityManagerRector.php
+
+		-
+			message: "#^Parameter \\#1 \\$expr of method DrupalRector\\\\Drupal8\\\\Rector\\\\Deprecation\\\\EntityManagerRector\\:\\:refactorExpression\\(\\) expects PhpParser\\\\Node\\\\Expr\\\\MethodCall\\|PhpParser\\\\Node\\\\Expr\\\\StaticCall, PhpParser\\\\Node given\\.$#"
+			count: 1
+			path: src/Drupal8/Rector/Deprecation/EntityManagerRector.php
+
+		-
+			message: "#^Parameter \\#1 \\$expr of method DrupalRector\\\\Drupal8\\\\Rector\\\\Deprecation\\\\EntityManagerRector\\:\\:refactorExpression\\(\\) expects PhpParser\\\\Node\\\\Expr\\\\MethodCall\\|PhpParser\\\\Node\\\\Expr\\\\StaticCall, PhpParser\\\\Node\\\\Expr given\\.$#"
+			count: 1
+			path: src/Drupal8/Rector/Deprecation/EntityManagerRector.php
+
+		-
+			message: "#^Property PhpParser\\\\Node\\\\Expr\\\\Assign\\:\\:\\$expr \\(PhpParser\\\\Node\\\\Expr\\) does not accept PhpParser\\\\Node\\.$#"
+			count: 1
+			path: src/Drupal8/Rector/Deprecation/EntityManagerRector.php
+
+		-
+			message: "#^Calling PHPStan\\\\Php\\\\PhpVersionFactory\\:\\:create\\(\\) is not covered by backward compatibility promise\\. The method might change in a minor PHPStan version\\.$#"
+			count: 1
+			path: src/Drupal8/Rector/Deprecation/FunctionalTestDefaultThemePropertyRector.php
+
+		-
+			message: "#^Method PHPStan\\\\Type\\\\Type\\:\\:isSmallerThanOrEqual\\(\\) invoked with 2 parameters, 1 required\\.$#"
+			count: 1
+			path: src/Drupal8/Rector/Deprecation/FunctionalTestDefaultThemePropertyRector.php
+
+		-
+			message: "#^Call to an undefined method PHPStan\\\\Type\\\\Type\\:\\:getValue\\(\\)\\.$#"
+			count: 1
+			path: src/Drupal9/Rector/Deprecation/ExtensionPathRector.php

phpstan-1.neon

@@ -0,0 +1,12 @@
+parameters:
+	level: 6
+	paths:
+		- config
+		- src
+		- rector.php
+	bootstrapFiles:
+	    - vendor/rector/rector/vendor/autoload.php
+	dynamicConstantNames:
+		- Drupal::VERSION
+includes:
+	- phpstan-1-baseline.neon