From a4899373c84a7dca3822c1c1b4dbd8d49dfa5fa9 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Wed, 14 Feb 2024 10:59:12 +0100 Subject: [PATCH] cs --- rector.php | 34 ++++--------------- .../RemoveUselessDefaultCommentFixer.php | 3 +- .../StandaloneLineConstructorParamFixer.php | 3 +- .../StandaloneLinePromotedPropertyFixer.php | 3 +- 4 files changed, 9 insertions(+), 34 deletions(-) diff --git a/rector.php b/rector.php index 7bf8b84b7..e13eff1d9 100644 --- a/rector.php +++ b/rector.php @@ -3,35 +3,13 @@ declare(strict_types=1); use Rector\Config\RectorConfig; -use Rector\PHPUnit\Set\PHPUnitSetList; -use Rector\Set\ValueObject\LevelSetList; -use Rector\Set\ValueObject\SetList; -return static function (RectorConfig $rectorConfig): void { - $rectorConfig->sets([ - LevelSetList::UP_TO_PHP_82, - SetList::CODE_QUALITY, - SetList::DEAD_CODE, - SetList::CODING_STYLE, - SetList::TYPE_DECLARATION, - SetList::NAMING, - SetList::PRIVATIZATION, - SetList::EARLY_RETURN, - PHPUnitSetList::PHPUNIT_CODE_QUALITY, - PHPUnitSetList::PHPUNIT_100, - ]); - - $rectorConfig->paths([ - __DIR__ . '/config', - __DIR__ . '/src', - __DIR__ . '/tests', - ]); - - $rectorConfig->importNames(); - - $rectorConfig->skip([ - '*/scoper.php', +return RectorConfig::configure() + ->withPaths([__DIR__ . '/config', __DIR__ . '/src', __DIR__ . '/tests']) + ->withPhpSets() + ->withPreparedSets(codeQuality: true, codingStyle: true, naming: true, earlyReturn: true, privatization: true) + ->withImportNames(removeUnusedImports: true) + ->withSkip([ '*/Source/*', '*/Fixture/*', ]); -}; diff --git a/src/Fixer/Commenting/RemoveUselessDefaultCommentFixer.php b/src/Fixer/Commenting/RemoveUselessDefaultCommentFixer.php index 0a88fff23..877e371c9 100644 --- a/src/Fixer/Commenting/RemoveUselessDefaultCommentFixer.php +++ b/src/Fixer/Commenting/RemoveUselessDefaultCommentFixer.php @@ -4,7 +4,6 @@ namespace Symplify\CodingStandard\Fixer\Commenting; -use PhpCsFixer\Fixer\Basic\BracesFixer; use PhpCsFixer\FixerDefinition\FixerDefinition; use PhpCsFixer\FixerDefinition\FixerDefinitionInterface; use PhpCsFixer\Tokenizer\Token; @@ -48,7 +47,7 @@ public function isCandidate(Tokens $tokens): bool public function getPriority(): int { - /** must run before @see BracesFixer to cleanup spaces */ + /** must run before @see \PhpCsFixer\Fixer\Basic\BracesFixer to cleanup spaces */ return 40; } diff --git a/src/Fixer/Spacing/StandaloneLineConstructorParamFixer.php b/src/Fixer/Spacing/StandaloneLineConstructorParamFixer.php index 858512b86..d902bb612 100644 --- a/src/Fixer/Spacing/StandaloneLineConstructorParamFixer.php +++ b/src/Fixer/Spacing/StandaloneLineConstructorParamFixer.php @@ -4,7 +4,6 @@ namespace Symplify\CodingStandard\Fixer\Spacing; -use PhpCsFixer\Fixer\Basic\BracesFixer; use PhpCsFixer\FixerDefinition\FixerDefinition; use PhpCsFixer\FixerDefinition\FixerDefinitionInterface; use PhpCsFixer\Tokenizer\Token; @@ -36,7 +35,7 @@ public function __construct( /** * Must run before * - * @see BracesFixer::getPriority() + * @see \PhpCsFixer\Fixer\Basic\BracesFixer::getPriority() */ public function getPriority(): int { diff --git a/src/Fixer/Spacing/StandaloneLinePromotedPropertyFixer.php b/src/Fixer/Spacing/StandaloneLinePromotedPropertyFixer.php index 9c6a12e28..bfd036508 100644 --- a/src/Fixer/Spacing/StandaloneLinePromotedPropertyFixer.php +++ b/src/Fixer/Spacing/StandaloneLinePromotedPropertyFixer.php @@ -4,7 +4,6 @@ namespace Symplify\CodingStandard\Fixer\Spacing; -use PhpCsFixer\Fixer\Basic\BracesFixer; use PhpCsFixer\FixerDefinition\FixerDefinition; use PhpCsFixer\FixerDefinition\FixerDefinitionInterface; use PhpCsFixer\Tokenizer\CT; @@ -37,7 +36,7 @@ public function __construct( /** * Must run before * - * @see BracesFixer::getPriority() + * @see \PhpCsFixer\Fixer\Basic\BracesFixer::getPriority() */ public function getPriority(): int {