Merge branch 'rectorphp:main' into main

Author: Lenny4

.github/workflows/e2e.yaml

@@ -29,6 +29,8 @@ jobs:
                     - 'e2e/applied-rule-change-docblock'
                     - 'e2e/applied-rule-removed-node'
                     - 'e2e/applied-rule-return-array-nodes'
+                    - 'e2e/config-dist-fallback'
+                    - 'e2e/config-file-priority'
                     - 'e2e/different-path-over-skip-config'
                     - 'e2e/invalid-paths'
                     - 'e2e/no-parallel-reflection-resolver'

build/target-repository/composer.json

@@ -9,7 +9,7 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "phpstan/phpstan": "^2.1.37"
+        "phpstan/phpstan": "^2.1.38"
     },
     "autoload": {
         "files": [

composer.json

@@ -23,7 +23,7 @@
         "nikic/php-parser": "^5.7",
         "ondram/ci-detector": "^4.2",
         "phpstan/phpdoc-parser": "^2.3",
-        "phpstan/phpstan": "^2.1.37",
+        "phpstan/phpstan": "^2.1.38",
         "react/event-loop": "^1.6",
         "react/promise": "^3.3",
         "react/socket": "^1.17",
@@ -36,7 +36,7 @@
         "symfony/console": "^6.4.24",
         "symfony/filesystem": "^7.0",
         "symfony/finder": "^6.4",
-        "symfony/process": "^6.4|7.0.*",
+        "symfony/process": "^6.4|^7.4",
         "symplify/easy-parallel": "^11.2.2",
         "symplify/rule-doc-generator-contracts": "^11.2",
         "webmozart/assert": "^2.1"

e2e/config-dist-fallback/.gitignore

@@ -0,0 +1 @@
+/vendor

e2e/config-dist-fallback/composer.json

@@ -0,0 +1,7 @@
+{
+    "require": {
+        "php": "^8.1"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
+}

e2e/config-dist-fallback/expected-output.diff

@@ -0,0 +1,22 @@
+1 file with changes
+===================
+
+1) src/SomeClass.php:4
+
+    ---------- begin diff ----------
+@@ @@
+
+ final class SomeClass
+ {
+-    /**
+-     * @var string
+-     */
+     public string $name = 'name';
+ }
+    ----------- end diff -----------
+
+Applied rules:
+ * RemoveUselessVarTagRector
+
+
+ [OK] 1 file would have been changed (dry-run) by Rector

e2e/config-dist-fallback/rector.dist.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\DeadCode\Rector\Property\RemoveUselessVarTagRector;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__ . '/src',
+    ]);
+
+    // This rule should be applied when rector.dist.php is used as fallback
+    $rectorConfig->rule(RemoveUselessVarTagRector::class);
+};

e2e/config-dist-fallback/src/SomeClass.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+final class SomeClass
+{
+    /**
+     * @var string
+     */
+    public string $name = 'name';
+}

e2e/config-file-priority/.gitignore

@@ -0,0 +1 @@
+/vendor

e2e/config-file-priority/composer.json

@@ -0,0 +1,7 @@
+{
+    "require": {
+        "php": "^8.1"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
+}