Merge pull request #6419 from TysonAndre/in_array-fix

vimeo · Sep 4, 2021 · b710aab · b710aab
2 parents 3a3fde3 + 58e7ae1
commit b710aab
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 5 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php b/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php
@@ -3442,7 +3442,7 @@ private static function getInarrayAssertions(
                     $assertions = [];
 
                     if (!$is_sealed) {
-                        if ($value_type->getId() !== '') {
+                        if ($value_type->getId() !== '' && !$value_type->isMixed()) {
                             $assertions[] = 'in-array-' . $value_type->getId();
                         }
                     } else {
@@ -3453,10 +3453,7 @@ private static function getInarrayAssertions(
                                 || $atomic_value_type instanceof Type\Atomic\TEnumCase
                             ) {
                                 $assertions[] = '=' . $atomic_value_type->getAssertionString();
-                            } elseif ($atomic_value_type instanceof Type\Atomic\TFalse
-                                || $atomic_value_type instanceof Type\Atomic\TTrue
-                                || $atomic_value_type instanceof Type\Atomic\TNull
-                            ) {
+                            } else {
                                 $assertions[] = $atomic_value_type->getAssertionString();
                             }
                         }

diff --git a/tests/TypeReconciliation/InArrayTest.php b/tests/TypeReconciliation/InArrayTest.php
@@ -169,6 +169,32 @@ function assertInArray(string|bool $x, $y) {
                 [],
                 '8.0'
             ],
+            'in_arrayNullOrString' => [
+                '<?php
+                    function test(?string $x, string $y): void {
+                        if (in_array($x, [null, $y], true)) {
+                            if ($x === null) {
+                                echo "Saw null\n";
+                            }
+                            echo "Saw $x\n";
+                        }
+                    }',
+                [],
+                [],
+                '8.0'
+            ],
+            'in_array-mixed-twice' => [
+                '<?php
+                    function contains(array $list1, array $list2, mixed $element): void
+                    {
+                        if (in_array($element, $list1, true)) {
+                        } elseif (in_array($element, $list2, true)) {
+                        }
+                    }',
+                [],
+                [],
+                '8.0'
+            ],
         ];
     }
 

diff --git a/tests/TypeReconciliation/ValueTest.php b/tests/TypeReconciliation/ValueTest.php
@@ -961,6 +961,39 @@ public function providerInvalidCodeParse(): iterable
                     }',
                 'error_message' => 'RedundantCondition',
             ],
+            'inArrayRemoveNull' => [
+                '<?php
+                    function x(?string $foo, string $bar): void {
+                        if (!in_array($foo, [$bar], true)) {
+                            throw new Exception();
+                        }
+
+                        if (is_string($foo)) {}
+                    }',
+                'error_message' => 'RedundantCondition',
+            ],
+            'inArrayDetectType' => [
+                '<?php
+                    function x($foo, string $bar): void {
+                        if (!in_array($foo, [$bar], true)) {
+                            throw new Exception();
+                        }
+
+                        if (is_string($foo)) {}
+                    }',
+                // foo is always string
+                'error_message' => 'RedundantCondition',
+            ],
+            'inArrayRemoveInvalid' => [
+                '<?php
+                    function x(?string $foo, int $bar): void {
+                        if (!in_array($foo, [$bar], true)) {
+                            throw new Exception();
+                        }
+                    }',
+                // Type null|string is never int
+                'error_message' => 'RedundantCondition',
+            ],
             'neverNotIdenticalFloatType' => [
                 '<?php
                     $a = 4.1;