Fix impossible isset checks

vimeo · Jan 15, 2020 · 4a03c4a · 4a03c4a
1 parent c3edbdb
commit 4a03c4a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php
@@ -515,6 +515,7 @@ private static function analyzeAtomicCall(
 
                 case Type\Atomic\TTemplateParam::class:
                 case Type\Atomic\TEmptyMixed::class:
+                case Type\Atomic\TEmpty::class:
                 case Type\Atomic\TMixed::class:
                 case Type\Atomic\TNonEmptyMixed::class:
                 case Type\Atomic\TObject::class:

diff --git a/src/Psalm/Internal/Type/NegatedAssertionReconciler.php b/src/Psalm/Internal/Type/NegatedAssertionReconciler.php
@@ -131,7 +131,9 @@ public static function reconcile(
                                 }
                             }
 
-                            return Type::getEmpty();
+                            return $existing_var_type->from_docblock
+                                ? Type::getNull()
+                                : Type::getEmpty();
                         }
                     }
                 }

diff --git a/tests/TypeReconciliation/IssetTest.php b/tests/TypeReconciliation/IssetTest.php
@@ -768,6 +768,32 @@ public function foo() : ?string {
 
                     function foo(C $c) : void {
                         new DateTime($c->foo() ?? "");
+                    }',
+            ],
+            'methodCallAfterIsset' => [
+                '<?php
+                    class B {
+                        public function bar() : void {}
+                    }
+
+                    /** @psalm-suppress MissingConstructor */
+                    class A {
+                        /** @var B */
+                        public $foo;
+
+                        public function init() : void {
+                            if (isset($this->foo)) {
+                                return;
+                            }
+
+                            if (rand(0, 1)) {
+                                $this->foo = new B;
+                            } else {
+                                $this->foo = new B;
+                            }
+
+                            $this->foo->bar();
+                        }
                     }'
             ],
         ];