better resolution of class name

Author: joetannenbaum

app/Parsers/ScopedPropertyAccessExpressionParser.php

@@ -4,8 +4,11 @@
 
 use App\Contexts\AbstractContext;
 use App\Contexts\Argument;
+use App\Contexts\AssignmentValue;
 use App\Contexts\MethodCall;
+use Error;
 use Microsoft\PhpParser\Node\Expression\ScopedPropertyAccessExpression;
+use Microsoft\PhpParser\Node\Expression\Variable;
 
 class ScopedPropertyAccessExpressionParser extends AbstractParser
 {
@@ -17,14 +20,36 @@ class ScopedPropertyAccessExpressionParser extends AbstractParser
     public function parse(ScopedPropertyAccessExpression $node)
     {
         $this->context->methodName = $node->memberName->getFullText($node->getRoot()->getFullText());
-        $this->context->className = (string) ($node->scopeResolutionQualifier?->getResolvedName() ?? $node->scopeResolutionQualifier?->getText());
+        $this->context->className = $this->resolveClassName($node);
 
         return $this->context;
     }
 
+    protected function resolveClassName(ScopedPropertyAccessExpression $node)
+    {
+        if (method_exists($node->scopeResolutionQualifier, 'getResolvedName')) {
+            return (string) $node->scopeResolutionQualifier->getResolvedName();
+        }
+
+        if ($node->scopeResolutionQualifier instanceof Variable) {
+            $result = $this->context->searchForVar($node->scopeResolutionQualifier->getName());
+
+            if ($result instanceof AssignmentValue) {
+                return $result->getValue()['name'] ?? null;
+            }
+
+            return $result;
+        }
+
+        return $node->scopeResolutionQualifier->getText();
+    }
+
     public function initNewContext(): ?AbstractContext
     {
-        if ($this->context instanceof Argument) {
+        if (
+            $this->context instanceof Argument
+            || $this->context instanceof AssignmentValue
+        ) {
             return new MethodCall;
         }