fix loops

vimeo · Dec 15, 2021 · fcafa20 · fcafa20
1 parent 66db521
commit fcafa20
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/Psalm/Internal/Type/SimpleAssertionReconciler.php b/src/Psalm/Internal/Type/SimpleAssertionReconciler.php
@@ -512,9 +512,16 @@ private static function reconcileIsset(
             }
         }
 
-        if ($existing_var_type->hasType('empty')) {
-            $existing_var_type->removeType('empty');
-            $existing_var_type->addType(new TMixed($inside_loop));
+        if ($inside_loop) {
+            if ($existing_var_type->hasType('empty')) {
+                $existing_var_type->removeType('empty');
+                $existing_var_type->addType(new TMixed(true));
+            }
+
+            if ($existing_var_type->hasType('never')) {
+                $existing_var_type->removeType('never');
+                $existing_var_type->addType(new TMixed(true));
+            }
         }
 
         $existing_var_type->from_property = false;