[ci-review] Rector Rectify

Author: actions-user

rules/CodeQuality/Rector/Class_/ConvertStaticToSelfRector.php

@@ -6,7 +6,6 @@
 
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ClassConstantReflection;
-use PHPStan\TrinaryLogic;
 use PhpParser\Node;
 use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Expr\StaticCall;

rules/TypeDeclaration/Rector/ClassMethod/AddReturnDocblockForScalarArrayFromAssignsRector.php

@@ -134,8 +134,8 @@ public function refactor(Node $node): ?Node
         }
 
         $scalarArrayTypes = [];
-        foreach ($returnedVariableNames as $variableName) {
-            $scalarType = $this->resolveScalarArrayTypeForVariable($node, $variableName);
+        foreach ($returnedVariableNames as $returnedVariableName) {
+            $scalarType = $this->resolveScalarArrayTypeForVariable($node, $returnedVariableName);
             if ($scalarType instanceof Type) {
                 $scalarArrayTypes[] = $scalarType;
             } else {
@@ -191,11 +191,9 @@ private function resolveScalarArrayTypeForVariable(ClassMethod|Function_ $node,
         $arrayHasDimAssigns = false;
 
         foreach ($assigns as $assign) {
-            if ($assign->var instanceof Variable && $this->isName($assign->var, $variableName)) {
-                if ($assign->expr instanceof Array_ && $assign->expr->items === []) {
-                    $arrayHasInitialized = true;
-                    continue;
-                }
+            if ($assign->var instanceof Variable && $this->isName($assign->var, $variableName) && ($assign->expr instanceof Array_ && $assign->expr->items === [])) {
+                $arrayHasInitialized = true;
+                continue;
             }
 
             if (! $assign->var instanceof ArrayDimFetch) {