Only perform assertions where the property type is known

cc @m0003r
vimeo · Apr 12, 2020 · c733d6d · c733d6d
1 parent 110df3e
commit c733d6d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/AtomicMethodCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/AtomicMethodCallAnalyzer.php
@@ -492,12 +492,14 @@ public static function analyze(
 
         $class_storage_for_method = $codebase->methods->getClassLikeStorageForMethod($method_id);
         $plain_getter_property = null;
+
         if ((isset($class_storage_for_method->methods[$method_name_lc]))
             && !$class_storage_for_method->methods[$method_name_lc]->overridden_somewhere
             && !$class_storage_for_method->methods[$method_name_lc]->overridden_downstream
             && ($plain_getter_property = $class_storage_for_method->methods[$method_name_lc]->plain_getter)
-            && isset($context->vars_in_scope[$getter_var_id = $lhs_var_id . '->' . $plain_getter_property])) {
-            $return_type_candidate = $context->vars_in_scope[$getter_var_id];
+            && isset($context->vars_in_scope[$getter_var_id = $lhs_var_id . '->' . $plain_getter_property])
+        ) {
+            $return_type_candidate = clone $context->vars_in_scope[$getter_var_id];
         } else {
             $return_type_candidate = MethodCallReturnTypeFetcher::fetch(
                 $statements_analyzer,

diff --git a/src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php b/src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php
@@ -1864,11 +1864,22 @@ private function registerFunctionLike(PhpParser\Node\FunctionLike $stmt, $fake_m
                 $storage->mutation_free_inferred = true;
 
                 if ($stmt->stmts[0]->expr->name instanceof PhpParser\Node\Identifier) {
-                    $storage->plain_getter = $stmt->stmts[0]->expr->name->name;
-                    $storage->if_true_assertions[] = new \Psalm\Storage\Assertion(
-                        '$this->' . $storage->plain_getter,
-                        [['!falsy']]
-                    );
+                    $property_name = $stmt->stmts[0]->expr->name->name;
+
+                    if (isset($class_storage->properties[$property_name])
+                        && $class_storage->properties[$property_name]->type
+                        && ($class_storage->properties[$property_name]->type->isNullable()
+                            || $class_storage->properties[$property_name]->type->isFalsable()
+                            || $class_storage->properties[$property_name]->type->hasArray()
+                        )
+                    ) {
+                        $storage->plain_getter = $property_name;
+
+                        $storage->if_true_assertions[] = new \Psalm\Storage\Assertion(
+                            '$this->' . $property_name,
+                            [['!falsy']]
+                        );
+                    }
                 }
             } elseif (strpos($stmt->name->name, 'assert') === 0) {
                 $var_assertions = [];