From d231f425b9e818de717b7dc12a33a00cc3909b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Let=C3=A1=C4=8Dek?= <letynsoft@gmail.com>
Date: Sun, 28 Oct 2018 22:19:24 +0100
Subject: [PATCH] Fix: Small fixes

---
 src/DefinitionResolver.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/DefinitionResolver.php b/src/DefinitionResolver.php
index d67d091..e07981a 100644
--- a/src/DefinitionResolver.php
+++ b/src/DefinitionResolver.php
@@ -493,6 +493,7 @@ class DefinitionResolver
         } elseif ($scoped->scopeResolutionQualifier instanceof Node\QualifiedName) {
             $className = $scoped->scopeResolutionQualifier->getResolvedName();
         }
+        $origName = null;
         do {
             if ($scoped->memberName instanceof Node\Expression\Variable) {
                 if ($scoped->parent instanceof Node\Expression\CallExpression) {
@@ -509,13 +510,16 @@ class DefinitionResolver
             if ($scoped->parent instanceof Node\Expression\CallExpression) {
                 $name .= '()';
             }
+            if ($origName === null) {
+                $origName = $name;
+            }
             $definition = $this->index->getDefinition($name);
             if (!!$definition) {
                 break;
             } else {
                 $class = $this->index->getDefinition((string)$className);
                 if ($class === null || empty($class->extends)) {
-                    return null;
+                    return $origName;
                 }
                 $className = $class->extends[0];
             }