diff --git a/config/set/php53.php b/config/set/php53.php index 36c384b4dc9..0f5c83d47a3 100644 --- a/config/set/php53.php +++ b/config/set/php53.php @@ -6,9 +6,11 @@ use Rector\Php53\Rector\FuncCall\DirNameFileConstantToDirConstantRector; use Rector\Php53\Rector\Ternary\TernaryToElvisRector; use Rector\Php53\Rector\Variable\ReplaceHttpServerVarsByServerRector; +use Rector\Visibility\Rector\ClassMethod\ExplicitPublicClassMethodRector; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rules([ + ExplicitPublicClassMethodRector::class, TernaryToElvisRector::class, DirNameFileConstantToDirConstantRector::class, ReplaceHttpServerVarsByServerRector::class, diff --git a/src/Config/Level/CodeQualityLevel.php b/src/Config/Level/CodeQualityLevel.php index 5e0fd9f6a12..183585058b8 100644 --- a/src/Config/Level/CodeQualityLevel.php +++ b/src/Config/Level/CodeQualityLevel.php @@ -75,6 +75,7 @@ use Rector\CodeQuality\Rector\Ternary\TernaryEmptyArrayArrayDimFetchToCoalesceRector; use Rector\CodeQuality\Rector\Ternary\TernaryImplodeToImplodeRector; use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector; +use Rector\CodingStyle\Rector\Ternary\TernaryConditionVariableAssignmentRector; use Rector\Contract\Rector\RectorInterface; use Rector\Php52\Rector\Property\VarToPublicPropertyRector; use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector; @@ -126,6 +127,7 @@ final class CodeQualityLevel SimplifyDeMorganBinaryRector::class, NegatedAndsToPositiveOrsRector::class, SimplifyTautologyTernaryRector::class, + TernaryConditionVariableAssignmentRector::class, SingleInArrayToCompareRector::class, TernaryImplodeToImplodeRector::class, ConsecutiveNullCompareReturnsToNullCoalesceQueueRector::class, diff --git a/src/Config/Level/CodingStyleLevel.php b/src/Config/Level/CodingStyleLevel.php index d5ffff62baf..c8c4c9471e6 100644 --- a/src/Config/Level/CodingStyleLevel.php +++ b/src/Config/Level/CodingStyleLevel.php @@ -6,7 +6,6 @@ use Rector\CodingStyle\Rector\Assign\SplitDoubleAssignRector; use Rector\CodingStyle\Rector\Catch_\CatchExceptionNameMatchingTypeRector; -use Rector\CodingStyle\Rector\ClassConst\RemoveFinalFromConstRector; use Rector\CodingStyle\Rector\ClassConst\SplitGroupedClassConstantsRector; use Rector\CodingStyle\Rector\ClassLike\NewlineBetweenClassLikeStmtsRector; use Rector\CodingStyle\Rector\ClassMethod\BinaryOpStandaloneAssignsToDirectRector; @@ -28,13 +27,11 @@ use Rector\CodingStyle\Rector\Stmt\RemoveUselessAliasInUseStatementRector; use Rector\CodingStyle\Rector\String_\SimplifyQuoteEscapeRector; use Rector\CodingStyle\Rector\String_\UseClassKeywordForClassNameResolutionRector; -use Rector\CodingStyle\Rector\Ternary\TernaryConditionVariableAssignmentRector; use Rector\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector; use Rector\Contract\Rector\RectorInterface; use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector; use Rector\Php86\Rector\FuncCall\MinMaxToClampRector; use Rector\Transform\Rector\FuncCall\FuncCallToConstFetchRector; -use Rector\Visibility\Rector\ClassMethod\ExplicitPublicClassMethodRector; /** * Key 0 = level 0 @@ -59,10 +56,8 @@ final class CodingStyleLevel SeparateMultiUseImportsRector::class, NewlineBetweenClassLikeStmtsRector::class, NewlineAfterStatementRector::class, - RemoveFinalFromConstRector::class, NullableCompareToNullRector::class, ConsistentImplodeRector::class, - TernaryConditionVariableAssignmentRector::class, SimplifyQuoteEscapeRector::class, StringClassNameToClassConstantRector::class, CatchExceptionNameMatchingTypeRector::class, @@ -81,7 +76,6 @@ final class CodingStyleLevel UseClassKeywordForClassNameResolutionRector::class, SplitGroupedPropertiesRector::class, SplitGroupedClassConstantsRector::class, - ExplicitPublicClassMethodRector::class, RemoveUselessAliasInUseStatementRector::class, BinaryOpStandaloneAssignsToDirectRector::class, MinMaxToClampRector::class, diff --git a/src/Config/Level/DeadCodeLevel.php b/src/Config/Level/DeadCodeLevel.php index c9a55b8adfe..278df6aa55c 100644 --- a/src/Config/Level/DeadCodeLevel.php +++ b/src/Config/Level/DeadCodeLevel.php @@ -5,6 +5,7 @@ namespace Rector\Config\Level; use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector; +use Rector\CodingStyle\Rector\ClassConst\RemoveFinalFromConstRector; use Rector\Contract\Rector\RectorInterface; use Rector\DeadCode\Rector\Array_\RemoveDuplicatedArrayKeyRector; use Rector\DeadCode\Rector\Assign\RemoveDoubleAssignRector; @@ -108,6 +109,7 @@ final class DeadCodeLevel RemoveUselessReturnExprInConstructRector::class, ReplaceBlockToItsStmtsRector::class, RemoveFilterVarOnExactTypeRector::class, + RemoveFinalFromConstRector::class, RemoveTypedPropertyDeadInstanceOfRector::class, RemoveDeadInstanceOfAssertRector::class, diff --git a/tests/Bridge/SetRectorsResolverTest.php b/tests/Bridge/SetRectorsResolverTest.php index 957e9188032..5aed8f87991 100644 --- a/tests/Bridge/SetRectorsResolverTest.php +++ b/tests/Bridge/SetRectorsResolverTest.php @@ -45,7 +45,7 @@ public function testResolveFromFilePathForPhpLevel(): void $rectorRulesWithConfiguration = $this->setRectorsResolver->resolveFromFilePathsIncludingConfiguration( $configFilePaths ); - $this->assertCount(61, $rectorRulesWithConfiguration); + $this->assertCount(62, $rectorRulesWithConfiguration); } public function testResolveWithConfiguration(): void