Fix #2645 - add workarounds for some edgecases

vimeo · Jan 17, 2020 · b582c49 · b582c49
1 parent 2c48d42
commit b582c49
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php b/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php
@@ -2037,6 +2037,11 @@ protected static function getInstanceOfTypes(
                     $source->getAliases()
                 );
 
+                if ($source instanceof StatementsAnalyzer) {
+                    $codebase = $source->getCodebase();
+                    $instanceof_class = $codebase->classlikes->getUnAliasedName($instanceof_class);
+                }
+
                 return [$instanceof_class];
             } elseif ($this_class_name
                 && (in_array(strtolower($stmt->class->parts[0]), ['self', 'static'], true))

diff --git a/src/Psalm/Internal/Visitor/ReflectorVisitor.php b/src/Psalm/Internal/Visitor/ReflectorVisitor.php
@@ -349,6 +349,10 @@ public function enterNode(PhpParser\Node $node)
                 $this->registerClassMapFunctionCall($function_id, $node);
             }
         } elseif ($node instanceof PhpParser\Node\Stmt\TraitUse) {
+            if ($this->skip_if_descendants) {
+                return;
+            }
+
             if (!$this->classlike_storages) {
                 throw new \LogicException('$this->classlike_storages should not be empty');
             }