Upgrade to PHPParser 5 and PHPStan 2

.github/workflows/build_scoped_rector.yaml

@@ -66,11 +66,11 @@ jobs:
             # 3. prefix classes
             -   run: sh build/build-rector-scoped.sh rector-build rector-prefixed-downgraded
 
-            # 4. lint the code for PHP 7.2 - this must happen here, as setup-php allows only one PHP version switch: https://github.com/shivammathur/setup-php/issues/434
+            # 4. lint the code for PHP 7.4 - this must happen here, as setup-php allows only one PHP version switch: https://github.com/shivammathur/setup-php/issues/434
             -
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 7.2
+                    php-version: 7.4
                     coverage: none
             -   run: composer global require php-parallel-lint/php-parallel-lint --ansi
             -   run: /home/runner/.composer/vendor/bin/parallel-lint rector-prefixed-downgraded --exclude rector-prefixed-downgraded/stubs --exclude rector-prefixed-downgraded/vendor/tracy/tracy/examples --exclude rector-prefixed-downgraded/vendor/rector/rector-generator/templates --exclude rector-prefixed-downgraded/vendor/symfony/console/Debug/CliRequest.php

.github/workflows/code_analysis.yaml

@@ -27,7 +27,7 @@ jobs:
 
                     -
                         name: 'PHPStan'
-                        run: vendor/bin/phpstan analyse --ansi --error-format symplify
+                        run: vendor/bin/phpstan analyse --ansi
 
                     -
                         name: 'Commented Code'

.github/workflows/packages_tests.yaml

@@ -50,10 +50,19 @@ jobs:
 
             -   run: composer config minimum-stability dev
 
-            # test with current commit in a pull-request
-            -
-                run: composer require rector/rector-src dev-main#${{github.event.pull_request.head.sha}} --no-update
-                if: ${{ github.event_name == 'pull_request' }}
+            # temporary for PR 6431 as rector/rector-* packages already require this PR branch
+            # so avoid pointed to rector-src main branch composer.json
+            - name: Conditionally to not require rector/rector-src on PR 6431
+              if: ${{ github.event_name == 'pull_request' }}
+              run: |
+                if [ "${{ github.event.pull_request.number }}" != "6431" ]; then
+                  composer require rector/rector-src dev-main#${{ github.event.pull_request.head.sha }} --no-update
+                fi
+
+#            # test with current commit in a pull-request
+#            -
+#                run: composer require rector/rector-src dev-main#${{github.event.pull_request.head.sha}} --no-update
+#                if: ${{ github.event_name == 'pull_request' }}
 
             -   run: composer install --ansi
 

README.md

@@ -11,7 +11,7 @@ Head to [`rectorphp/rector`](http://github.com/rectorphp/rector) for documentati
 
 ## Building `rectorphp/rector`
 
-Code of this repository requires PHP 8. For `rector/rector` package the build downgrades code to PHP 7.2+.
+Code of this repository requires PHP 8. For `rector/rector` package the build downgrades code to PHP 7.4+.
 
 <br>
 

build/build-preload.php

@@ -76,6 +76,7 @@ final class PreloadBuilder
         'TokenEmulator.php',
         'KeywordEmulator.php',
         'Comment.php',
+        'PrettyPrinter.php',
         'PrettyPrinterAbstract.php',
         'Parser.php',
         'ParserAbstract.php',
@@ -104,6 +105,21 @@ final class PreloadBuilder
         'TypeNode.php',
     ];
 
