Match more types of ray calls

spatie · Jan 15, 2024 · 835086c · 835086c
1 parent 9b12be1
commit 835086c
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/Rector/RemoveRayCallRector.php b/src/Rector/RemoveRayCallRector.php
@@ -4,6 +4,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\FuncCall;
+use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\NodeTraverser;
 use Rector\Core\Contract\Rector\RectorInterface;
@@ -34,14 +35,18 @@ public function refactor(Node $node): ?int
     {
         $expr = $node->expr;
 
-        if (! $expr instanceof FuncCall) {
+        if (! $expr instanceof FuncCall && !$expr instanceof MethodCall) {
             return null;
         }
 
-        if (! $this->isName($expr->name, 'ray')) {
-            return null;
+        if ($this->isName($expr->name, 'ray')) {
+            return NodeTraverser::REMOVE_NODE;
+        }
+
+        if ($expr->var->name->parts && in_array('ray', $expr->var->name->parts)) {
+            return NodeTraverser::REMOVE_NODE;
         }
 
-        return NodeTraverser::REMOVE_NODE;
+        return null;
     }
 }