Skip to content

Commit beef2df

Browse files
committed
[CodeQuality] Move RemoveAlwaysElseRector, PreparedValueToEarlyReturnRector and ReturnEarlyIfVariableRector to code quality set
These rules improve local code quality rather than enforce the early-return style. Move their set registration from early-return to CodeQualityLevel. The rule classes stay in their current namespace.
1 parent 63c657c commit beef2df

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

‎config/set/early-return.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,13 @@
66
use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
77
use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector;
88
use Rector\EarlyReturn\Rector\If_\ChangeNestedIfsToEarlyReturnRector;
9-
use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
10-
use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector;
119
use Rector\EarlyReturn\Rector\Return_\ReturnBinaryOrToEarlyReturnRector;
12-
use Rector\EarlyReturn\Rector\StmtsAwareInterface\ReturnEarlyIfVariableRector;
1310

1411
return static function (RectorConfig $rectorConfig): void {
1512
$rectorConfig->rules([
1613
ChangeNestedForeachIfsToEarlyContinueRector::class,
1714
ChangeIfElseValueAssignToEarlyReturnRector::class,
1815
ChangeNestedIfsToEarlyReturnRector::class,
19-
RemoveAlwaysElseRector::class,
20-
PreparedValueToEarlyReturnRector::class,
2116
ReturnBinaryOrToEarlyReturnRector::class,
22-
ReturnEarlyIfVariableRector::class,
2317
]);
2418
};

‎rules/CodeQuality/Rector/Class_/InlineConstructorDefaultToPropertyRector.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ private function isPropertyDefinedInParentClass(Class_ $class, string $propertyN
172172
return true;
173173
}
174174

175-
return array_any($classReflection->getParents(), fn(ClassReflection $parentClassReflection) => $parentClassReflection->getNativeReflection()->hasProperty($propertyName));
175+
return array_any($classReflection->getParents(), fn (ClassReflection $parentClassReflection) => $parentClassReflection->getNativeReflection()->hasProperty($propertyName));
176176
}
177177

178178
private function matchAssignedLocalPropertyName(Assign $assign): ?string

‎src/Config/Level/CodeQualityLevel.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@
7272
use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector;
7373
use Rector\CodingStyle\Rector\Ternary\TernaryConditionVariableAssignmentRector;
7474
use Rector\Contract\Rector\RectorInterface;
75+
use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
76+
use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector;
77+
use Rector\EarlyReturn\Rector\StmtsAwareInterface\ReturnEarlyIfVariableRector;
7578
use Rector\Php52\Rector\Property\VarToPublicPropertyRector;
7679
use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector;
7780
use Rector\Renaming\Rector\FuncCall\RenameFunctionRector;
@@ -154,6 +157,9 @@ final class CodeQualityLevel
154157
CallUserFuncWithArrowFunctionToInlineRector::class,
155158
FlipTypeControlToUseExclusiveTypeRector::class,
156159
InlineArrayReturnAssignRector::class,
160+
RemoveAlwaysElseRector::class,
161+
PreparedValueToEarlyReturnRector::class,
162+
ReturnEarlyIfVariableRector::class,
157163
InlineIsAInstanceOfRector::class,
158164
InlineConstructorDefaultToPropertyRector::class,
159165
TernaryEmptyArrayArrayDimFetchToCoalesceRector::class,

0 commit comments

Comments
 (0)