Merge pull request #7483 from ElisDN/array-replace

Fix `array_replace` type
vimeo · Jan 25, 2022 · ea59845 · ea59845
2 parents f1c4b62 + 9f01c16
commit ea59845
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayMergeReturnTypeProvider.php b/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayMergeReturnTypeProvider.php
@@ -44,6 +44,8 @@ public static function getFunctionReturnType(FunctionReturnTypeProviderEvent $ev
             return Type::getMixed();
         }
 
+        $is_replace = mb_strcut($event->getFunctionId(), 6, 7) === 'replace';
+
         $inner_value_types = [];
         $inner_key_types = [];
 
@@ -104,7 +106,11 @@ public static function getFunctionReturnType(FunctionReturnTypeProviderEvent $ev
 
                             foreach ($unpacked_type_part->properties as $key => $type) {
                                 if (!is_string($key)) {
-                                    $generic_properties[] = $type;
+                                    if ($is_replace) {
+                                        $generic_properties[$key] = $type;
+                                    } else {
+                                        $generic_properties[] = $type;
+                                    }
                                     continue;
                                 }
 

diff --git a/tests/ArrayFunctionCallTest.php b/tests/ArrayFunctionCallTest.php
@@ -210,9 +210,9 @@ function getInts(): array{ return []; }
             ],
             'arrayMergeIntArrays' => [
                 '<?php
-                    $d = array_merge(["a", "b", "c"], [1, 2, 3]);',
+                    $d = array_merge(["a", "b", "c", "d"], [1, 2, 3]);',
                 'assertions' => [
-                    '$d' => 'array{0: string, 1: string, 2: string, 3: int, 4: int, 5: int}',
+                    '$d' => 'array{0: string, 1: string, 2: string, 3: string, 4: int, 5: int, 6: int}',
                 ],
             ],
             'arrayMergePossiblyUndefined' => [
@@ -266,9 +266,9 @@ public function merge($a, $b): array
             ],
             'arrayReplaceIntArrays' => [
                 '<?php
-                    $d = array_replace(["a", "b", "c"], [1, 2, 3]);',
+                    $d = array_replace(["a", "b", "c", "d"], [1, 2, 3]);',
                 'assertions' => [
-                    '$d' => 'array{0: string, 1: string, 2: string, 3: int, 4: int, 5: int}',
+                    '$d' => 'array{0: int, 1: int, 2: int, 3: string}',
                 ],
             ],
             'arrayReplacePossiblyUndefined' => [