Merge pull request #5908 from codeigniter4/dependabot/composer/rector/rector-0.12.21

chore(deps-dev): update rector/rector requirement from 0.12.20 to 0.12.21

Author: samsonasik

composer.json

@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.5.6",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.20"
+        "rector/rector": "0.12.21"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

rector.php

@@ -21,12 +21,11 @@
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector;
-use Rector\CodeQuality\Rector\Return_\SimplifyUselessVariableRector;
 use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector;
 use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector;
 use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector;
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
-use Rector\Core\Configuration\Option;
+use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector;
 use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
@@ -45,31 +44,31 @@
 use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Utils\Rector\PassStrictParameterToFunctionParameterRector;
 use Utils\Rector\RemoveErrorSuppressInTryCatchStmtsRector;
 use Utils\Rector\RemoveVarTagFromClassConstantRector;
 use Utils\Rector\UnderscoreToCamelCaseVariableNameRector;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $containerConfigurator->import(SetList::DEAD_CODE);
-    $containerConfigurator->import(LevelSetList::UP_TO_PHP_74);
-    $containerConfigurator->import(PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD);
-    $containerConfigurator->import(PHPUnitSetList::PHPUNIT_80);
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->sets([
+        SetList::DEAD_CODE,
+        LevelSetList::UP_TO_PHP_74,
+        PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD,
+        PHPUnitSetList::PHPUNIT_80,
+    ]);
 
-    $parameters = $containerConfigurator->parameters();
+    $rectorConfig->parallel();
 
-    $parameters->set(Option::PARALLEL, true);
     // paths to refactor; solid alternative to CLI arguments
-    $parameters->set(Option::PATHS, [__DIR__ . '/app', __DIR__ . '/system', __DIR__ . '/tests', __DIR__ . '/utils/Rector']);
+    $rectorConfig->paths([__DIR__ . '/app', __DIR__ . '/system', __DIR__ . '/tests', __DIR__ . '/utils/Rector']);
 
     // do you need to include constants, class aliases or custom autoloader? files listed will be executed
-    $parameters->set(Option::BOOTSTRAP_FILES, [
+    $rectorConfig->bootstrapFiles([
         __DIR__ . '/system/Test/bootstrap.php',
     ]);
 
     // is there a file you need to skip?
-    $parameters->set(Option::SKIP, [
+    $rectorConfig->skip([
         __DIR__ . '/app/Views',
         __DIR__ . '/system/Debug/Toolbar/Views/toolbar.tpl.php',
         __DIR__ . '/system/ThirdParty',
@@ -124,42 +123,39 @@
     ]);
 
     // auto import fully qualified class names
-    $parameters->set(Option::AUTO_IMPORT_NAMES, true);
-
-    $services = $containerConfigurator->services();
-    $services->set(UnderscoreToCamelCaseVariableNameRector::class);
-    $services->set(SimplifyUselessVariableRector::class);
-    $services->set(RemoveAlwaysElseRector::class);
-    $services->set(PassStrictParameterToFunctionParameterRector::class);
-    $services->set(CountArrayToEmptyArrayComparisonRector::class);
-    $services->set(ForToForeachRector::class);
-    $services->set(ChangeNestedForeachIfsToEarlyContinueRector::class);
-    $services->set(ChangeIfElseValueAssignToEarlyReturnRector::class);
-    $services->set(SimplifyStrposLowerRector::class);
-    $services->set(CombineIfRector::class);
-    $services->set(SimplifyIfReturnBoolRector::class);
-    $services->set(InlineIfToExplicitIfRector::class);
-    $services->set(PreparedValueToEarlyReturnRector::class);
-    $services->set(ShortenElseIfRector::class);
-    $services->set(SimplifyIfElseToTernaryRector::class);
-    $services->set(UnusedForeachValueToArrayKeysRector::class);
-    $services->set(ChangeArrayPushToArrayAssignRector::class);
-    $services->set(UnnecessaryTernaryExpressionRector::class);
-    $services->set(RemoveErrorSuppressInTryCatchStmtsRector::class);
-    $services->set(RemoveVarTagFromClassConstantRector::class);
-    $services->set(AddPregQuoteDelimiterRector::class);
-    $services->set(SimplifyRegexPatternRector::class);
-    $services->set(FuncGetArgsToVariadicParamRector::class);
-    $services->set(MakeInheritedMethodVisibilitySameAsParentRector::class);
-    $services->set(SimplifyEmptyArrayCheckRector::class);
-    $services->set(NormalizeNamespaceByPSR4ComposerAutoloadRector::class);
-    $services->set(StringClassNameToClassConstantRector::class)
-        ->configure([
-            'Error',
-            'Exception',
-            'InvalidArgumentException',
-            'Closure',
-            'stdClass',
-            'SQLite3',
-        ]);
+    $rectorConfig->importNames();
+
+    $rectorConfig->rule(UnderscoreToCamelCaseVariableNameRector::class);
+    $rectorConfig->rule(RemoveAlwaysElseRector::class);
+    $rectorConfig->rule(PassStrictParameterToFunctionParameterRector::class);
+    $rectorConfig->rule(CountArrayToEmptyArrayComparisonRector::class);
+    $rectorConfig->rule(ForToForeachRector::class);
+    $rectorConfig->rule(ChangeNestedForeachIfsToEarlyContinueRector::class);
+    $rectorConfig->rule(ChangeIfElseValueAssignToEarlyReturnRector::class);
+    $rectorConfig->rule(SimplifyStrposLowerRector::class);
+    $rectorConfig->rule(CombineIfRector::class);
+    $rectorConfig->rule(SimplifyIfReturnBoolRector::class);
+    $rectorConfig->rule(InlineIfToExplicitIfRector::class);
+    $rectorConfig->rule(PreparedValueToEarlyReturnRector::class);
+    $rectorConfig->rule(ShortenElseIfRector::class);
+    $rectorConfig->rule(SimplifyIfElseToTernaryRector::class);
+    $rectorConfig->rule(UnusedForeachValueToArrayKeysRector::class);
+    $rectorConfig->rule(ChangeArrayPushToArrayAssignRector::class);
+    $rectorConfig->rule(UnnecessaryTernaryExpressionRector::class);
+    $rectorConfig->rule(RemoveErrorSuppressInTryCatchStmtsRector::class);
+    $rectorConfig->rule(RemoveVarTagFromClassConstantRector::class);
+    $rectorConfig->rule(AddPregQuoteDelimiterRector::class);
+    $rectorConfig->rule(SimplifyRegexPatternRector::class);
+    $rectorConfig->rule(FuncGetArgsToVariadicParamRector::class);
+    $rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class);
+    $rectorConfig->rule(SimplifyEmptyArrayCheckRector::class);
+    $rectorConfig->rule(NormalizeNamespaceByPSR4ComposerAutoloadRector::class);
+    $rectorConfig->ruleWithConfiguration(StringClassNameToClassConstantRector::class, [
+        'Error',
+        'Exception',
+        'InvalidArgumentException',
+        'Closure',
+        'stdClass',
+        'SQLite3',
+    ]);
 };