Fix vimeo#8745

orklah · Nov 24, 2022 · ea4b099 · ea4b099
1 parent 8f39de9
commit ea4b099
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 8 deletions.
diff --git a/src/Psalm/Internal/Type/SimpleAssertionReconciler.php b/src/Psalm/Internal/Type/SimpleAssertionReconciler.php
@@ -1705,9 +1705,12 @@ private static function reconcileIsGreaterThan(
 
         $did_remove_type = false;
 
-        if ($existing_var_type->hasType('null') && $assertion->doesFilterNull()) {
+        if ($assertion->doesFilterNullOrFalse() &&
+            ($existing_var_type->hasType('null') || $existing_var_type->hasType('false'))
+        ) {
             $did_remove_type = true;
             $existing_var_type->removeType('null');
+            $existing_var_type->removeType('false');
         }
 
         foreach ($existing_var_type->getAtomicTypes() as $atomic_type) {
@@ -1815,9 +1818,12 @@ private static function reconcileIsLessThan(
 
         $did_remove_type = false;
 
-        if ($existing_var_type->hasType('null') && $assertion->doesFilterNull()) {
+        if ($assertion->doesFilterNullOrFalse() &&
+            ($existing_var_type->hasType('null') || $existing_var_type->hasType('false'))
+        ) {
             $did_remove_type = true;
             $existing_var_type->removeType('null');
+            $existing_var_type->removeType('false');
         }
 
         foreach ($existing_var_type->getAtomicTypes() as $atomic_type) {

diff --git a/src/Psalm/Internal/Type/SimpleNegatedAssertionReconciler.php b/src/Psalm/Internal/Type/SimpleNegatedAssertionReconciler.php
@@ -1719,9 +1719,12 @@ private static function reconcileIsLessThanOrEqualTo(
 
         $did_remove_type = false;
 
-        if ($existing_var_type->hasType('null') && $assertion->doesFilterNull()) {
+        if ($assertion->doesFilterNullOrFalse() &&
+            ($existing_var_type->hasType('null') || $existing_var_type->hasType('false'))
+        ) {
             $did_remove_type = true;
             $existing_var_type->removeType('null');
+            $existing_var_type->removeType('false');
         }
 
         foreach ($existing_var_type->getAtomicTypes() as $atomic_type) {
@@ -1827,9 +1830,12 @@ private static function reconcileIsGreaterThanOrEqualTo(
 
         $did_remove_type = false;
 
-        if ($existing_var_type->hasType('null') && $assertion->doesFilterNull()) {
+        if ($assertion->doesFilterNullOrFalse() &&
+            ($existing_var_type->hasType('null') || $existing_var_type->hasType('false'))
+        ) {
             $did_remove_type = true;
             $existing_var_type->removeType('null');
+            $existing_var_type->removeType('false');
         }
 
         foreach ($existing_var_type->getAtomicTypes() as $atomic_type) {

diff --git a/src/Psalm/Storage/Assertion/IsGreaterThan.php b/src/Psalm/Storage/Assertion/IsGreaterThan.php
@@ -31,7 +31,7 @@ public function isNegationOf(Assertion $assertion): bool
         return $assertion instanceof IsLessThanOrEqualTo && $this->value === $assertion->value;
     }
 
-    public function doesFilterNull(): bool
+    public function doesFilterNullOrFalse(): bool
     {
         return true;
     }

diff --git a/src/Psalm/Storage/Assertion/IsGreaterThanOrEqualTo.php b/src/Psalm/Storage/Assertion/IsGreaterThanOrEqualTo.php
@@ -36,7 +36,7 @@ public function isNegationOf(Assertion $assertion): bool
         return $assertion instanceof IsLessThan && $this->value === $assertion->value;
     }
 
-    public function doesFilterNull(): bool
+    public function doesFilterNullOrFalse(): bool
     {
         return $this->value !== 0;
     }

diff --git a/src/Psalm/Storage/Assertion/IsLessThan.php b/src/Psalm/Storage/Assertion/IsLessThan.php
@@ -31,7 +31,7 @@ public function isNegationOf(Assertion $assertion): bool
         return $assertion instanceof IsGreaterThanOrEqualTo && $this->value === $assertion->value;
     }
 
-    public function doesFilterNull(): bool
+    public function doesFilterNullOrFalse(): bool
     {
         return $this->value === 0;
     }

diff --git a/src/Psalm/Storage/Assertion/IsLessThanOrEqualTo.php b/src/Psalm/Storage/Assertion/IsLessThanOrEqualTo.php
@@ -36,7 +36,7 @@ public function isNegationOf(Assertion $assertion): bool
         return $assertion instanceof IsGreaterThan && $this->value === $assertion->value;
     }
 
-    public function doesFilterNull(): bool
+    public function doesFilterNullOrFalse(): bool
     {
         return false;
     }

diff --git a/tests/TypeReconciliation/ConditionalTest.php b/tests/TypeReconciliation/ConditionalTest.php
@@ -2756,6 +2756,49 @@ function getIntOrNull(): ?int{return null;}
                     }
                     ',
             ],
+            'falseErasureWithSmallerAndGreater' => [
+                'code' => '<?php
+                    /** @return int|false */
+                    function getIntOrFalse(): int|bool {return false;}
+                    $a = getIntOrFalse();
+
+                    if ($a < 0) {
+                        echo $a + 3;
+                    }
+
+                    if ($a <= 0) {
+                        /** @psalm-suppress PossiblyFalseOperand */
+                        echo $a + 3;
+                    }
+
+                    if ($a > 0) {
+                        echo $a + 3;
+                    }
+
+                    if ($a >= 0) {
+                        /** @psalm-suppress PossiblyFalseOperand */
+                        echo $a + 3;
+                    }
+
+                    if (0 < $a) {
+                        echo $a + 3;
+                    }
+
+                    if (0 <= $a) {
+                        /** @psalm-suppress PossiblyFalseOperand */
+                        echo $a + 3;
+                    }
+
+                    if (0 > $a) {
+                        echo $a + 3;
+                    }
+
+                    if (0 >= $a) {
+                        /** @psalm-suppress PossiblyFalseOperand */
+                        echo $a + 3;
+                    }
+                    ',
+            ],
             'SimpleXMLElementNotAlwaysTruthy' => [
                 'code' => '<?php
                     $lilstring = "";