rectorphp · TomasVotruba · Oct 23, 2025 · Oct 23, 2025 · Oct 23, 2025 · Oct 23, 2025
diff --git a/.github/workflows/build_scoped_rector.yaml b/.github/workflows/build_scoped_rector.yaml
@@ -58,7 +58,7 @@ jobs:
             # 1. copy files to $NESTED_DIRECTORY directory Exclude the scoped/nested directories to prevent rsync from copying in a loop
             -  run: rsync --exclude rector-build -av * rector-build --quiet
 
-            -  run: rm -rf rector-build/rules-tests rector-build/templates rector-build/tests rector-build/bin/generate-changelog.php rector-build/bin/validate-phpstan-version.php rector-build/vendor/tracy/tracy/examples rector-build/vendor/symfony/console/Tester rector-build/vendor/symfony/console/Event rector-build/vendor/symfony/console/EventListener  rector-build/vendor/tracy/tracy/examples rector-build/vendor/tracy/tracy/src/Bridges rector-build/vendor/tracy/tracy/src/Tracy/Bar rector-build/vendor/tracy/tracy/src/Tracy/Session rector-build/vendor/symfony/service-contracts/Test
+            -  run: rm -rf rector-build/rules-tests rector-build/templates rector-build/tests rector-build/scripts/validate-phpstan-version.php rector-build/vendor/tracy/tracy/examples rector-build/vendor/symfony/console/Tester rector-build/vendor/symfony/console/Event rector-build/vendor/symfony/console/EventListener  rector-build/vendor/tracy/tracy/examples rector-build/vendor/tracy/tracy/src/Bridges rector-build/vendor/tracy/tracy/src/Tracy/Bar rector-build/vendor/tracy/tracy/src/Tracy/Session rector-build/vendor/symfony/service-contracts/Test
 
             # 2. downgrade rector
             -   run: php -d memory_limit=-1 bin/rector process rector-build/bin rector-build/config rector-build/src rector-build/rules rector-build/vendor --config build/config/config-downgrade.php --ansi --no-diffs
@@ -95,7 +95,7 @@ jobs:
 
             -   run: cp -a rector-prefixed-downgraded/. remote-repository
 
-            -   run: rm -rf remote-repository/bin/add-phpstan-self-replace.php remote-repository/bin/test-fixture-stats.php remote-repository/bin/check-before-after-same-fixtures.php remote-repository/bin/no-php-file-in-fixtures.php
+            -   run: rm -rf remote-repository/scripts/add-phpstan-self-replace.php remote-repository/scripts/test-fixture-stats.php remote-repository/scripts/check-before-after-same-fixtures.php remote-repository/scripts/no-php-file-in-fixtures.php
 
             # 7. setup git
             -

diff --git a/.github/workflows/code_analysis.yaml b/.github/workflows/code_analysis.yaml
@@ -46,19 +46,23 @@ jobs:
 
                     -
                         name: 'Compatible PHPStan versions'
-                        run: php bin/validate-phpstan-version.php
+                        run: php scripts/validate-phpstan-version.php
 
                     -
                         name: 'Finalize classes'
                         run: vendor/bin/swiss-knife finalize-classes src tests --dry-run
 
                     -
                         name: 'Check before/after test fixture on no-changes'
-                        run: php bin/check-before-after-same-fixtures.php
+                        run: php scripts/check-before-after-same-fixtures.php
+
+                    -
+                        name: 'Check fixture classes are different to nodes'
+                        run: php scripts/avoid-short-node-names-in-fixtures.php
 
                     -
                         name: 'Check no "*.php" files in rules Fixture directory'
-                        run: php bin/no-php-file-in-fixtures.php
+                        run: php scripts/no-php-file-in-fixtures.php
 
                     -
                         name: 'Detect composer dependency issues'

diff --git a/build/build-rector-scoped.sh b/build/build-rector-scoped.sh
@@ -30,7 +30,7 @@ note "Starts"
 note "Downloading php-scoper.phar"
 wget https://github.com/humbug/php-scoper/releases/download/0.18.17/php-scoper.phar -N --no-verbose
 
