Skip to content

Commit 8cd8fed

Browse files
authored
Merge pull request #5239 from samsonasik/use-up-to-php73
[Rector] Using LevelSetList::UP_TO_PHP_73
2 parents fe5037d + dd72eef commit 8cd8fed

2 files changed

Lines changed: 20 additions & 8 deletions

File tree

rector.php

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,13 @@
3737
use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector;
3838
use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
3939
use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector;
40-
use Rector\Php70\Rector\Ternary\TernaryToNullCoalescingRector;
41-
use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector;
42-
use Rector\Php71\Rector\List_\ListToArrayDestructRector;
40+
use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
41+
use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
42+
use Rector\Php70\Rector\FuncCall\RandomFunctionRector;
43+
use Rector\Php71\Rector\FuncCall\CountOnNullRector;
4344
use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
4445
use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
46+
use Rector\Set\ValueObject\LevelSetList;
4547
use Rector\Set\ValueObject\SetList;
4648
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
4749
use Utils\Rector\PassStrictParameterToFunctionParameterRector;
@@ -51,7 +53,7 @@
5153

5254
return static function (ContainerConfigurator $containerConfigurator): void {
5355
$containerConfigurator->import(SetList::DEAD_CODE);
54-
$containerConfigurator->import(SetList::PHP_73);
56+
$containerConfigurator->import(LevelSetList::UP_TO_PHP_73);
5557

5658
$parameters = $containerConfigurator->parameters();
5759

@@ -95,6 +97,19 @@
9597
UnderscoreToCamelCaseVariableNameRector::class => [
9698
__DIR__ . '/system/Session/Handlers',
9799
],
100+
101+
// may cause load view files directly when detecting class that
102+
// make warning
103+
StringClassNameToClassConstantRector::class,
104+
105+
// sometime too detail
106+
CountOnNullRector::class,
107+
108+
// may not be unitialized on purpose
109+
AddDefaultValueForUndefinedVariableRector::class,
110+
111+
// use mt_rand instead of random_int on purpose on non-cryptographically random
112+
RandomFunctionRector::class,
98113
]);
99114

100115
// auto import fully qualified class names
@@ -123,12 +138,9 @@
123138
$services->set(ChangeArrayPushToArrayAssignRector::class);
124139
$services->set(UnnecessaryTernaryExpressionRector::class);
125140
$services->set(RemoveErrorSuppressInTryCatchStmtsRector::class);
126-
$services->set(TernaryToNullCoalescingRector::class);
127-
$services->set(ListToArrayDestructRector::class);
128141
$services->set(RemoveVarTagFromClassConstantRector::class);
129142
$services->set(AddPregQuoteDelimiterRector::class);
130143
$services->set(SimplifyRegexPatternRector::class);
131-
$services->set(RemoveExtraParametersRector::class);
132144
$services->set(FuncGetArgsToVariadicParamRector::class);
133145
$services->set(MakeInheritedMethodVisibilitySameAsParentRector::class);
134146
$services->set(FixClassCaseSensitivityNameRector::class);

tests/system/Autoloader/FileLocatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ public function testFindQNameFromPathWithoutCorrespondingNamespace()
261261
public function testGetClassNameFromClassFile()
262262
{
263263
$this->assertSame(
264-
__CLASS__,
264+
self::class,
265265
$this->locator->getClassname(__FILE__)
266266
);
267267
}

0 commit comments

Comments
 (0)