From 9139a317c10e0ad732350dcebd96e6caf4124384 Mon Sep 17 00:00:00 2001 From: Florent Morselli Date: Thu, 31 Oct 2024 17:34:19 +0100 Subject: [PATCH] Remove redundant import and improve Rector setup Removed the unused `PhpUnitTestClassRequiresCoversFixer` import from `ecs.php`. Enhanced the Rector configuration in `rector.php` by adding Symfony sets for code quality, constructor injection, and validator attributes, while keeping imports organized and removing unused imports. --- ecs.php | 2 +- rector.php | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ecs.php b/ecs.php index 6f25433..3c327bf 100644 --- a/ecs.php +++ b/ecs.php @@ -19,7 +19,6 @@ use PhpCsFixer\Fixer\PhpTag\LinebreakAfterOpeningTagFixer; use PhpCsFixer\Fixer\PhpUnit\PhpUnitTestAnnotationFixer; use PhpCsFixer\Fixer\PhpUnit\PhpUnitTestCaseStaticMethodCallsFixer; -use PhpCsFixer\Fixer\PhpUnit\PhpUnitTestClassRequiresCoversFixer; use PhpCsFixer\Fixer\ReturnNotation\SimplifiedNullReturnFixer; use PhpCsFixer\Fixer\Strict\DeclareStrictTypesFixer; use PhpCsFixer\Fixer\Strict\StrictComparisonFixer; @@ -31,6 +30,7 @@ $header = ''; return static function (ECSConfig $config) use ($header): void { + $header = ''; $config->import(SetList::PSR_12); $config->import(SetList::CLEAN_CODE); $config->import(SetList::DOCTRINE_ANNOTATIONS); diff --git a/rector.php b/rector.php index c78a24e..1ad732b 100644 --- a/rector.php +++ b/rector.php @@ -13,19 +13,26 @@ return static function (RectorConfig $config): void { $config->import(SetList::DEAD_CODE); $config->import(LevelSetList::UP_TO_PHP_82); + $config->import(SymfonySetList::SYMFONY_64); + $config->import(SymfonySetList::SYMFONY_50_TYPES); + $config->import(SymfonySetList::SYMFONY_52_VALIDATOR_ATTRIBUTES); $config->import(SymfonySetList::SYMFONY_CODE_QUALITY); - $config->import(PHPUnitSetList::PHPUNIT_110); + $config->import(SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION); + $config->import(SymfonySetList::ANNOTATIONS_TO_ATTRIBUTES); $config->import(PHPUnitSetList::PHPUNIT_CODE_QUALITY); + $config->import(PHPUnitSetList::ANNOTATIONS_TO_ATTRIBUTES); + $config->import(PHPUnitSetList::PHPUNIT_110); $config->parallel(); $config->paths([__DIR__ . '/src', __DIR__ . '/tests']); $config->skip( [ - __DIR__ . '/src/IndefiniteLengthMapObject.php', __DIR__ . '/src/MapObject.php', PreferPHPUnitThisCallRector::class, ] ); $config->phpVersion(PhpVersion::PHP_82); + $config->parallel(); $config->importNames(); $config->importShortClasses(); + $config->removeUnusedImports(); };