Fix #4011 - prevent mixed assignment in loop

vimeo · Aug 18, 2020 · 134955a · 134955a
1 parent 17ed440
commit 134955a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/Psalm/Internal/Type/SimpleAssertionReconciler.php b/src/Psalm/Internal/Type/SimpleAssertionReconciler.php
@@ -531,7 +531,7 @@ private static function reconcilePositiveNumeric(
 
         $failed_reconciliation = 2;
 
-        return Type::getMixed();
+        return Type::getEmpty();
     }
 
     /**

diff --git a/tests/Loop/WhileTest.php b/tests/Loop/WhileTest.php
@@ -451,7 +451,19 @@ function foo(string $key): array {
 
                         return $elements;
                     }',
-            ]
+            ],
+            'reconcilePositiveInt' => [
+                '<?php
+                    $counter = 0;
+
+                    while (rand(0, 1)) {
+                        if ($counter > 0) {
+                            $counter = $counter - 1;
+                        } else {
+                            $counter = $counter + 1;
+                        }
+                    }'
+            ],
         ];
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -531,7 +531,7 @@ private static function reconcilePositiveNumeric( @@
             $failed_reconciliation = 2;
-            return Type::getMixed();
+            return Type::getEmpty();
         }
         /**
@@ Expand Down @@