Fix a couple of false-positive redundant conditions

vimeo · Sep 19, 2020 · 0ae436d · 0ae436d
1 parent 941643c
commit 0ae436d
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php b/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php
@@ -2151,6 +2151,14 @@ public static function processFunctionCall(
                                 $literal_assertions[] = '=' . $array_literal_type->getId();
                             }
 
+                            if ($atomic_type->type_params[1]->isFalsable()) {
+                                $literal_assertions[] = 'false';
+                            }
+
+                            if ($atomic_type->type_params[1]->isNullable()) {
+                                $literal_assertions[] = 'null';
+                            }
+
                             if ($negate) {
                                 $if_types = \Psalm\Type\Algebra::negateTypes([
                                     $first_var_name => [$literal_assertions]

diff --git a/src/Psalm/Internal/Type/TypeCombination.php b/src/Psalm/Internal/Type/TypeCombination.php
@@ -945,6 +945,8 @@ private static function scrapeTypeProperties(
                 }
             }
 
+            $has_defined_keys = false;
+
             foreach ($type->properties as $candidate_property_name => $candidate_property_type) {
                 $value_type = isset($combination->objectlike_entries[$candidate_property_name])
                     ? $combination->objectlike_entries[$candidate_property_name]
@@ -973,6 +975,14 @@ private static function scrapeTypeProperties(
                 if (!$type->previous_value_type) {
                     unset($possibly_undefined_entries[$candidate_property_name]);
                 }
+
+                if (!$candidate_property_type->possibly_undefined) {
+                    $has_defined_keys = true;
+                }
+            }
+
+            if (!$has_defined_keys) {
+                $combination->array_always_filled = false;
             }
 
             if ($combination->array_counts !== null) {

diff --git a/tests/TypeCombinationTest.php b/tests/TypeCombinationTest.php
@@ -629,6 +629,13 @@ public function providerTestValidTypeCombination(): array
                     'positive-int',
                 ],
             ],
+            'combinNonEmptyArrayAndKeyedArray' => [
+                'array<int, int>',
+                [
+                    'non-empty-array<int, int>',
+                    'array{0?:int}',
+                ]
+            ],
         ];
     }
 

diff --git a/tests/TypeReconciliation/ValueTest.php b/tests/TypeReconciliation/ValueTest.php
@@ -766,6 +766,16 @@ function f(): int {
                         return $ret;
                     }'
             ],
+            'inArrayPreserveNull' => [
+                '<?php
+                    function x(?string $foo): void {
+                        if (!in_array($foo, ["foo", "bar", null], true)) {
+                            throw new Exception();
+                        }
+
+                        if ($foo) {}
+                    }',
+            ],
         ];
     }