Skip to content

Commit 29c7d78

Browse files
authored
[dx] Add "if" set with if/else/ternary rules (#8199)
1 parent 7bbd2e7 commit 29c7d78

4 files changed

Lines changed: 34 additions & 20 deletions

File tree

‎config/set/if.php‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
6+
use Rector\CodeQuality\Rector\Expression\TernaryFalseExpressionToIfRector;
7+
use Rector\CodeQuality\Rector\If_\ArrayExplicitBoolCompareRector;
8+
use Rector\CodeQuality\Rector\If_\CombineIfRector;
9+
use Rector\CodeQuality\Rector\If_\CompleteMissingIfElseBracketRector;
10+
use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector;
11+
use Rector\CodeQuality\Rector\If_\ObjectExplicitBoolCompareRector;
12+
use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
13+
use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector;
14+
use Rector\CodingStyle\Rector\If_\AlternativeIfToBracketRector;
15+
use Rector\Config\RectorConfig;
16+
17+
return static function (RectorConfig $rectorConfig): void {
18+
$rectorConfig->rules([
19+
AlternativeIfToBracketRector::class,
20+
CompleteMissingIfElseBracketRector::class,
21+
InlineIfToExplicitIfRector::class,
22+
TernaryFalseExpressionToIfRector::class,
23+
ArrayExplicitBoolCompareRector::class,
24+
ObjectExplicitBoolCompareRector::class,
25+
ExplicitBoolCompareRector::class,
26+
CombineIfRector::class,
27+
ShortenElseIfRector::class,
28+
SimplifyIfElseToTernaryRector::class,
29+
]);
30+
};

‎src/Config/Level/CodeQualityLevel.php‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
use Rector\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector;
2929
use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector;
3030
use Rector\CodeQuality\Rector\Equal\UseIdenticalOverEqualWithSameTypeRector;
31-
use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
32-
use Rector\CodeQuality\Rector\Expression\TernaryFalseExpressionToIfRector;
3331
use Rector\CodeQuality\Rector\For_\ForRepeatedCountToOwnVariableRector;
3432
use Rector\CodeQuality\Rector\Foreach_\ForeachItemsAssignToEmptyArrayToAssignRector;
3533
use Rector\CodeQuality\Rector\Foreach_\ForeachToInArrayRector;
@@ -56,14 +54,7 @@
5654
use Rector\CodeQuality\Rector\Identical\SimplifyBoolIdenticalTrueRector;
5755
use Rector\CodeQuality\Rector\Identical\SimplifyConditionsRector;
5856
use Rector\CodeQuality\Rector\Identical\StrlenZeroToIdenticalEmptyStringRector;
59-
use Rector\CodeQuality\Rector\If_\ArrayExplicitBoolCompareRector;
60-
use Rector\CodeQuality\Rector\If_\CombineIfRector;
61-
use Rector\CodeQuality\Rector\If_\CompleteMissingIfElseBracketRector;
6257
use Rector\CodeQuality\Rector\If_\ConsecutiveNullCompareReturnsToNullCoalesceQueueRector;
63-
use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector;
64-
use Rector\CodeQuality\Rector\If_\ObjectExplicitBoolCompareRector;
65-
use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
66-
use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector;
6758
use Rector\CodeQuality\Rector\If_\SimplifyIfNotNullReturnRector;
6859
use Rector\CodeQuality\Rector\If_\SimplifyIfNullableReturnRector;
6960
use Rector\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector;
@@ -85,7 +76,6 @@
8576
use Rector\CodeQuality\Rector\Ternary\TernaryEmptyArrayArrayDimFetchToCoalesceRector;
8677
use Rector\CodeQuality\Rector\Ternary\TernaryImplodeToImplodeRector;
8778
use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector;
88-
use Rector\CodingStyle\Rector\If_\AlternativeIfToBracketRector;
8979
use Rector\Contract\Rector\RectorInterface;
9080
use Rector\Php52\Rector\Property\VarToPublicPropertyRector;
9181
use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector;
@@ -138,13 +128,8 @@ final class CodeQualityLevel
138128
NegatedAndsToPositiveOrsRector::class,
139129
SimplifyTautologyTernaryRector::class,
140130
SingleInArrayToCompareRector::class,
141-
SimplifyIfElseToTernaryRector::class,
142131
TernaryImplodeToImplodeRector::class,
143132
ConsecutiveNullCompareReturnsToNullCoalesceQueueRector::class,
144-
ArrayExplicitBoolCompareRector::class,
145-
ObjectExplicitBoolCompareRector::class,
146-
ExplicitBoolCompareRector::class,
147-
CombineIfRector::class,
148133
UseIdenticalOverEqualWithSameTypeRector::class,
149134
SimplifyBoolIdenticalTrueRector::class,
150135
SimplifyRegexPatternRector::class,
@@ -156,15 +141,13 @@ final class CodeQualityLevel
156141
StrlenZeroToIdenticalEmptyStringRector::class,
157142
ThrowWithPreviousExceptionRector::class,
158143
RemoveSoleValueSprintfRector::class,
159-
ShortenElseIfRector::class,
160144
ExplicitReturnNullRector::class,
161145
ArrayMergeOfNonArraysToSimpleArrayRector::class,
162146
ArrayKeyExistsTernaryThenValueToCoalescingRector::class,
163147
AbsolutizeRequireAndIncludePathRector::class,
164148
ChangeArrayPushToArrayAssignRector::class,
165149
ForRepeatedCountToOwnVariableRector::class,
166150
ForeachItemsAssignToEmptyArrayToAssignRector::class,
167-
InlineIfToExplicitIfRector::class,
168151
UnusedForeachValueToArrayKeysRector::class,
169152
CommonNotEqualRector::class,
170153
SetTypeToCastRector::class,
@@ -182,7 +165,6 @@ final class CodeQualityLevel
182165
FlipTypeControlToUseExclusiveTypeRector::class,
183166
InlineArrayReturnAssignRector::class,
184167
InlineIsAInstanceOfRector::class,
185-
TernaryFalseExpressionToIfRector::class,
186168
InlineConstructorDefaultToPropertyRector::class,
187169
TernaryEmptyArrayArrayDimFetchToCoalesceRector::class,
188170
OptionalParametersAfterRequiredRector::class,
@@ -191,8 +173,6 @@ final class CodeQualityLevel
191173
DisallowedEmptyRuleFixerRector::class,
192174
LocallyCalledStaticMethodToNonStaticRector::class,
193175
NumberCompareToMaxFuncCallRector::class,
194-
AlternativeIfToBracketRector::class,
195-
CompleteMissingIfElseBracketRector::class,
196176
RemoveUselessIsObjectCheckRector::class,
197177
ConvertStaticToSelfRector::class,
198178
SortCallLikeNamedArgsRector::class,

‎src/Configuration/RectorConfigBuilder.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -791,6 +791,7 @@ public function withPreparedSets(
791791
bool $naming = false,
792792
bool $namedArgs = false,
793793
bool $instanceOf = false,
794+
bool $if = false,
794795
bool $earlyReturn = false,
795796
/** @deprecated */
796797
bool $strictBooleans = false,
@@ -822,6 +823,7 @@ public function withPreparedSets(
822823
SetList::NAMING => $naming,
823824
SetList::NAMED_ARGS => $namedArgs,
824825
SetList::INSTANCEOF => $instanceOf,
826+
SetList::IF => $if,
825827
SetList::EARLY_RETURN => $earlyReturn,
826828
SetList::CARBON => $carbon,
827829
SetList::RECTOR_PRESET => $rectorPreset,

‎src/Set/ValueObject/SetList.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ final class SetList
8080

8181
public const string INSTANCEOF = __DIR__ . '/../../../config/set/instanceof.php';
8282

83+
public const string IF = __DIR__ . '/../../../config/set/if.php';
84+
8385
public const string CARBON = __DIR__ . '/../../../config/set/datetime-to-carbon.php';
8486

8587
public const string BEHAT_ANNOTATIONS_TO_ATTRIBUTES = __DIR__ . '/../../../config/set/behat-annotations-to-attributes.php';

0 commit comments

Comments
 (0)