Unset should change array with keyed offsets

vimeo · Jan 13, 2021 · ef4afd7 · ef4afd7
1 parent d10a068
commit ef4afd7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/UnsetAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/UnsetAnalyzer.php
@@ -81,8 +81,10 @@ public static function analyze(
                                 $atomic_root_type->sealed = false;
 
                                 $root_type->addType(
-                                    $atomic_root_type->getGenericArrayType()
+                                    $atomic_root_type->getGenericArrayType(false)
                                 );
+
+                                $atomic_root_type->is_list = false;
                             }
                         } elseif ($atomic_root_type instanceof Type\Atomic\TNonEmptyArray) {
                             $root_type->addType(

diff --git a/src/Psalm/Type/Atomic/TKeyedArray.php b/src/Psalm/Type/Atomic/TKeyedArray.php
@@ -246,7 +246,7 @@ public function getGenericValueType(): Union
         return $value_type;
     }
 
-    public function getGenericArrayType(): TArray
+    public function getGenericArrayType(bool $allow_non_empty = true): TArray
     {
         $key_types = [];
         $value_type = null;
@@ -285,7 +285,7 @@ public function getGenericArrayType(): TArray
 
         $value_type->possibly_undefined = false;
 
-        if ($this->previous_value_type || $has_defined_keys) {
+        if ($allow_non_empty && ($this->previous_value_type || $has_defined_keys)) {
             $array_type = new TNonEmptyArray([$key_type, $value_type]);
         } else {
             $array_type = new TArray([$key_type, $value_type]);

diff --git a/tests/TypeReconciliation/RedundantConditionTest.php b/tests/TypeReconciliation/RedundantConditionTest.php
@@ -797,6 +797,14 @@ function x(string $x): int {
                         return (int) (hexdec($x) + 1);
                     }',
             ],
+            'unsetArrayWithKnownOffset' => [
+                '<?php
+                    function bar(string $f) : void {
+                        $filter = rand(0, 1) ? explode(",", $f) : [$f];
+                        unset($filter[rand(0, 1)]);
+                        if ($filter) {}
+                    }'
+            ],
         ];
     }