Skip to content

Commit 9d4e10c

Browse files
authored
Merge pull request #7578 from codeigniter4/dependabot/composer/rector/rector-0.17.1
chore(deps-dev): update rector/rector requirement from 0.17.0 to 0.17.1
2 parents c87169d + 8967217 commit 9d4e10c

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"phpunit/phpcov": "^8.2",
2525
"phpunit/phpunit": "^9.1",
2626
"predis/predis": "^1.1 || ^2.0",
27-
"rector/rector": "0.17.0",
27+
"rector/rector": "0.17.1",
2828
"vimeo/psalm": "^5.0"
2929
},
3030
"suggest": {

rector.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector;
3030
use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
3131
use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
32-
use Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector;
3332
use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
3433
use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector;
3534
use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
@@ -43,7 +42,6 @@
4342
use Rector\PHPUnit\Rector\MethodCall\GetMockBuilderGetMockToCreateMockRector;
4443
use Rector\PHPUnit\Set\PHPUnitSetList;
4544
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
46-
use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector;
4745
use Rector\Set\ValueObject\LevelSetList;
4846
use Rector\Set\ValueObject\SetList;
4947
use Utils\Rector\PassStrictParameterToFunctionParameterRector;
@@ -94,11 +92,6 @@
9492
__DIR__ . '/system/Router/AutoRouterImproved.php',
9593
],
9694

97-
// call on purpose for nothing happen check
98-
RemoveEmptyMethodCallRector::class => [
99-
__DIR__ . '/tests',
100-
],
101-
10295
// check on constant compare
10396
UnwrapFutureCompatibleIfPhpVersionRector::class => [
10497
__DIR__ . '/system/Autoloader/Autoloader.php',
@@ -119,6 +112,8 @@
119112
GetMockBuilderGetMockToCreateMockRector::class => [
120113
__DIR__ . '/tests/system/Email/EmailTest.php',
121114
],
115+
116+
SimplifyRegexPatternRector::class,
122117
]);
123118

124119
// auto import fully qualified class names
@@ -147,7 +142,6 @@
147142
$rectorConfig->rule(FuncGetArgsToVariadicParamRector::class);
148143
$rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class);
149144
$rectorConfig->rule(SimplifyEmptyArrayCheckRector::class);
150-
$rectorConfig->rule(NormalizeNamespaceByPSR4ComposerAutoloadRector::class);
151145
$rectorConfig->rule(StringClassNameToClassConstantRector::class);
152146
$rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
153147
$rectorConfig->rule(CompleteDynamicPropertiesRector::class);

tests/system/Router/RouteCollectionTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace CodeIgniter\Router;
1313

1414
use CodeIgniter\Config\Services;
15+
use CodeIgniter\controller;
1516
use CodeIgniter\Exceptions\PageNotFoundException;
1617
use CodeIgniter\Test\CIUnitTestCase;
1718
use Config\Modules;
@@ -237,7 +238,7 @@ public function testAddRecognizesCustomNamespaces()
237238
$routes->add('home', 'controller');
238239

239240
$expects = [
240-
'home' => '\CodeIgniter\controller',
241+
'home' => '\\' . controller::class,
241242
];
242243

243244
$routes = $routes->getRoutes();

0 commit comments

Comments
 (0)