octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-01 17:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Config] Re-enable Config SetList on rector.php (#1360)

Browse Source 
Co-authored-by: GitHub Action <action@github.com>
This commit is contained in:
Abdul Malik Ikhsan 2021-12-01 15:52:15 +07:00 committed by GitHub
parent 33c225d216
commit 9e81001c68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rector.php
View File

@ -21,17 +21,17 @@ return static function (ContainerConfigurator $containerConfigurator): void {
$containerConfigurator->import(LevelSetList::UP_TO_PHP_80);
// include sets
// $containerConfigurator->import(SetList::CODING_STYLE);
// $containerConfigurator->import(SetList::CODING_STYLE_ADVANCED);
// $containerConfigurator->import(SetList::CODE_QUALITY);
// $containerConfigurator->import(SetList::DEAD_CODE);
// $containerConfigurator->import(SetList::PRIVATIZATION);
// $containerConfigurator->import(SetList::NAMING);
// $containerConfigurator->import(SetList::TYPE_DECLARATION);
// $containerConfigurator->import(SetList::EARLY_RETURN);
// $containerConfigurator->import(SetList::TYPE_DECLARATION_STRICT);
// $containerConfigurator->import(NetteSetList::NETTE_UTILS_CODE_QUALITY);
// $containerConfigurator->import(PHPUnitSetList::PHPUNIT_CODE_QUALITY);
$containerConfigurator->import(SetList::CODING_STYLE);
$containerConfigurator->import(SetList::CODING_STYLE_ADVANCED);
$containerConfigurator->import(SetList::CODE_QUALITY);
$containerConfigurator->import(SetList::DEAD_CODE);
$containerConfigurator->import(SetList::PRIVATIZATION);
$containerConfigurator->import(SetList::NAMING);
$containerConfigurator->import(SetList::TYPE_DECLARATION);
$containerConfigurator->import(SetList::EARLY_RETURN);
$containerConfigurator->import(SetList::TYPE_DECLARATION_STRICT);
$containerConfigurator->import(NetteSetList::NETTE_UTILS_CODE_QUALITY);
$containerConfigurator->import(PHPUnitSetList::PHPUNIT_CODE_QUALITY);
$services = $containerConfigurator->services();

1
rules-tests/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/config/configured_rule_php74.php
View File

@ -10,6 +10,7 @@ use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigura
return static function (ContainerConfigurator $containerConfigurator): void {
$parameters = $containerConfigurator->parameters();
$parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_74);
$services = $containerConfigurator->services();
$services->set(ArraySpreadInsteadOfArrayMergeRector::class);
};

1
rules-tests/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/config/configured_rule_php81.php
View File

@ -10,6 +10,7 @@ use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigura
return static function (ContainerConfigurator $containerConfigurator): void {
$parameters = $containerConfigurator->parameters();
$parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_81);
$services = $containerConfigurator->services();
$services->set(ArraySpreadInsteadOfArrayMergeRector::class);
};

2
rules/DowngradePhp80/Rector/New_/DowngradeArbitraryExpressionsSupportRector.php
View File

@ -75,7 +75,7 @@ CODE_SAMPLE
}
$isAllowed = $this->isAllowed($node->class);
$toSkip = $isAllowed && $this->isBetweenParentheses($node) !== false;
$toSkip = $isAllowed && $this->isBetweenParentheses($node);
if ($toSkip) {
return null;
}

5
rules/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php
View File

@ -136,10 +136,11 @@ CODE_SAMPLE
if (! $arrayStaticType instanceof ArrayType) {
return true;
}
return ! $this->isArrayKeyTypeAllowed($arrayStaticType);
}
private function isArrayKeyTypeAllowed(ArrayType $arrayStaticType): bool
private function isArrayKeyTypeAllowed(ArrayType $arrayType): bool
{
$allowedKeyTypes = [IntegerType::class];
if ($this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::ARRAY_SPREAD_STRING_KEYS)) {
@ -147,7 +148,7 @@ CODE_SAMPLE
}
foreach ($allowedKeyTypes as $allowedKeyType) {
if ($arrayStaticType->getKeyType() instanceof $allowedKeyType) {
if ($arrayType->getKeyType() instanceof $allowedKeyType) {
return true;
}
}

6
rules/Php81/Rector/Property/ReadOnlyPropertyRector.php
View File

@ -89,7 +89,11 @@ CODE_SAMPLE
return null;
}
if ($node->isReadonly() || $node->props[0]->default instanceof Expr) {
if ($node->isReadonly()) {
return null;
}
if ($node->props[0]->default instanceof Expr) {
return null;
}

4
rules/Transform/Rector/FuncCall/ArgumentFuncCallToMethodCallRector.php
View File

@ -121,7 +121,9 @@ CODE_SAMPLE
if ($argumentFuncCallToMethodCall instanceof ArgumentFuncCallToMethodCall) {
return $this->refactorFuncCallToMethodCall($argumentFuncCallToMethodCall, $classLike, $node);
} elseif ($argumentFuncCallToMethodCall instanceof ArrayFuncCallToMethodCall) {
}
if ($argumentFuncCallToMethodCall instanceof ArrayFuncCallToMethodCall) {
return $this->refactorArrayFunctionToMethodCall($argumentFuncCallToMethodCall, $node, $classLike);
}
}