diff --git a/composer.json b/composer.json index 49e50bfc7413..08c6d72d8d18 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.17.0", + "rector/rector": "0.17.1", "vimeo/psalm": "^5.0" }, "suggest": { diff --git a/rector.php b/rector.php index cf6985af1488..df51a9b43b5a 100644 --- a/rector.php +++ b/rector.php @@ -29,7 +29,6 @@ use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector; use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector; -use Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector; use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector; use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector; use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector; @@ -43,7 +42,6 @@ use Rector\PHPUnit\Rector\MethodCall\GetMockBuilderGetMockToCreateMockRector; use Rector\PHPUnit\Set\PHPUnitSetList; use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector; -use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector; use Rector\Set\ValueObject\LevelSetList; use Rector\Set\ValueObject\SetList; use Utils\Rector\PassStrictParameterToFunctionParameterRector; @@ -94,11 +92,6 @@ __DIR__ . '/system/Router/AutoRouterImproved.php', ], - // call on purpose for nothing happen check - RemoveEmptyMethodCallRector::class => [ - __DIR__ . '/tests', - ], - // check on constant compare UnwrapFutureCompatibleIfPhpVersionRector::class => [ __DIR__ . '/system/Autoloader/Autoloader.php', @@ -119,6 +112,8 @@ GetMockBuilderGetMockToCreateMockRector::class => [ __DIR__ . '/tests/system/Email/EmailTest.php', ], + + SimplifyRegexPatternRector::class, ]); // auto import fully qualified class names @@ -147,7 +142,6 @@ $rectorConfig->rule(FuncGetArgsToVariadicParamRector::class); $rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class); $rectorConfig->rule(SimplifyEmptyArrayCheckRector::class); - $rectorConfig->rule(NormalizeNamespaceByPSR4ComposerAutoloadRector::class); $rectorConfig->rule(StringClassNameToClassConstantRector::class); $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class); $rectorConfig->rule(CompleteDynamicPropertiesRector::class); diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php index 6458449a02c9..40c5da39b091 100644 --- a/tests/system/Router/RouteCollectionTest.php +++ b/tests/system/Router/RouteCollectionTest.php @@ -12,6 +12,7 @@ namespace CodeIgniter\Router; use CodeIgniter\Config\Services; +use CodeIgniter\controller; use CodeIgniter\Exceptions\PageNotFoundException; use CodeIgniter\Test\CIUnitTestCase; use Config\Modules; @@ -237,7 +238,7 @@ public function testAddRecognizesCustomNamespaces() $routes->add('home', 'controller'); $expects = [ - 'home' => '\CodeIgniter\controller', + 'home' => '\\' . controller::class, ]; $routes = $routes->getRoutes();