Skip to content

Commit

Permalink
[Config] Use RectorConfig::configure() on tests (#5593)
Browse files Browse the repository at this point in the history
* [Config] Use RectorConfig::configure() on tests

* fix new line per call

* revert fixture
  • Loading branch information
samsonasik committed Feb 10, 2024
1 parent 2b913ac commit fbbdd50
Show file tree
Hide file tree
Showing 48 changed files with 129 additions and 202 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
use Rector\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector;
use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([RemoveAlwaysTrueIfConditionRector::class, RemoveEmptyClassMethodRector::class]);
};
return RectorConfig::configure()
->withRules([RemoveAlwaysTrueIfConditionRector::class, RemoveEmptyClassMethodRector::class]);
5 changes: 2 additions & 3 deletions tests/Issues/ChangeSwitchTernary/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
use Rector\Config\RectorConfig;
use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([ChangeSwitchToMatchRector::class, TernaryFalseExpressionToIfRector::class]);
};
return RectorConfig::configure()
->withRules([ChangeSwitchToMatchRector::class, TernaryFalseExpressionToIfRector::class]);
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
use Rector\Php80\Rector\FuncCall\ClassOnObjectRector;
use Rector\Php80\Rector\Ternary\GetDebugTypeRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([ClassOnObjectRector::class, GetDebugTypeRector::class]);
};
return RectorConfig::configure()
->withRules([ClassOnObjectRector::class, GetDebugTypeRector::class]);
5 changes: 2 additions & 3 deletions tests/Issues/ContinueToBreakSwitch/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
use Rector\Php52\Rector\Switch_\ContinueToBreakInSwitchRector;
use Rector\Php70\Rector\Break_\BreakNotInLoopOrSwitchToReturnRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([BreakNotInLoopOrSwitchToReturnRector::class, ContinueToBreakInSwitchRector::class]);
};
return RectorConfig::configure()
->withRules([BreakNotInLoopOrSwitchToReturnRector::class, ContinueToBreakInSwitchRector::class]);
5 changes: 2 additions & 3 deletions tests/Issues/DeadInstanceFlip/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
use Rector\Config\RectorConfig;
use Rector\DeadCode\Rector\If_\RemoveDeadInstanceOfRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([RemoveDeadInstanceOfRector::class, FlipTypeControlToUseExclusiveTypeRector::class]);
};
return RectorConfig::configure()
->withRules([RemoveDeadInstanceOfRector::class, FlipTypeControlToUseExclusiveTypeRector::class]);
5 changes: 2 additions & 3 deletions tests/Issues/EmptyBooleanCompare/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([BooleanInIfConditionRuleFixerRector::class, DisallowedEmptyRuleFixerRector::class]);
};
return RectorConfig::configure()
->withRules([BooleanInIfConditionRuleFixerRector::class, DisallowedEmptyRuleFixerRector::class]);
5 changes: 2 additions & 3 deletions tests/Issues/EmptyLongArraySyntax/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
use Rector\Php73\Rector\ConstFetch\SensitiveConstantNameRector;
use Rector\Php80\Rector\ClassMethod\AddParamBasedOnParentClassMethodRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([SensitiveConstantNameRector::class, AddParamBasedOnParentClassMethodRector::class]);
};
return RectorConfig::configure()
->withRules([SensitiveConstantNameRector::class, AddParamBasedOnParentClassMethodRector::class]);
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@
use Rector\Php55\Rector\FuncCall\GetCalledClassToSelfClassRector;
use Rector\Php55\Rector\FuncCall\GetCalledClassToStaticClassRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(GetCalledClassToSelfClassRector::class);
$rectorConfig->rule(GetCalledClassToStaticClassRector::class);
};
return RectorConfig::configure()
->withRules([GetCalledClassToSelfClassRector::class, GetCalledClassToStaticClassRector::class]);
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@
use Rector\Config\RectorConfig;
use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(ChangeIfElseValueAssignToEarlyReturnRector::class);
$rectorConfig->rule(SimplifyIfElseToTernaryRector::class);
};
return RectorConfig::configure()
->withRules([ChangeIfElseValueAssignToEarlyReturnRector::class, SimplifyIfElseToTernaryRector::class]);
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
use Rector\Config\RectorConfig;
use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([
SimplifyIfReturnBoolRector::class,
NewlineAfterStatementRector::class,
StringClassNameToClassConstantRector::class,
]);
};
return RectorConfig::configure()
->withRules(
[
SimplifyIfReturnBoolRector::class,
NewlineAfterStatementRector::class,
StringClassNameToClassConstantRector::class,
]
);
6 changes: 2 additions & 4 deletions tests/Issues/InfiniteLoop/config/infinite_loop.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@
use Rector\Config\RectorConfig;
use Rector\Tests\Issues\InfiniteLoop\Rector\MethodCall\InfinityLoopRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(InfinityLoopRector::class);
$rectorConfig->rule(SimplifyDeMorganBinaryRector::class);
};
return RectorConfig::configure()
->withRules([InfinityLoopRector::class, SimplifyDeMorganBinaryRector::class]);
5 changes: 2 additions & 3 deletions tests/Issues/InfiniteSwapParams/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
use Rector\Config\RectorConfig;
use Rector\Php80\Rector\Catch_\RemoveUnusedVariableInCatchRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([RemoveUnusedVariableInCatchRector::class, OptionalParametersAfterRequiredRector::class]);
};
return RectorConfig::configure()
->withRules([RemoveUnusedVariableInCatchRector::class, OptionalParametersAfterRequiredRector::class]);
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,5 @@
use Rector\Config\RectorConfig;
use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([
TypedPropertyFromStrictConstructorRector::class,
InlineConstructorDefaultToPropertyRector::class,
]);
};
return RectorConfig::configure()
->withRules([TypedPropertyFromStrictConstructorRector::class, InlineConstructorDefaultToPropertyRector::class]);
6 changes: 2 additions & 4 deletions tests/Issues/Issue6480/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@
use Rector\Config\RectorConfig;
use Rector\DeadCode\Rector\If_\RemoveDeadInstanceOfRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(RemoveDeadInstanceOfRector::class);
$rectorConfig->rule(SwitchNegatedTernaryRector::class);
};
return RectorConfig::configure()
->withRules([RemoveDeadInstanceOfRector::class, SwitchNegatedTernaryRector::class]);
6 changes: 2 additions & 4 deletions tests/Issues/Issue6481/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@
use Rector\Config\RectorConfig;
use Rector\DeadCode\Rector\If_\RemoveDeadInstanceOfRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(EncapsedStringsToSprintfRector::class);
$rectorConfig->rule(RemoveDeadInstanceOfRector::class);
};
return RectorConfig::configure()
->withRules([EncapsedStringsToSprintfRector::class, RemoveDeadInstanceOfRector::class]);
6 changes: 2 additions & 4 deletions tests/Issues/Issue6561/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@
use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
use Rector\Config\RectorConfig;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(ExplicitBoolCompareRector::class);
$rectorConfig->rule(CountArrayToEmptyArrayComparisonRector::class);
};
return RectorConfig::configure()
->withRules([ExplicitBoolCompareRector::class, CountArrayToEmptyArrayComparisonRector::class]);
6 changes: 2 additions & 4 deletions tests/Issues/Issue6670/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@
use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(RemoveUnusedPrivateMethodRector::class);
$rectorConfig->rule(RemoveAlwaysElseRector::class);
};
return RectorConfig::configure()
->withRules([RemoveUnusedPrivateMethodRector::class, RemoveAlwaysElseRector::class]);
6 changes: 2 additions & 4 deletions tests/Issues/Issue6840/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@
use Rector\Config\RectorConfig;
use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(ClassPropertyAssignToConstructorPromotionRector::class);
$rectorConfig->rule(NewlineAfterStatementRector::class);
};
return RectorConfig::configure()
->withRules([ClassPropertyAssignToConstructorPromotionRector::class, NewlineAfterStatementRector::class]);
8 changes: 4 additions & 4 deletions tests/Issues/Issue7112/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Rector\Naming\Rector\Assign\RenameVariableToMatchMethodCallReturnTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(RenameVariableToMatchMethodCallReturnTypeRector::class);
$rectorConfig->rule(AddVoidReturnTypeWhereNoReturnRector::class);
};
return RectorConfig::configure()
->withRules(
[RenameVariableToMatchMethodCallReturnTypeRector::class, AddVoidReturnTypeWhereNoReturnRector::class]
);
11 changes: 4 additions & 7 deletions tests/Issues/Issue7306/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@
use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector;
use Rector\Config\RectorConfig;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([
SimplifyIfNotNullReturnRector::class,
ExplicitBoolCompareRector::class,
NewlineAfterStatementRector::class,
]);
};
return RectorConfig::configure()
->withRules(
[SimplifyIfNotNullReturnRector::class, ExplicitBoolCompareRector::class, NewlineAfterStatementRector::class]
);
8 changes: 2 additions & 6 deletions tests/Issues/Issue7374/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,5 @@
use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector;
use Rector\Naming\Rector\ClassMethod\RenameVariableToMatchNewTypeRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([
RemoveUnusedPrivateMethodParameterRector::class,
RenameVariableToMatchNewTypeRector::class,
]);
};
return RectorConfig::configure()
->withRules([RemoveUnusedPrivateMethodParameterRector::class, RenameVariableToMatchNewTypeRector::class]);
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
use Rector\Config\RectorConfig;
use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([
ChangeAndIfToEarlyReturnRector::class,
CompleteDynamicPropertiesRector::class,
SimplifyDeMorganBinaryRector::class,
]);
};
return RectorConfig::configure()
->withRules(
[
ChangeAndIfToEarlyReturnRector::class,
CompleteDynamicPropertiesRector::class,
SimplifyDeMorganBinaryRector::class,
]
);
5 changes: 2 additions & 3 deletions tests/Issues/IssueAnnotation/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
use Rector\Config\RectorConfig;
use Rector\DowngradePhp80\Rector\MethodCall\DowngradeNamedArgumentRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(DowngradeNamedArgumentRector::class);
};
return RectorConfig::configure()
->withRules([DowngradeNamedArgumentRector::class]);
5 changes: 2 additions & 3 deletions tests/Issues/IssueConditionalType/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
use Rector\Config\RectorConfig;
use Rector\DowngradePhp80\Rector\FunctionLike\DowngradeMixedTypeDeclarationRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(DowngradeMixedTypeDeclarationRector::class);
};
return RectorConfig::configure()
->withRules([DowngradeMixedTypeDeclarationRector::class]);
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@
use Rector\Naming\Rector\Class_\RenamePropertyToMatchTypeRector;
use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(ClassPropertyAssignToConstructorPromotionRector::class);
$rectorConfig->rule(RenamePropertyToMatchTypeRector::class);
};
return RectorConfig::configure()
->withRules([ClassPropertyAssignToConstructorPromotionRector::class, RenamePropertyToMatchTypeRector::class]);
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@
use Rector\Config\RectorConfig;
use Rector\Naming\Rector\Class_\RenamePropertyToMatchTypeRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(RenamePropertyToMatchTypeRector::class);
$rectorConfig->rule(CompleteDynamicPropertiesRector::class);
};
return RectorConfig::configure()
->withRules([RenamePropertyToMatchTypeRector::class, CompleteDynamicPropertiesRector::class]);
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
use Rector\EarlyReturn\Rector\StmtsAwareInterface\ReturnEarlyIfVariableRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([RemoveAlwaysElseRector::class, ReturnEarlyIfVariableRector::class]);
};
return RectorConfig::configure()
->withRules([RemoveAlwaysElseRector::class, ReturnEarlyIfVariableRector::class]);
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@
use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector;
use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(ChangeAndIfToEarlyReturnRector::class);
$rectorConfig->rule(RemoveAlwaysElseRector::class);
};
return RectorConfig::configure()
->withRules([ChangeAndIfToEarlyReturnRector::class, RemoveAlwaysElseRector::class]);
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@
use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector;
use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(JsonThrowOnErrorRector::class);
$rectorConfig->rule(ChangeAndIfToEarlyReturnRector::class);
};
return RectorConfig::configure()
->withRules([JsonThrowOnErrorRector::class, ChangeAndIfToEarlyReturnRector::class]);
10 changes: 4 additions & 6 deletions tests/Issues/LocallyThis/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
use Rector\Config\RectorConfig;
use Rector\Php70\Rector\MethodCall\ThisCallOnStaticMethodToStaticCallRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([
LocallyCalledStaticMethodToNonStaticRector::class,
ThisCallOnStaticMethodToStaticCallRector::class,
]);
};
return RectorConfig::configure()
->withRules(
[LocallyCalledStaticMethodToNonStaticRector::class, ThisCallOnStaticMethodToStaticCallRector::class]
);
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
use Rector\Config\RectorConfig;
use Rector\Tests\Issues\PartialValueDocblockUpdate\Source\PartialUpdateTestRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(PartialUpdateTestRector::class);
};
return RectorConfig::configure()
->withRules([PartialUpdateTestRector::class]);
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@
use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector;
use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(RemoveUnusedConstructorParamRector::class);
$rectorConfig->rule(RemoveUnusedPrivatePropertyRector::class);
};
return RectorConfig::configure()
->withRules([RemoveUnusedConstructorParamRector::class, RemoveUnusedPrivatePropertyRector::class]);
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@
use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector;
use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(RemoveUnusedVariableAssignRector::class);
$rectorConfig->rule(RemoveAlwaysElseRector::class);
};
return RectorConfig::configure()
->withRules([RemoveUnusedVariableAssignRector::class, RemoveAlwaysElseRector::class]);
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
use Rector\DeadCode\Rector\Assign\RemoveDoubleAssignRector;
use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([RemoveDoubleAssignRector::class, RemoveUnusedVariableAssignRector::class]);
};
return RectorConfig::configure()
->withRules([RemoveDoubleAssignRector::class, RemoveUnusedVariableAssignRector::class]);
15 changes: 8 additions & 7 deletions tests/Issues/ReplaceStmtToExpr/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
use Rector\Config\RectorConfig;
use Rector\EarlyReturn\Rector\Return_\ReturnBinaryOrToEarlyReturnRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rules([
ExplicitBoolCompareRector::class,
FlipTypeControlToUseExclusiveTypeRector::class,
ReturnBinaryOrToEarlyReturnRector::class,
]);
};
return RectorConfig::configure()
->withRules(
[
ExplicitBoolCompareRector::class,
FlipTypeControlToUseExclusiveTypeRector::class,
ReturnBinaryOrToEarlyReturnRector::class,
]
);
5 changes: 2 additions & 3 deletions tests/Issues/ReturnEmptyNodes/config/configured_rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
use Rector\Config\RectorConfig;
use Rector\Tests\Issues\ReturnEmptyNodes\Source\ReturnEmptyStmtsRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(ReturnEmptyStmtsRector::class);
};
return RectorConfig::configure()
->withRules([ReturnEmptyStmtsRector::class]);
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@
use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
use Rector\Config\RectorConfig;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(CallableThisArrayToAnonymousFunctionRector::class);
$rectorConfig->rule(CountArrayToEmptyArrayComparisonRector::class);
};
return RectorConfig::configure()
->withRules([CallableThisArrayToAnonymousFunctionRector::class, CountArrayToEmptyArrayComparisonRector::class]);
Loading

0 comments on commit fbbdd50

Please sign in to comment.