Merge pull request #8 from laravel/scope-resolution-qualifier-get-resolved-name-missing

`ScopedPropertyAccessExpressionParser` improvements

Author: joetannenbaum

Diff for: app/Contexts/AbstractContext.php

@@ -117,6 +117,18 @@ public function searchForVar(string $name): AssignmentValue|string|null
         return $this->parent?->searchForVar($name) ?? null;
     }
 
+    public function addPropertyToNearestClassDefinition(string $name, $types = [])
+    {
+        if ($this instanceof ClassDefinition) {
+            $this->properties[] = [
+                'name'  => $name,
+                'types' => $types,
+            ];
+        } else {
+            $this->parent?->addPropertyToNearestClassDefinition($name, $types);
+        }
+    }
+
     public function searchForProperty(string $name)
     {
         if ($this instanceof ClassDefinition) {

Diff for: app/Contexts/AssignmentValue.php

@@ -18,13 +18,13 @@ public function getValue()
     {
         $child = $this->children[0] ?? null;
 
-        if ($child) {
-            return [
-                'name' => $child->name ?? $child->className ?? null,
-                'type' => $child->type(),
-            ];
+        if (!$child) {
+            return null;
         }
 
-        return null;
+        return [
+            'name' => $child->name ?? $child->className ?? null,
+            'type' => $child->type(),
+        ];
     }
 }

Diff for: app/Parsers/ParameterParser.php

@@ -19,7 +19,13 @@ public function parse(NodeParameter $node)
     {
         $this->context->name = $node->getName();
 
+        $constructorProperty = $node->visibilityToken !== null;
+
         if (!$node->typeDeclarationList) {
+            if ($constructorProperty) {
+                $this->context->addPropertyToNearestClassDefinition($this->context->name);
+            }
+
             return $this->context->value;
         }
 
@@ -31,6 +37,10 @@ public function parse(NodeParameter $node)
             }
         }
 
+        if ($constructorProperty) {
+            $this->context->addPropertyToNearestClassDefinition($this->context->name, $this->context->types);
+        }
+
         return $this->context->value;
     }
 

Diff for: 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 Microsoft\PhpParser\Node\Expression\MemberAccessExpression;
 use Microsoft\PhpParser\Node\Expression\ScopedPropertyAccessExpression;
+use Microsoft\PhpParser\Node\Expression\Variable;
 
 class ScopedPropertyAccessExpressionParser extends AbstractParser
 {
@@ -17,14 +20,46 @@ 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;
+        }
+
+        if ($node->scopeResolutionQualifier instanceof MemberAccessExpression) {
+            $parser = new MemberAccessExpressionParser;
+            $context = new MethodCall;
+            $context->parent = clone $this->context;
+            $parser->context($context);
+            $result = $parser->parseNode($node->scopeResolutionQualifier);
+
+            return $result->className ?? null;
+        }
+
+        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;
         }