diff --git a/config/set/rector-preset.php b/config/set/rector-preset.php index fbbee995050..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,5 +14,7 @@ DeclareStrictTypesRector::class, PostIncDecToPreIncDecRector::class, FinalizeTestCaseClassRector::class, + RemoveRefactorDuplicatedNodeInstanceCheckRector::class, + AddSeeTestAnnotationRector::class, ]); }; diff --git a/rector.php b/rector.php index d61e3724f72..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( @@ -39,8 +37,7 @@ __DIR__ . '/build/build-preload.php', ]) ->withRootFiles() - ->withImportNames(removeUnusedImports: true) - ->withRules([RemoveRefactorDuplicatedNodeInstanceCheckRector::class, AddSeeTestAnnotationRector::class]) + ->withImportNames() ->withSkip([ StringClassNameToClassConstantRector::class, // tests 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; 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 +?>