+    /**
+     * The classes are deprecated and moved under Node
+     *
+     * @var string[]
+     */
+    private const IN_USE_CLASS_FILES = [
+        'Node/Expr/ArrayItem.php',
+        'Node/Expr/ClosureUse.php',
+        'Node/Scalar/EncapsedStringPart.php',
+        'Node/Scalar/LNumber.php',
+        'Node/Stmt/DeclareDeclare.php',
+        'Node/Stmt/PropertyProperty.php',
+        'Node/Stmt/StaticVar.php',
+    ];
+
     public function buildPreloadScript(string $buildDirectory, string $preloadFile): void
     {
         $this->buildPreloadScriptPhpParser($buildDirectory, $preloadFile);
@@ -315,6 +331,17 @@ private function findPhpParserFilesAndSortThem(string $vendorDir): array
         // 2. put first-class usages first
         $fileInfos = $this->sortFileInfos($fileInfos);
 
+        foreach ($fileInfos as $key => $fileInfo) {
+            foreach (self::IN_USE_CLASS_FILES as $inUseClassFile) {
+                if (str_ends_with($fileInfo->getPathname(), $inUseClassFile)) {
+                    unset($fileInfos[$key]);
+                    continue 2;
+                }
+            }
+        }
+
+        $fileInfos = array_values($fileInfos);
+
         $stmtsAwareInterface = new SplFileInfo(__DIR__ . '/../src/Contract/PhpParser/Node/StmtsAwareInterface.php');
         array_splice($fileInfos, 1, 0, [$stmtsAwareInterface]);
 

build/config/config-downgrade.php

@@ -9,7 +9,7 @@
 return RectorConfig::configure()
     ->withSkip(DowngradeRectorConfig::DEPENDENCY_EXCLUDE_PATHS)
     ->withPHPStanConfigs([__DIR__ . '/phpstan-for-downgrade.neon'])
-    ->withDowngradeSets(php72: true);
+    ->withDowngradeSets(php74: true);
 
 /**
  * Configuration consts for the different rector.php config files

build/config/phpstan-for-downgrade.neon

@@ -5,7 +5,3 @@ parameters:
     scanDirectories:
         # this is needed for symfony/dependendency-injection as it has hidden dependency on symfony/expression-language that we don't use here
         - ../../stubs
-
-    # see https://github.com/rectorphp/rector/issues/3490#issue-634342324
-    featureToggles:
-        disableRuntimeReflectionProvider: true

build/target-repository/.github/workflows/along_other_packages.yaml

@@ -13,7 +13,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php_version: ['7.2', '7.3', '7.4', '8.0', '8.1']
+                php_version: ['7.4', '8.0', '8.1']
                 commands:
                     -
                         name: 'Composer Dependency'

build/target-repository/.github/workflows/e2e.yaml

@@ -14,7 +14,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php_version: ['7.2', '7.3', '7.4', '8.0', '8.1']
+                php_version: ['7.4', '8.0', '8.1']
                 directory:
                     - 'e2e/define-constant'
                     - 'e2e/dont-execute-code'

build/target-repository/.github/workflows/e2e_diff.yaml

@@ -14,7 +14,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php_version: ['7.2', '7.3', '7.4', '8.0', '8.1']
+                php_version: ['7.4', '8.0', '8.1']
                 directory:
                     - 'e2e/attributes'
 

build/target-repository/.github/workflows/e2e_global.yaml

@@ -11,7 +11,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php_version: ['7.2', '7.3', '7.4', '8.0', '8.1']
+                php_version: ['7.4', '8.0', '8.1']
                 directory:
                     - 'e2e/global-install'
 

build/target-repository/.github/workflows/standalone_rule_test.yaml

@@ -11,7 +11,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php_version: ['7.3']
+                php_version: ['7.4']
                 directory:
                     - 'e2e/rector-prefixed-rule-test'
 

build/target-repository/composer.json

@@ -7,8 +7,8 @@
         "bin/rector"
     ],
     "require": {
-        "php": "^7.2|^8.0",
-        "phpstan/phpstan": "^1.12.5"
+        "php": "^7.4|^8.0",
+        "phpstan/phpstan": "^2.0.1"
     },
     "autoload": {
         "files": [

composer.json

@@ -20,11 +20,11 @@
         "doctrine/inflector": "^2.0.10",
         "illuminate/container": "^11.25",
         "nette/utils": "^4.0",
-        "nikic/php-parser": "^4.19.4",
+        "nikic/php-parser": "^5.3.1",
         "ocramius/package-versions": "^2.9",
         "ondram/ci-detector": "^4.2",
-        "phpstan/phpdoc-parser": "^1.32",
-        "phpstan/phpstan": "^1.12.5",
+        "phpstan/phpdoc-parser": "^2.0",
+        "phpstan/phpstan": "^2.0.1",
         "react/event-loop": "^1.5",
         "react/promise": "^3.2",
         "react/socket": "^1.15",
@@ -45,21 +45,17 @@
     "require-dev": {
         "php-parallel-lint/php-parallel-lint": "^1.4",
         "phpstan/extension-installer": "^1.4",
-        "phpstan/phpstan-deprecation-rules": "^1.2",
-        "phpstan/phpstan-phpunit": "^1.4",
-        "phpstan/phpstan-webmozart-assert": "^1.2.6",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpstan/phpstan-webmozart-assert": "^2.0",
         "phpunit/phpunit": "^10.5",
         "rector/release-notes-generator": "^0.3.0",
         "rector/swiss-knife": "^0.2.16",
-        "rector/type-perfect": "^1.0",
         "shipmonk/composer-dependency-analyser": "^1.8",
         "symplify/easy-coding-standard": "^12.3",
-        "symplify/phpstan-extensions": "^11.4",
-        "symplify/phpstan-rules": "^13.0",
         "symplify/rule-doc-generator": "^12.2.5",
         "symplify/vendor-patches": "^11.3",
         "tomasvotruba/class-leak": "^1.1.2",
-        "tomasvotruba/unused-public": "^1.0",
         "tracy/tracy": "^2.9"
     },
     "replace": {
@@ -111,7 +107,7 @@
         ],
         "check-cs": "vendor/bin/ecs check --ansi",
         "fix-cs": "vendor/bin/ecs check --fix --ansi",
-        "phpstan": "vendor/bin/phpstan analyse --ansi --error-format symplify --memory-limit=512M",
+        "phpstan": "vendor/bin/phpstan analyse --ansi --memory-limit=512M",
         "docs": "vendor/bin/rule-doc-generator validate rules",
         "rector": "bin/rector process --ansi",
         "preload": "php build/build-preload.php .",
@@ -126,22 +122,22 @@
                 "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/illuminate-container-container-php.patch"
             ],
             "nikic/php-parser": [
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-expr-closure-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-finally-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-function-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-do-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-catch-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-trycatch-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-for-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-classmethod-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-else-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-while-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-foreach-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-if-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-case-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-elseif-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-node-stmt-namespace-php.patch",
-                "https://raw.githubusercontent.com/rectorphp/vendor-patches/main/patches/nikic-php-parser-lib-phpparser-nodetraverser-php.patch"
+                "https://raw.githubusercontent.com/rectorphp/vendor-patches/php-parser-5-latest/patches/nikic-php-parser-lib-phpparser-node-expr-closure-php.patch",
+                "https://raw.githubusercontent.com/rectorphp/vendor-patches/php-parser-5-latest/patches/nikic-php-parser-lib-phpparser-node-stmt-finally-php.patch",
+                "https://raw.githubusercontent.com/rectorphp/vendor-patches/php-parser-5-latest/patches/nikic-php-parser-lib-phpparser-node-stmt-function-php.patch",
+                "https://raw.githubusercontent.com/rectorphp/vendor-patches/php-parser-5-latest/patches/nikic-php-parser-lib-phpparser-node-stmt-do-php.patch",
+                "https://raw.githubusercontent.com/rectorphp/vendor-patches/php-parser-5-latest/patches/nikic-php-parser-lib-phpparser-node-stmt-catch-php.patch",
+                "https://raw.githubusercontent.com/rectorphp/vendor-patches/php-parser-5-latest/patches/nikic-php-parser-lib-phpparser-node-stmt-trycatch-php.patch",
+                "https://raw.githubusercontent.com/rectorphp/vendor-patches/php-parser-5-latest/patches/nikic-php-parser-lib-phpparser-node-stmt-for-php.patch",
+                "https://raw.githubusercontent.com/rectorphp/vendor-patches/php-parser-5-latest/patches/nikic-php-parser-lib-phpparser-node-stmt-classmethod-php.patch",
+                "https://raw.githubusercontent.com/rectorphp/vendor-patches/php-parser-5-latest/patches/nikic-php-parser-lib-phpparser-node-stmt-else-php.patch",
+                "https://raw.githubusercontent.com/rectorphp/vendor-patches/php-parser-5-latest/patches/nikic-php-parser-lib-phpparser-node-stmt-while-php.patch",
+                "https://raw.githubusercontent.com/rectorphp/vendor-patches/php-parser-5-latest/patches/nikic-php-parser-lib-phpparser-node-stmt-foreach-php.patch",
+                "https://raw.githubusercontent.com/rectorphp/vendor-patches/php-parser-5-latest/patches/nikic-php-parser-lib-phpparser-node-stmt-if-php.patch",
+                "https://raw.githubusercontent.com/rectorphp/vendor-patches/php-parser-5-latest/patches/nikic-php-parser-lib-phpparser-node-stmt-case-php.patch",
+                "https://raw.githubusercontent.com/rectorphp/vendor-patches/php-parser-5-latest/patches/nikic-php-parser-lib-phpparser-node-stmt-elseif-php.patch",
+                "https://raw.githubusercontent.com/rectorphp/vendor-patches/php-parser-5-latest/patches/nikic-php-parser-lib-phpparser-node-stmt-namespace-php.patch",
+                "https://raw.githubusercontent.com/rectorphp/vendor-patches/php-parser-5-latest/patches/nikic-php-parser-lib-phpparser-nodetraverser-php.patch"
             ]
         },
         "composer-exit-on-patch-failure": true,

config/phpstan/parser.neon

@@ -24,5 +24,4 @@ services:
         class: PHPStan\Parser\RichParser
         arguments:
             parser: @currentPhpVersionPhpParser
-            lexer: @currentPhpVersionLexer
         autowired: no

config/phpstan/static-reflection.neon

@@ -1,9 +1,3 @@
-parameters:
-    # see https://github.com/rectorphp/rector/issues/3490#issue-634342324
-    featureToggles:
-        disableRuntimeReflectionProvider: false
-        nodeConnectingVisitorCompatibility: false
-
 services:
     - Rector\NodeTypeResolver\Reflection\BetterReflection\RectorBetterReflectionSourceLocatorFactory
     - Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocator\IntermediateSourceLocator

full_build.sh

@@ -2,7 +2,7 @@
 
 # usage:
 #
-#   export PHP72_BIN_PATH=/opt/local/bin/php72 && sh ./full_build.sh
+#   export PHP74_BIN_PATH=/opt/local/bin/php74 && sh ./full_build.sh
 
 # see https://stackoverflow.com/questions/66644233/how-to-propagate-colors-from-bash-script-to-github-action?noredirect=1#comment117811853_66644233
 export TERM=xterm-color
@@ -37,14 +37,14 @@ php -d memory_limit=-1 bin/rector process rector-build/bin rector-build/config r
 
 sh build/build-rector-scoped.sh rector-build rector-prefixed-downgraded
 
-# verify syntax valid in php 7.2
+# verify syntax valid in php 7.4
 composer global require php-parallel-lint/php-parallel-lint
 
-if test -z ${PHP72_BIN_PATH+y}; then
+if test -z ${PHP74_BIN_PATH+y}; then
     ~/.config/composer/vendor/bin/parallel-lint rector-prefixed-downgraded --exclude rector-prefixed-downgraded/stubs --exclude rector-prefixed-downgraded/vendor/tracy/tracy/examples --exclude rector-prefixed-downgraded/vendor/rector/rector-generator/templates --exclude rector-prefixed-downgraded/vendor/symfony/console/Debug/CliRequest.php
 else
-    echo "verify syntax valid in php 7.2 with specify PHP72_BIN_PATH env";
-    $PHP72_BIN_PATH ~/.composer/vendor/bin/parallel-lint rector-prefixed-downgraded --exclude rector-prefixed-downgraded/stubs --exclude rector-prefixed-downgraded/vendor/tracy/tracy/examples --exclude rector-prefixed-downgraded/vendor/rector/rector-generator/templates --exclude rector-prefixed-downgraded/vendor/symfony/console/Debug/CliRequest.php
+    echo "verify syntax valid in php 7.4 with specify PHP74_BIN_PATH env";
+    $PHP74_BIN_PATH ~/.composer/vendor/bin/parallel-lint rector-prefixed-downgraded --exclude rector-prefixed-downgraded/stubs --exclude rector-prefixed-downgraded/vendor/tracy/tracy/examples --exclude rector-prefixed-downgraded/vendor/rector/rector-generator/templates --exclude rector-prefixed-downgraded/vendor/symfony/console/Debug/CliRequest.php
 fi
 
 # rollback, done testing succeed