Early-return NullSafeMethodCall in NodeNameResolver (#5840)

* Support NullsafeMethodCall in NodeNameResolver * Simplify with CallLike * fix * doc * simplify * simplify
rectorphp · May 2, 2024 · c7d2ca3 · c7d2ca3
1 parent 5193d43
commit c7d2ca3
Showing 1 changed file with 9 additions and 15 deletions.
diff --git a/src/NodeNameResolver/NodeNameResolver.php b/src/NodeNameResolver/NodeNameResolver.php
@@ -6,7 +6,10 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\CallLike;
+use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\NullsafeMethodCall;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
@@ -71,14 +74,6 @@ public function isNames(Node $node, array $names): bool
      */
     public function isName(Node | array $node, string $name): bool
     {
-        if ($node instanceof MethodCall) {
-            return false;
-        }
-
-        if ($node instanceof StaticCall) {
-            return false;
-        }
-
         $nodes = is_array($node) ? $node : [$node];
 
         foreach ($nodes as $node) {
@@ -100,11 +95,7 @@ public function isCaseSensitiveName(Node $node, string $name): bool
             return false;
         }
 
-        if ($node instanceof MethodCall) {
-            return false;
-        }
-
-        if ($node instanceof StaticCall) {
+        if ($node instanceof CallLike && !$node instanceof FuncCall) {
             return false;
         }
 
@@ -143,7 +134,10 @@ public function getName(Node | string $node): ?string
             return $namespacedName;
         }
 
-        if (($node instanceof MethodCall || $node instanceof StaticCall) && $this->isCallOrIdentifier($node->name)) {
+        if (
+            ($node instanceof MethodCall || $node instanceof StaticCall || $node instanceof NullsafeMethodCall)
+            && $this->isCallOrIdentifier($node->name)
+        ) {
             return null;
         }
 
@@ -242,7 +236,7 @@ private function isCallOrIdentifier(Expr|Identifier $node): bool
 
     private function isSingleName(Node $node, string $desiredName): bool
     {
-        if ($node instanceof MethodCall) {
+        if ($node instanceof CallLike && !$node instanceof FuncCall) {
             // method call cannot have a name, only the variable or method name
             return false;
         }