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

Co-authored-by: GitHub Action <action@github.com>

Author: samsonasik

rector.php

@@ -21,17 +21,17 @@
     $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();
 

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

@@ -10,6 +10,7 @@
 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);
 };

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

@@ -10,6 +10,7 @@
 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);
 };

rules/DowngradePhp80/Rector/New_/DowngradeArbitraryExpressionsSupportRector.php

@@ -75,7 +75,7 @@ public function refactor(Node $node): ?Node
         }
 
         $isAllowed = $this->isAllowed($node->class);
-        $toSkip = $isAllowed && $this->isBetweenParentheses($node) !== false;
+        $toSkip = $isAllowed && $this->isBetweenParentheses($node);
         if ($toSkip) {
             return null;
         }

rules/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php

@@ -136,18 +136,19 @@ private function shouldSkipArrayForInvalidTypeOrKeys(Expr $expr): bool
         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)) {
             $allowedKeyTypes[] = StringType::class;
         }
 
         foreach ($allowedKeyTypes as $allowedKeyType) {
-            if ($arrayStaticType->getKeyType() instanceof $allowedKeyType) {
+            if ($arrayType->getKeyType() instanceof $allowedKeyType) {
                 return true;
             }
         }

rules/Php81/Rector/Property/ReadOnlyPropertyRector.php

@@ -89,7 +89,11 @@ public function refactor(Node $node): ?Node
             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;
         }
 

rules/Transform/Rector/FuncCall/ArgumentFuncCallToMethodCallRector.php

@@ -121,7 +121,9 @@ public function refactor(Node $node): ?Node
 
             if ($argumentFuncCallToMethodCall instanceof ArgumentFuncCallToMethodCall) {
                 return $this->refactorFuncCallToMethodCall($argumentFuncCallToMethodCall, $classLike, $node);
-            } elseif ($argumentFuncCallToMethodCall instanceof ArrayFuncCallToMethodCall) {
+            }
+
+            if ($argumentFuncCallToMethodCall instanceof ArrayFuncCallToMethodCall) {
                 return $this->refactorArrayFunctionToMethodCall($argumentFuncCallToMethodCall, $node, $classLike);
             }
         }