various bug fixes

Author: patinthehat

src/Results/Nodes/VariableNode.php

@@ -4,6 +4,7 @@
 
 use Permafrost\PhpCodeSearch\Code\GenericCodeLocation;
 use Permafrost\PhpCodeSearch\Results\Nodes\Traits\HasLocation;
+use Permafrost\PhpCodeSearch\Support\NameResolver;
 use PhpParser\Node;
 
 class VariableNode implements ResultNode
@@ -15,11 +16,14 @@ class VariableNode implements ResultNode
 
     public function __construct(Node $node)
     {
-        if ($node instanceof Node\Expr\New_) {
-            $this->name = $node->class->toString();
-        } else {
-            $this->name = $node->name;
-        }
+
+        $this->name = NameResolver::resolve($node);
+
+//        if ($node instanceof Node\Expr\New_) {
+//            $this->name = $node->class->toString();
+//        } else {
+//            $this->name = $node->name;
+//        }
 
         $this->location = GenericCodeLocation::createFromNode($node);
     }

src/Visitors/AssignmentVisitor.php

@@ -6,6 +6,7 @@
 use Permafrost\PhpCodeSearch\Results\FileSearchResults;
 use Permafrost\PhpCodeSearch\Results\Nodes\AssignmentNode;
 use Permafrost\PhpCodeSearch\Support\Arr;
+use Permafrost\PhpCodeSearch\Support\NameResolver;
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
 
@@ -26,7 +27,13 @@ public function enterNode(Node $node)
     {
         if ($node instanceof Node\Expr\Assign) {
             if (! $node->var instanceof Node\Expr\ArrayDimFetch) {
-                if (Arr::matches($node->var->name, $this->names, true)) {
+                $name = NameResolver::resolve($node->var);
+
+                if (is_array($name)) {
+                    $name = array_pop($name);
+                }
+
+                if (Arr::matches($name ?? '', $this->names, true)) {
                     $resultNode = AssignmentNode::create($node);
 
                     $this->results->add($resultNode, $resultNode->location());

src/Visitors/FunctionCallVisitor.php

@@ -5,6 +5,7 @@
 use Permafrost\PhpCodeSearch\Results\FileSearchResults;
 use Permafrost\PhpCodeSearch\Results\Nodes\FunctionCallNode;
 use Permafrost\PhpCodeSearch\Support\Arr;
+use Permafrost\PhpCodeSearch\Support\NameResolver;
 use PhpParser\Node;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\NodeVisitorAbstract;
@@ -25,7 +26,7 @@ public function __construct(FileSearchResults $results, array $names)
     public function enterNode(Node $node)
     {
         if ($node instanceof FuncCall) {
-            if (Arr::matches($node->name, $this->names, true)) {
+            if (Arr::matches(NameResolver::resolve($node), $this->names, true)) {
                 $resultNode = FunctionCallNode::create($node);
 
                 $this->results->add($resultNode, $resultNode->location());

src/Visitors/NewClassVisitor.php

@@ -4,6 +4,8 @@
 
 use Permafrost\PhpCodeSearch\Results\FileSearchResults;
 use Permafrost\PhpCodeSearch\Results\Nodes\VariableNode;
+use Permafrost\PhpCodeSearch\Support\Arr;
+use Permafrost\PhpCodeSearch\Support\NameResolver;
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
 
@@ -23,9 +25,11 @@ public function __construct(FileSearchResults $results, array $names)
     public function enterNode(Node $node)
     {
         if ($node instanceof Node\Expr\New_) {
-            $resultNode = VariableNode::create($node);
+            if (Arr::matches(NameResolver::resolve($node->class), $this->names, true)) {
+                $resultNode = VariableNode::create($node);
 
-            $this->results->add($resultNode, $resultNode->location());
+                $this->results->add($resultNode, $resultNode->location());
+            }
         }
     }
 }