Minor ClassMethodAssignManipulator improvements (#3662)

rectorphp · Apr 23, 2023 · 8423831 · 8423831
1 parent 092fb22
commit 8423831
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/src/NodeManipulator/ClassMethodAssignManipulator.php b/src/NodeManipulator/ClassMethodAssignManipulator.php
@@ -216,17 +216,13 @@ private function collectReferenceVariableNames(ClassMethod $classMethod): array
         $variables = $this->betterNodeFinder->findInstanceOf($classMethod, Variable::class);
 
         foreach ($variables as $variable) {
-            if ($this->nodeNameResolver->isName($variable, 'this')) {
+            $variableName = $this->nodeNameResolver->getName($variable);
+            if ($variableName === 'this' || $variableName === null) {
                 continue;
             }
 
             $parentNode = $variable->getAttribute(AttributeKey::PARENT_NODE);
             if ($parentNode instanceof Node && $this->isExplicitlyReferenced($parentNode)) {
-                $variableName = $this->nodeNameResolver->getName($variable);
-                if ($variableName === null) {
-                    continue;
-                }
-
                 $referencedVariables[] = $variableName;
                 continue;
             }
@@ -245,11 +241,6 @@ private function collectReferenceVariableNames(ClassMethod $classMethod): array
                 continue;
             }
 
-            $variableName = $this->nodeNameResolver->getName($variable);
-            if ($variableName === null) {
-                continue;
-            }
-
             if (! $this->isCallOrConstructorWithReference($parentNode, $variable, $argumentPosition)) {
                 continue;
             }
@@ -332,19 +323,19 @@ private function isFuncCallWithReferencedArgument(Node $node, Variable $variable
             return false;
         }
 
-        if (! $this->nodeNameResolver->isNames($node, ['array_shift', '*sort'])) {
+        if (! isset($node->args[0])) {
             return false;
         }
 
-        if (! isset($node->args[0])) {
+        if (! $node->args[0] instanceof Arg) {
             return false;
         }
 
-        if (! $node->args[0] instanceof Arg) {
+        if (! $this->nodeNameResolver->isNames($node, ['array_shift', '*sort'])) {
             return false;
         }
 
-        // is 1t argument
+        // is 1st argument
         return $node->args[0]->value !== $variable;
     }