fix var search

permafrost-dev · Jul 5, 2021 · baddbeb · baddbeb
1 parent 9a08f16
commit baddbeb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/Searcher.php b/src/Searcher.php
@@ -267,7 +267,7 @@ protected function traverseNodes(FileSearchResults $results, array $nodes): void
     {
         $traverser = new NodeTraverser();
 
-        $traverser->addVisitor(new FunctionCallVisitor($results, $this->functions));
+        $traverser->addVisitor(new FunctionCallVisitor($results, $this->functions, $this->variables));
 
         $traverser->traverse($nodes);
     }

diff --git a/src/Visitors/FunctionCallVisitor.php b/src/Visitors/FunctionCallVisitor.php
@@ -15,10 +15,13 @@ class FunctionCallVisitor extends NodeVisitorAbstract
 
     protected $functionNames = [];
 
-    public function __construct(FileSearchResults $results, array $functionNames)
+    protected $variableNames = [];
+
+    public function __construct(FileSearchResults $results, array $functionNames, array $variableNames)
     {
         $this->results = $results;
         $this->functionNames = $functionNames;
+        $this->variableNames = $variableNames;
     }
 
     public function enterNode(Node $node)
@@ -56,13 +59,15 @@ public function enterNode(Node $node)
         }
 
         if ($node instanceof Node\Expr\Variable) {
-            $location = FunctionCallLocation::create(
-                $node->name,
-                $node->getStartLine(),
-                $node->getEndLine()
-            );
+            if (in_array($node->name, $this->variableNames, true)) {
+                $location = FunctionCallLocation::create(
+                    $node->name,
+                    $node->getStartLine(),
+                    $node->getEndLine()
+                );
 
-            $this->results->addLocation($location);
+                $this->results->addLocation($location);
+            }
         }
 
         if ($node instanceof Node\Expr\New_) {