Merge pull request #11 from laravel/better-method-call-detection

Better method call detection

Author: joetannenbaum

app/Contexts/AbstractContext.php

@@ -129,6 +129,15 @@ public function addPropertyToNearestClassDefinition(string $name, $types = [])
         }
     }
 
+    public function nearestClassDefinition()
+    {
+        if ($this instanceof ClassDefinition) {
+            return $this;
+        }
+
+        return $this->parent?->nearestClassDefinition() ?? null;
+    }
+
     public function searchForProperty(string $name)
     {
         if ($this instanceof ClassDefinition) {

app/Parsers/MemberAccessExpressionParser.php

@@ -5,6 +5,7 @@
 use App\Contexts\AbstractContext;
 use App\Contexts\AssignmentValue;
 use App\Contexts\MethodCall;
+use Microsoft\PhpParser\Node\Expression\CallExpression;
 use Microsoft\PhpParser\Node\Expression\MemberAccessExpression;
 use Microsoft\PhpParser\Node\Expression\Variable;
 use Microsoft\PhpParser\Node\QualifiedName;
@@ -29,6 +30,17 @@ public function parse(MemberAccessExpression $node)
 
             if ($child instanceof Variable) {
                 if ($child->getName() === 'this') {
+                    if ($child->getParent()->getParent() instanceof CallExpression) {
+                        // They are calling a method on the current class
+                        $result = $this->context->nearestClassDefinition();
+
+                        if ($result) {
+                            $this->context->className = $result->className;
+                        }
+
+                        continue;
+                    }
+
                     $propName = $child->getParent()->memberName->getFullText($node->getRoot()->getFullText());
 
                     $result = $this->context->searchForProperty($propName);