loose comparisons of int with string shouldn't change change the int …

…to empty-mixed
vimeo · Nov 18, 2023 · 6e5af03 · 6e5af03
1 parent 69d3ec7
commit 6e5af03
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/Psalm/Internal/Type/SimpleAssertionReconciler.php b/src/Psalm/Internal/Type/SimpleAssertionReconciler.php
@@ -1038,6 +1038,10 @@ private static function reconcileString(
                     $string_types[] = $type;
                 }
 
+                $redundant = false;
+            } elseif ($type instanceof TInt && $assertion instanceof IsLooselyEqual) {
+                // don't change the type of an int for non-strict comparisons
+                $string_types[] = $type;
                 $redundant = false;
             } else {
                 $redundant = false;

diff --git a/tests/TypeReconciliation/ConditionalTest.php b/tests/TypeReconciliation/ConditionalTest.php
@@ -80,7 +80,7 @@ function foo($length) {
                         }
                     }',
                 'assertions' => [],
-                'ignored_issues' => ['DocblockTypeContradiction'],
+                'ignored_issues' => ['DocblockTypeContradiction', 'TypeDoesNotContainType'],
             ],
             'notInstanceof' => [
                 'code' => '<?php
@@ -1350,7 +1350,6 @@ function takes_string(string $string) : void {}
                     function takes_int(int $int) : void {}
 
                     if ($int == $string) {
-                        /** @psalm-suppress MixedArgument */
                         takes_int($int);
                     }',
             ],

diff --git a/tests/UnusedVariableTest.php b/tests/UnusedVariableTest.php
@@ -2143,15 +2143,19 @@ function foo(array $clips) : void {
                      */
                     function validate($b, string $source) : void {
                         /**
-                         * @psalm-suppress DocblockTypeContradiction
-                         * @psalm-suppress MixedAssignment
+                         * @psalm-suppress RedundantConditionGivenDocblockType
+                         * @var bool|string $b
                          */
                         if (!is_bool($b)) {
                             $source = $b;
+                            $b = false;
                         }
 
                         print_r($source);
                     }',
+                'assertions' => [
+                    '$b===' => 'bool',
+                ],
             ],
             'implicitSpread' => [
                 'code' => '<?php