From 7239f7b95f329e28f676b9332c6ee59dd9ed55e2 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Fri, 19 Jun 2026 12:45:00 +0200 Subject: [PATCH 1/5] [dx] enable removing of unused imports, as well tested and often enabled manually --- src/Configuration/RectorConfigBuilder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Configuration/RectorConfigBuilder.php b/src/Configuration/RectorConfigBuilder.php index 4f6fd86d548..0fadacd0134 100644 --- a/src/Configuration/RectorConfigBuilder.php +++ b/src/Configuration/RectorConfigBuilder.php @@ -950,7 +950,7 @@ public function withImportNames( bool $importNames = true, bool $importDocBlockNames = true, bool $importShortClasses = true, - bool $removeUnusedImports = false + bool $removeUnusedImports = true ): self { $this->importNames = $importNames; $this->importDocBlockNames = $importDocBlockNames; From ff3082846062593b6d395ae61c6027380b586975 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Fri, 19 Jun 2026 12:48:07 +0200 Subject: [PATCH 2/5] add RemoveRefactorDuplicatedNodeInstanceCheckRector to rector pre-set --- config/set/rector-preset.php | 1 + rector.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/set/rector-preset.php b/config/set/rector-preset.php index fbbee995050..7bcf7928691 100644 --- a/config/set/rector-preset.php +++ b/config/set/rector-preset.php @@ -12,5 +12,6 @@ DeclareStrictTypesRector::class, PostIncDecToPreIncDecRector::class, FinalizeTestCaseClassRector::class, + \Rector\Utils\Rector\RemoveRefactorDuplicatedNodeInstanceCheckRector::class, ]); }; diff --git a/rector.php b/rector.php index d61e3724f72..1c8227dcf68 100644 --- a/rector.php +++ b/rector.php @@ -39,8 +39,8 @@ __DIR__ . '/build/build-preload.php', ]) ->withRootFiles() - ->withImportNames(removeUnusedImports: true) - ->withRules([RemoveRefactorDuplicatedNodeInstanceCheckRector::class, AddSeeTestAnnotationRector::class]) + ->withImportNames() + ->withRules([AddSeeTestAnnotationRector::class]) ->withSkip([ StringClassNameToClassConstantRector::class, // tests From a699f771b4c82c10b325f5b8fc66d8218ac88b21 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Fri, 19 Jun 2026 12:48:50 +0200 Subject: [PATCH 3/5] [config] add AddSeeTestAnnotationRector to rector-preset --- config/set/rector-preset.php | 1 + rector.php | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/config/set/rector-preset.php b/config/set/rector-preset.php index 7bcf7928691..b6d7deea9e5 100644 --- a/config/set/rector-preset.php +++ b/config/set/rector-preset.php @@ -13,5 +13,6 @@ PostIncDecToPreIncDecRector::class, FinalizeTestCaseClassRector::class, \Rector\Utils\Rector\RemoveRefactorDuplicatedNodeInstanceCheckRector::class, + \Rector\PHPUnit\CodeQuality\Rector\Class_\AddSeeTestAnnotationRector::class, ]); }; diff --git a/rector.php b/rector.php index 1c8227dcf68..57ef4f1632b 100644 --- a/rector.php +++ b/rector.php @@ -7,8 +7,6 @@ use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPublicMethodParameterRector; use Rector\DeadCode\Rector\ConstFetch\RemovePhpVersionIdCheckRector; use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector; -use Rector\PHPUnit\CodeQuality\Rector\Class_\AddSeeTestAnnotationRector; -use Rector\Utils\Rector\RemoveRefactorDuplicatedNodeInstanceCheckRector; return RectorConfig::configure() ->withPreparedSets( @@ -40,7 +38,6 @@ ]) ->withRootFiles() ->withImportNames() - ->withRules([AddSeeTestAnnotationRector::class]) ->withSkip([ StringClassNameToClassConstantRector::class, // tests From 472a5412c7667a9dd7a8ecfd023cfe63362ac3f3 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Fri, 19 Jun 2026 12:53:19 +0200 Subject: [PATCH 4/5] update test fixtures --- .../Fixture/change_annotation_to_attribute.php.inc | 2 +- .../Fixture/add_property_var2.php.inc | 1 - .../Fixture/in_use_fqcn_docblock.php.inc | 2 +- .../Fixture/fixture.php.inc | 2 +- .../FixtureForeachToArrayParam/fixture.php.inc | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/Issues/AnnotationToAttributeFirstClassCallable/Fixture/change_annotation_to_attribute.php.inc b/tests/Issues/AnnotationToAttributeFirstClassCallable/Fixture/change_annotation_to_attribute.php.inc index 0ae8bc8b94d..2d308db5e3d 100644 --- a/tests/Issues/AnnotationToAttributeFirstClassCallable/Fixture/change_annotation_to_attribute.php.inc +++ b/tests/Issues/AnnotationToAttributeFirstClassCallable/Fixture/change_annotation_to_attribute.php.inc @@ -42,4 +42,4 @@ namespace Symfony\Component\Serializer\Annotation } -?> \ No newline at end of file +?> diff --git a/tests/Issues/ImportFullyQualifiedIdentifierDocblock/Fixture/add_property_var2.php.inc b/tests/Issues/ImportFullyQualifiedIdentifierDocblock/Fixture/add_property_var2.php.inc index 7f866a23bc9..1e7dd183bc5 100644 --- a/tests/Issues/ImportFullyQualifiedIdentifierDocblock/Fixture/add_property_var2.php.inc +++ b/tests/Issues/ImportFullyQualifiedIdentifierDocblock/Fixture/add_property_var2.php.inc @@ -20,7 +20,6 @@ declare(strict_types=1); namespace Rector\Tests\Issues\ImportFullyQualifiedIdentifierDocblock; use DateTime; -use stdClass; final class AddPropertyVar2 { diff --git a/tests/Issues/NamespacedUseAutoImport/Fixture/in_use_fqcn_docblock.php.inc b/tests/Issues/NamespacedUseAutoImport/Fixture/in_use_fqcn_docblock.php.inc index db4171110cd..d62bb4a02b6 100644 --- a/tests/Issues/NamespacedUseAutoImport/Fixture/in_use_fqcn_docblock.php.inc +++ b/tests/Issues/NamespacedUseAutoImport/Fixture/in_use_fqcn_docblock.php.inc @@ -46,4 +46,4 @@ class InUseFqcnDocblock } } -?> \ No newline at end of file +?> diff --git a/tests/Issues/PrintStringNowDocUnderAttributeTarget/Fixture/fixture.php.inc b/tests/Issues/PrintStringNowDocUnderAttributeTarget/Fixture/fixture.php.inc index 09cae7dd7e7..18774732802 100644 --- a/tests/Issues/PrintStringNowDocUnderAttributeTarget/Fixture/fixture.php.inc +++ b/tests/Issues/PrintStringNowDocUnderAttributeTarget/Fixture/fixture.php.inc @@ -48,4 +48,4 @@ final readonly class Fixture ) {} } -?> \ No newline at end of file +?> diff --git a/tests/Issues/ScopeNotAvailable/FixtureForeachToArrayParam/fixture.php.inc b/tests/Issues/ScopeNotAvailable/FixtureForeachToArrayParam/fixture.php.inc index 4be843282f5..c145b1979ed 100644 --- a/tests/Issues/ScopeNotAvailable/FixtureForeachToArrayParam/fixture.php.inc +++ b/tests/Issues/ScopeNotAvailable/FixtureForeachToArrayParam/fixture.php.inc @@ -52,4 +52,4 @@ class Fixture } } -?> \ No newline at end of file +?> From 024f64abc9b43eeeb8311051ec7f07fe1570a55f Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Fri, 19 Jun 2026 10:54:54 +0000 Subject: [PATCH 5/5] [ci-review] Rector Rectify --- config/set/rector-preset.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/set/rector-preset.php b/config/set/rector-preset.php index b6d7deea9e5..b3d40f3ce36 100644 --- a/config/set/rector-preset.php +++ b/config/set/rector-preset.php @@ -2,6 +2,8 @@ declare(strict_types=1); +use Rector\Utils\Rector\RemoveRefactorDuplicatedNodeInstanceCheckRector; +use Rector\PHPUnit\CodeQuality\Rector\Class_\AddSeeTestAnnotationRector; use Rector\CodingStyle\Rector\PostInc\PostIncDecToPreIncDecRector; use Rector\Config\RectorConfig; use Rector\Privatization\Rector\Class_\FinalizeTestCaseClassRector; @@ -12,7 +14,7 @@ DeclareStrictTypesRector::class, PostIncDecToPreIncDecRector::class, FinalizeTestCaseClassRector::class, - \Rector\Utils\Rector\RemoveRefactorDuplicatedNodeInstanceCheckRector::class, - \Rector\PHPUnit\CodeQuality\Rector\Class_\AddSeeTestAnnotationRector::class, + RemoveRefactorDuplicatedNodeInstanceCheckRector::class, + AddSeeTestAnnotationRector::class, ]); };