Restrict narrowing fix

vimeo · Aug 3, 2020 · 20a9b10 · 20a9b10
1 parent b168777
commit 20a9b10
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 14 deletions.
diff --git a/src/Psalm/Internal/Analyzer/FileAnalyzer.php b/src/Psalm/Internal/Analyzer/FileAnalyzer.php
@@ -288,22 +288,32 @@ public function populateCheckers(array $stmts)
      */
     private function populateClassLikeAnalyzers(PhpParser\Node\Stmt\ClassLike $stmt)
     {
-        if (!$stmt->name) {
-            return;
-        }
+        if ($stmt instanceof PhpParser\Node\Stmt\Class_) {
+            if (!$stmt->name) {
+                return;
+            }
+
+            // this can happen when stubbing
+            if (!$this->codebase->classExists($stmt->name->name)) {
+                return;
+            }
 
-        // this can happen when stubbing
-        if (!$this->codebase->classOrInterfaceExists($stmt->name->name)) {
-            return;
-        }
 
-        if ($stmt instanceof PhpParser\Node\Stmt\Class_) {
             $class_analyzer = new ClassAnalyzer($stmt, $this, $stmt->name->name);
 
             $fq_class_name = $class_analyzer->getFQCLN();
 
             $this->class_analyzers_to_analyze[strtolower($fq_class_name)] = $class_analyzer;
         } elseif ($stmt instanceof PhpParser\Node\Stmt\Interface_) {
+            if (!$stmt->name) {
+                return;
+            }
+
+            // this can happen when stubbing
+            if (!$this->codebase->interfaceExists($stmt->name->name)) {
+                return;
+            }
+
             $class_analyzer = new InterfaceAnalyzer($stmt, $this, $stmt->name->name);
 
             $fq_class_name = $class_analyzer->getFQCLN();

diff --git a/src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php b/src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php
@@ -1947,14 +1947,14 @@ private function registerFunctionLike(PhpParser\Node\FunctionLike $stmt, $fake_m
 
         $storage->required_param_count = $required_param_count;
 
-        if (($stmt instanceof PhpParser\Node\Stmt\Function_
-                || $stmt instanceof PhpParser\Node\Stmt\ClassMethod)
-            && $stmt->stmts
+        if ($stmt instanceof PhpParser\Node\Stmt\Function_
+            || $stmt instanceof PhpParser\Node\Stmt\ClassMethod
         ) {
             if ($stmt instanceof PhpParser\Node\Stmt\ClassMethod
                 && $storage instanceof MethodStorage
                 && $class_storage
                 && !$class_storage->mutation_free
+                && $stmt->stmts
                 && count($stmt->stmts) === 1
                 && !count($stmt->params)
                 && $stmt->stmts[0] instanceof PhpParser\Node\Stmt\Return_
@@ -1974,7 +1974,9 @@ private function registerFunctionLike(PhpParser\Node\FunctionLike $stmt, $fake_m
 
                     $class_storage->properties[$property_name]->getter_method = strtolower($stmt->name->name);
                 }
-            } elseif (strpos($stmt->name->name, 'assert') === 0) {
+            } elseif (strpos($stmt->name->name, 'assert') === 0
+                && $stmt->stmts
+            ) {
                 $var_assertions = [];
 
                 foreach ($stmt->stmts as $function_stmt) {

diff --git a/src/Psalm/Type/Reconciler.php b/src/Psalm/Type/Reconciler.php
@@ -345,13 +345,15 @@ public static function reconcileKeyedTypes(
                         $changed_var_ids,
                         $result_type
                     );
-                } else {
+                } elseif ($key !== '$this') {
                     foreach ($existing_types as $new_key => $_) {
                         if ($new_key === $key) {
                             continue;
                         }
 
-                        if (preg_match('/' . preg_quote($key, '/') . '[\]\[\-]/', $new_key)) {
+                        if (!isset($new_types[$new_key])
+                            && preg_match('/' . preg_quote($key, '/') . '[\]\[\-]/', $new_key)
+                        ) {
                             unset($existing_types[$new_key]);
                         }
                     }