diff --git a/config/set/early-return.php b/config/set/early-return.php index 1215ce33c67..b16ed67649c 100644 --- a/config/set/early-return.php +++ b/config/set/early-return.php @@ -4,21 +4,13 @@ use Rector\Config\RectorConfig; use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector; -use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector; use Rector\EarlyReturn\Rector\If_\ChangeNestedIfsToEarlyReturnRector; -use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector; -use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector; use Rector\EarlyReturn\Rector\Return_\ReturnBinaryOrToEarlyReturnRector; -use Rector\EarlyReturn\Rector\StmtsAwareInterface\ReturnEarlyIfVariableRector; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rules([ ChangeNestedForeachIfsToEarlyContinueRector::class, - ChangeIfElseValueAssignToEarlyReturnRector::class, ChangeNestedIfsToEarlyReturnRector::class, - RemoveAlwaysElseRector::class, - PreparedValueToEarlyReturnRector::class, ReturnBinaryOrToEarlyReturnRector::class, - ReturnEarlyIfVariableRector::class, ]); }; diff --git a/rules/CodeQuality/Rector/Class_/InlineConstructorDefaultToPropertyRector.php b/rules/CodeQuality/Rector/Class_/InlineConstructorDefaultToPropertyRector.php index c1e1358fb27..83ef9f3b268 100644 --- a/rules/CodeQuality/Rector/Class_/InlineConstructorDefaultToPropertyRector.php +++ b/rules/CodeQuality/Rector/Class_/InlineConstructorDefaultToPropertyRector.php @@ -172,7 +172,7 @@ private function isPropertyDefinedInParentClass(Class_ $class, string $propertyN return true; } - return array_any($classReflection->getParents(), fn(ClassReflection $parentClassReflection) => $parentClassReflection->getNativeReflection()->hasProperty($propertyName)); + return array_any($classReflection->getParents(), fn (ClassReflection $parentClassReflection) => $parentClassReflection->getNativeReflection()->hasProperty($propertyName)); } private function matchAssignedLocalPropertyName(Assign $assign): ?string diff --git a/src/Config/Level/CodeQualityLevel.php b/src/Config/Level/CodeQualityLevel.php index b41752b838a..8e4e7e880a5 100644 --- a/src/Config/Level/CodeQualityLevel.php +++ b/src/Config/Level/CodeQualityLevel.php @@ -72,6 +72,10 @@ use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector; use Rector\CodingStyle\Rector\Ternary\TernaryConditionVariableAssignmentRector; use Rector\Contract\Rector\RectorInterface; +use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector; +use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector; +use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector; +use Rector\EarlyReturn\Rector\StmtsAwareInterface\ReturnEarlyIfVariableRector; use Rector\Php52\Rector\Property\VarToPublicPropertyRector; use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector; use Rector\Renaming\Rector\FuncCall\RenameFunctionRector; @@ -154,6 +158,10 @@ final class CodeQualityLevel CallUserFuncWithArrowFunctionToInlineRector::class, FlipTypeControlToUseExclusiveTypeRector::class, InlineArrayReturnAssignRector::class, + RemoveAlwaysElseRector::class, + ChangeIfElseValueAssignToEarlyReturnRector::class, + PreparedValueToEarlyReturnRector::class, + ReturnEarlyIfVariableRector::class, InlineIsAInstanceOfRector::class, InlineConstructorDefaultToPropertyRector::class, TernaryEmptyArrayArrayDimFetchToCoalesceRector::class,