From 1e8fd97831b4b8da171199c480498d3b2e29812b Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sat, 20 Jun 2026 16:37:38 +0200 Subject: [PATCH] fix RemoveRefactorDuplicatedNodeInstanceCheckRector location to dead-code --- CLAUDE.md | 2 +- composer.json | 1 - config/set/rector-preset.php | 2 +- phpstan.neon | 2 +- phpunit.xml | 1 - .../Fixture/cover_bare_get_node_types.php.inc | 4 ++-- .../Fixture/some_class.php.inc | 4 ++-- ...eRefactorDuplicatedNodeInstanceCheckRectorTest.php | 2 +- .../config/configured_rule.php | 9 +++++++++ ...emoveRefactorDuplicatedNodeInstanceCheckRector.php | 4 ++-- .../config/configured_rule.php | 11 ----------- 11 files changed, 19 insertions(+), 23 deletions(-) rename {utils-tests/Rector => rules-tests/DeadCode/Rector/Class_}/RemoveRefactorDuplicatedNodeInstanceCheckRector/Fixture/cover_bare_get_node_types.php.inc (81%) rename {utils-tests/Rector => rules-tests/DeadCode/Rector/Class_}/RemoveRefactorDuplicatedNodeInstanceCheckRector/Fixture/some_class.php.inc (83%) rename {utils-tests/Rector => rules-tests/DeadCode/Rector/Class_}/RemoveRefactorDuplicatedNodeInstanceCheckRector/RemoveRefactorDuplicatedNodeInstanceCheckRectorTest.php (86%) create mode 100644 rules-tests/DeadCode/Rector/Class_/RemoveRefactorDuplicatedNodeInstanceCheckRector/config/configured_rule.php rename {utils/Rector => rules/DeadCode/Rector/Class_}/RemoveRefactorDuplicatedNodeInstanceCheckRector.php (96%) delete mode 100644 utils-tests/Rector/RemoveRefactorDuplicatedNodeInstanceCheckRector/config/configured_rule.php diff --git a/CLAUDE.md b/CLAUDE.md index 5a4dd536162..79a3fcb55ee 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -14,7 +14,7 @@ Project-specific conventions for `rector/rector-src`. See `CONTRIBUTING.md` for - `rules/` — built-in Rector rules, also under `Rector\` namespace (PSR-4 maps both `src/` and `rules/` to `Rector\`). - `rules-tests/` — tests for `rules/`, namespace `Rector\Tests\`. - `tests/` — tests for `src/`, same `Rector\Tests\` namespace. -- `utils/` + `utils-tests/` — internal dev tooling (`Rector\Utils\`). +- `utils/` — internal dev tooling (`Rector\Utils\`). - `config/` — config sets/presets (kept as plain class-string literals; do not let Rector rewrite them). - `build/target-repository/docs` — documentation lives here, not in repo root. diff --git a/composer.json b/composer.json index 696ea08853f..b2f5972e4d7 100644 --- a/composer.json +++ b/composer.json @@ -86,7 +86,6 @@ "rules-tests", "tests" ], - "Rector\\Utils\\Tests\\": "utils-tests", "Rector\\Utils\\PHPStan\\Tests\\": "utils/phpstan/tests", "E2e\\Parallel\\Reflection\\Resolver\\": [ "e2e/parallel-reflection-resolver/src/", diff --git a/config/set/rector-preset.php b/config/set/rector-preset.php index 3602ea12c12..89ffc20df27 100644 --- a/config/set/rector-preset.php +++ b/config/set/rector-preset.php @@ -4,11 +4,11 @@ use Rector\CodingStyle\Rector\PostInc\PostIncDecToPreIncDecRector; use Rector\Config\RectorConfig; +use Rector\DeadCode\Rector\Class_\RemoveRefactorDuplicatedNodeInstanceCheckRector; use Rector\PHPUnit\CodeQuality\Rector\Class_\AddSeeTestAnnotationRector; use Rector\Privatization\Rector\Class_\FinalizeTestCaseClassRector; use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector; use Rector\TypeDeclarationDocblocks\Rector\Class_\AddParamTypeToRefactorMethodRector; -use Rector\Utils\Rector\RemoveRefactorDuplicatedNodeInstanceCheckRector; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rules([ diff --git a/phpstan.neon b/phpstan.neon index 6585a348409..7417f795c96 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -364,7 +364,7 @@ parameters: identifier: offsetAccess.invalidOffset path: src/CustomRules/SimpleNodeDumper.php - - '#Method Rector\\Utils\\Rector\\RemoveRefactorDuplicatedNodeInstanceCheckRector\:\:getInstanceofNodeClass\(\) should return class\-string\|null but returns class\-string#' + - '#Method Rector\\DeadCode\\Rector\\Class_\\RemoveRefactorDuplicatedNodeInstanceCheckRector\:\:getInstanceofNodeClass\(\) should return class\-string\|null but returns class\-string#' # copied from /vendor, to keep as original as possible - diff --git a/phpunit.xml b/phpunit.xml index a1286aa25c1..37c4eb12d7f 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -13,7 +13,6 @@ tests rules-tests - utils-tests utils/phpstan/tests rules-tests/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector/Source/SomeAbstractTest.php diff --git a/utils-tests/Rector/RemoveRefactorDuplicatedNodeInstanceCheckRector/Fixture/cover_bare_get_node_types.php.inc b/rules-tests/DeadCode/Rector/Class_/RemoveRefactorDuplicatedNodeInstanceCheckRector/Fixture/cover_bare_get_node_types.php.inc similarity index 81% rename from utils-tests/Rector/RemoveRefactorDuplicatedNodeInstanceCheckRector/Fixture/cover_bare_get_node_types.php.inc rename to rules-tests/DeadCode/Rector/Class_/RemoveRefactorDuplicatedNodeInstanceCheckRector/Fixture/cover_bare_get_node_types.php.inc index 456c6bd025a..7f6b58323d9 100644 --- a/utils-tests/Rector/RemoveRefactorDuplicatedNodeInstanceCheckRector/Fixture/cover_bare_get_node_types.php.inc +++ b/rules-tests/DeadCode/Rector/Class_/RemoveRefactorDuplicatedNodeInstanceCheckRector/Fixture/cover_bare_get_node_types.php.inc @@ -1,6 +1,6 @@ withRules([RemoveRefactorDuplicatedNodeInstanceCheckRector::class]); diff --git a/utils/Rector/RemoveRefactorDuplicatedNodeInstanceCheckRector.php b/rules/DeadCode/Rector/Class_/RemoveRefactorDuplicatedNodeInstanceCheckRector.php similarity index 96% rename from utils/Rector/RemoveRefactorDuplicatedNodeInstanceCheckRector.php rename to rules/DeadCode/Rector/Class_/RemoveRefactorDuplicatedNodeInstanceCheckRector.php index 35bb54987e5..1aebff9b4a1 100644 --- a/utils/Rector/RemoveRefactorDuplicatedNodeInstanceCheckRector.php +++ b/rules/DeadCode/Rector/Class_/RemoveRefactorDuplicatedNodeInstanceCheckRector.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\Utils\Rector; +namespace Rector\DeadCode\Rector\Class_; use PhpParser\Node; use PhpParser\Node\Expr; @@ -23,7 +23,7 @@ use Webmozart\Assert\Assert; /** - * @see \Rector\Utils\Tests\Rector\RemoveRefactorDuplicatedNodeInstanceCheckRector\RemoveRefactorDuplicatedNodeInstanceCheckRectorTest + * @see \Rector\Tests\DeadCode\Rector\Class_\RemoveRefactorDuplicatedNodeInstanceCheckRector\RemoveRefactorDuplicatedNodeInstanceCheckRectorTest */ final class RemoveRefactorDuplicatedNodeInstanceCheckRector extends AbstractRector { diff --git a/utils-tests/Rector/RemoveRefactorDuplicatedNodeInstanceCheckRector/config/configured_rule.php b/utils-tests/Rector/RemoveRefactorDuplicatedNodeInstanceCheckRector/config/configured_rule.php deleted file mode 100644 index f4ae1bb7e60..00000000000 --- a/utils-tests/Rector/RemoveRefactorDuplicatedNodeInstanceCheckRector/config/configured_rule.php +++ /dev/null @@ -1,11 +0,0 @@ -withRules([ - RemoveRefactorDuplicatedNodeInstanceCheckRector::class, - ]);