-php "$BUILD_DIRECTORY/bin/add-phpstan-self-replace.php"
+php "$BUILD_DIRECTORY/scripts/add-phpstan-self-replace.php"
 
 note "Remove PHPStan to avoid duplicating it"
 

diff --git a/composer-dependency-analyser.php b/composer-dependency-analyser.php
@@ -17,9 +17,6 @@
     // ensure use version ^3.2.0
     ->ignoreErrorsOnPackage('composer/pcre', [ErrorType::UNUSED_DEPENDENCY])
 
-    // use din /bin, but only local script
-    ->ignoreErrorsOnPackage('nette/robot-loader', [ErrorType::DEV_DEPENDENCY_IN_PROD])
-
     ->ignoreErrorsOnPaths([
         __DIR__ . '/stubs',
         __DIR__ . '/tests',

diff --git a/composer.json b/composer.json
@@ -86,7 +86,8 @@
             "E2e\\Parallel\\Reflection\\Resolver\\": [
                 "e2e/parallel-reflection-resolver/src/",
                 "e2e/no-parallel-reflection-resolver/src"
-            ]
+            ],
+            "Rector\\Scripts\\": "scripts/src"
         },
         "classmap": [
             "stubs",

diff --git a/ecs.php b/ecs.php
@@ -17,6 +17,7 @@
         __DIR__ . '/tests',
         __DIR__ . '/utils',
         __DIR__ . '/config',
+        __DIR__ . '/scripts',
         __DIR__ . '/build/build-preload.php',
     ])
     ->withSkip([

diff --git a/full_build.sh b/full_build.sh
@@ -31,7 +31,7 @@ bin/rector process src/functions/node_helper.php -c build/config/config-downgrad
 
 rsync --exclude rector-build -av * rector-build --quiet
 
-rm -rf rector-build/rules-tests rector-build/templates rector-build/tests rector-build/bin/validate-phpstan-version.php rector-build/vendor/tracy/tracy/examples rector-build/vendor/symfony/console/Tester rector-build/vendor/symfony/console/Event rector-build/vendor/symfony/console/EventListener  rector-build/vendor/tracy/tracy/examples rector-build/vendor/tracy/tracy/src/Bridges rector-build/vendor/tracy/tracy/src/Tracy/Bar rector-build/vendor/tracy/tracy/src/Tracy/Session rector-build/vendor/symfony/service-contracts/Test
+rm -rf rector-build/rules-tests rector-build/templates rector-build/tests rector-build/scripts/validate-phpstan-version.php rector-build/vendor/tracy/tracy/examples rector-build/vendor/symfony/console/Tester rector-build/vendor/symfony/console/Event rector-build/vendor/symfony/console/EventListener  rector-build/vendor/tracy/tracy/examples rector-build/vendor/tracy/tracy/src/Bridges rector-build/vendor/tracy/tracy/src/Tracy/Bar rector-build/vendor/tracy/tracy/src/Tracy/Session rector-build/vendor/symfony/service-contracts/Test
 
 php -d memory_limit=-1 bin/rector process rector-build/bin rector-build/config rector-build/src rector-build/rules rector-build/vendor --config build/config/config-downgrade.php --ansi --no-diffs
 

diff --git a/phpstan.neon b/phpstan.neon
@@ -26,6 +26,7 @@ parameters:
         - tests
         - rules-tests
         - utils
+        - scripts
         - e2e/e2eTestRunnerWithCache.php
         - e2e/e2eTestRunner.php
 

diff --git a/...eTypeRector/Fixture/nullable_type.php.inc → ...xture/flip_instance_nullable_type.php.inc b/...eTypeRector/Fixture/nullable_type.php.inc → ...xture/flip_instance_nullable_type.php.inc
@@ -4,7 +4,7 @@ namespace Rector\Tests\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiv
 
 use stdClass;
 
-class NullableType
+final class FlipInstanceNullableType
 {
     public function run()
     {
@@ -32,7 +32,7 @@ namespace Rector\Tests\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiv
 
 use stdClass;
 
-class NullableType
+final class FlipInstanceNullableType
 {
     public function run()
     {

diff --git a/...oveDeadContinueRector/Fixture/do_.php.inc → ...Rector/Fixture/continue_inside_do.php.inc b/...oveDeadContinueRector/Fixture/do_.php.inc → ...Rector/Fixture/continue_inside_do.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\DeadCode\Rector\For_\RemoveDeadContinueRector\Fixture;
 
-class Do_
+final class ContinueInsideDo
 {
     public function run()
     {
@@ -19,7 +19,7 @@ class Do_
 
 namespace Rector\Tests\DeadCode\Rector\For_\RemoveDeadContinueRector\Fixture;
 
-class Do_
+final class ContinueInsideDo
 {
     public function run()
     {

diff --git a/...adContinueRector/Fixture/foreach_.php.inc → ...r/Fixture/continue_inside_foreach.php.inc b/...adContinueRector/Fixture/foreach_.php.inc → ...r/Fixture/continue_inside_foreach.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\DeadCode\Rector\For_\RemoveDeadContinueRector\Fixture;
 
-class Foreach_
+final class ContinueInsideForeach
 {
     public function run($values)
     {
@@ -19,7 +19,7 @@ class Foreach_
 
 namespace Rector\Tests\DeadCode\Rector\For_\RemoveDeadContinueRector\Fixture;
 
-class Foreach_
+final class ContinueInsideForeach
 {
     public function run($values)
     {

diff --git a/...DeadContinueRector/Fixture/while_.php.inc → ...ntinueRector/Fixture/inside_while.php.inc b/...DeadContinueRector/Fixture/while_.php.inc → ...ntinueRector/Fixture/inside_while.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\DeadCode\Rector\For_\RemoveDeadContinueRector\Fixture;
 
-class While_
+final class InsideWhile
 {
     public function run()
     {
@@ -19,7 +19,7 @@ class While_
 
 namespace Rector\Tests\DeadCode\Rector\For_\RemoveDeadContinueRector\Fixture;
 
-class While_
+final class InsideWhile
 {
     public function run()
     {

diff --git a/.../RemoveDeadLoopRector/Fixture/do_.php.inc → ...veDeadLoopRector/Fixture/empty_do.php.inc b/.../RemoveDeadLoopRector/Fixture/do_.php.inc → ...veDeadLoopRector/Fixture/empty_do.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\DeadCode\Rector\For_\RemoveDeadLoopRector\Fixture;
 
-class Do_
+final class EmptyDo
 {
     public function run()
     {
@@ -18,7 +18,7 @@ class Do_
 
 namespace Rector\Tests\DeadCode\Rector\For_\RemoveDeadLoopRector\Fixture;
 
-class Do_
+final class EmptyDo
 {
     public function run()
     {

diff --git a/...veDeadLoopRector/Fixture/foreach_.php.inc → ...dLoopRector/Fixture/empty_foreach.php.inc b/...veDeadLoopRector/Fixture/foreach_.php.inc → ...dLoopRector/Fixture/empty_foreach.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\DeadCode\Rector\For_\RemoveDeadLoopRector\Fixture;
 
-class Foreach_
+final class EmptyForeach
 {
     public function run($values)
     {
@@ -17,7 +17,7 @@ class Foreach_
 
 namespace Rector\Tests\DeadCode\Rector\For_\RemoveDeadLoopRector\Fixture;
 
-class Foreach_
+final class EmptyForeach
 {
     public function run($values)
     {

diff --git a/...moveDeadLoopRector/Fixture/while_.php.inc → ...eadLoopRector/Fixture/empty_while.php.inc b/...moveDeadLoopRector/Fixture/while_.php.inc → ...eadLoopRector/Fixture/empty_while.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\DeadCode\Rector\For_\RemoveDeadLoopRector\Fixture;
 
-class While_
+final class EmptyWhile
 {
     public function run()
     {
@@ -17,7 +17,7 @@ class While_
 
 namespace Rector\Tests\DeadCode\Rector\For_\RemoveDeadLoopRector\Fixture;
 
-class While_
+final class EmptyWhile
 {
     public function run()
     {

diff --git a/...iContinueRector/Fixture/identical.php.inc → ...Rector/Fixture/split_or_identical.php.inc b/...iContinueRector/Fixture/identical.php.inc → ...Rector/Fixture/split_or_identical.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\EarlyReturn\Rector\If_\ChangeOrIfContinueToMultiContinueRector\Fixture;
 
-class Identical
+final class SplitOrIdentical
 {
     public function canDrive(Car $newCar)
     {
@@ -22,7 +22,7 @@ class Identical
 
 namespace Rector\Tests\EarlyReturn\Rector\If_\ChangeOrIfContinueToMultiContinueRector\Fixture;
 
-class Identical
+final class SplitOrIdentical
 {
     public function canDrive(Car $newCar)
     {

diff --git a/rules-tests/EarlyReturn/Rector/If_/RemoveAlwaysElseRector/Fixture/exit.php.inc b/rules-tests/EarlyReturn/Rector/If_/RemoveAlwaysElseRector/Fixture/exit.php.inc
diff --git a/...veAlwaysElseRector/Fixture/elseif.php.inc → ...lwaysElseRector/Fixture/if_return.php.inc b/...veAlwaysElseRector/Fixture/elseif.php.inc → ...lwaysElseRector/Fixture/if_return.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\EarlyReturn\Rector\If_\RemoveAlwaysElseRector\Fixture;
 
-class ElseIf_
+final class IfReturn
 {
     public function run()
     {
@@ -24,7 +24,7 @@ class ElseIf_
 
 namespace Rector\Tests\EarlyReturn\Rector\If_\RemoveAlwaysElseRector\Fixture;
 
-class ElseIf_
+final class IfReturn
 {
     public function run()
     {

diff --git a/...oveAlwaysElseRector/Fixture/throw.php.inc → ...eRector/Fixture/split_after_throw.php.inc b/...oveAlwaysElseRector/Fixture/throw.php.inc → ...eRector/Fixture/split_after_throw.php.inc
@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\EarlyReturn\Rector\If_\RemoveAlwaysElseRector\Fixture;
 
-class Throw_
+final class SplitAfterThrow
 {
     public function run()
     {
@@ -21,7 +21,7 @@ class Throw_
 
 namespace Rector\Tests\EarlyReturn\Rector\If_\RemoveAlwaysElseRector\Fixture;
 
-class Throw_
+final class SplitAfterThrow
 {
     public function run()
     {

diff --git a/...0/Rector/Class_/AnnotationToAttributeRector/Fixture/aliased_with_multi_properties.php.inc b/...0/Rector/Class_/AnnotationToAttributeRector/Fixture/aliased_with_multi_properties.php.inc
diff --git a/...ctor/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/nullable_type.php.inc b/...ctor/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/nullable_type.php.inc
@@ -4,7 +4,7 @@ namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromo
 
 use DateTimeInterface;
 
-class NullableType
+final class MergeWithNullableType
 {
     private ?DateTimeInterface $time;
 
@@ -22,7 +22,7 @@ namespace Rector\Tests\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromo
 
 use DateTimeInterface;
 
-class NullableType
+final class MergeWithNullableType
 {
     public function __construct(private ?DateTimeInterface $time = null)
     {

diff --git a/bin/add-phpstan-self-replace.php → scripts/add-phpstan-self-replace.php b/bin/add-phpstan-self-replace.php → scripts/add-phpstan-self-replace.php
@@ -12,7 +12,7 @@
 
 $composerJsonFileContents = FileSystem::read(__DIR__ . '/../composer.json');
 
-$installedPackageResolver = new InstalledPackageResolver(__DIR__ . '/..');
+$installedPackageResolver = new InstalledPackageResolver(__DIR__ . '/rector-src');
 $phpstanVersion = $installedPackageResolver->resolvePackageVersion('phpstan/phpstan');
 
 $composerJson = Json::decode($composerJsonFileContents, forceArrays: true);
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ parameters: @@
             - tests
             - rules-tests
             - utils
+            - scripts
             - e2e/e2eTestRunnerWithCache.php
             - e2e/e2eTestRunner.php
@@ Expand Down @@