Merge pull request #8064 from weirdan/null-is-cast-to-string-in-array…

…-offsets Coerce null to empty string in array keys
vimeo · Jun 7, 2022 · 53c3c9b · 53c3c9b
2 parents d55988a + 4e59398
commit 53c3c9b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ArrayFetchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ArrayFetchAnalyzer.php
@@ -508,7 +508,7 @@ public static function getArrayAccessTypeGivenOffset(
 
             if ($in_assignment) {
                 $offset_type->removeType('null');
-                $offset_type->addType(new TLiteralInt(0));
+                $offset_type->addType(new TLiteralString(''));
             }
         }
 
@@ -528,7 +528,7 @@ public static function getArrayAccessTypeGivenOffset(
                 $offset_type->removeType('null');
 
                 if (!$offset_type->ignore_nullable_issues) {
-                    $offset_type->addType(new TLiteralInt(0));
+                    $offset_type->addType(new TLiteralString(''));
                 }
             }
         }

diff --git a/tests/ArrayAssignmentTest.php b/tests/ArrayAssignmentTest.php
@@ -1074,26 +1074,26 @@ function bar(array $value): void {
                         if (is_int($value["a"])) {}
                     }'
             ],
-            'coercePossiblyNullKeyToZero' => [
+            'coercePossiblyNullKeyToEmptyString' => [
                 '<?php
-                    function int_or_null(): ?int {
-                      return rand(0, 1) !== 0 ? 42 : null;
+                    function string_or_null(): ?string {
+                      return rand(0, 1) !== 0 ? "aaa" : null;
                     }
 
                     /**
-                     * @return array<array-key, null>
+                     * @return array<string, null>
                      */
                     function foo(): array {
                         $array = [];
                         /** @psalm-suppress PossiblyNullArrayOffset */
-                        $array[int_or_null()] = null;
+                        $array[string_or_null()] = null;
                         return $array;
                     }'
             ],
-            'coerceNullKeyToZero' => [
+            'coerceNullKeyToEmptyString' => [
                 '<?php
                     /**
-                     * @return array<int, null>
+                     * @return array<string, null>
                      */
                     function foo(): array {
                         $array = [];