Merge pull request #10450 from nicelocal/fix_class_string_key

Fix shaped array class string key combination
vimeo · Dec 7, 2023 · f4e9837 · f4e9837
2 parents 0c6d9d3 + 0d3485b
commit f4e9837
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 3 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/ArrayAssignmentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/ArrayAssignmentAnalyzer.php
@@ -351,7 +351,9 @@ private static function updateTypeWithKeyValues(
         if (!$has_matching_objectlike_property && !$has_matching_string) {
             $properties = [];
             $classStrings = [];
-            $current_type = $current_type->setPossiblyUndefined(count($key_values) > 1);
+            $current_type = $current_type->setPossiblyUndefined(
+                $current_type->possibly_undefined || count($key_values) > 1,
+            );
             foreach ($key_values as $key_value) {
                 $properties[$key_value->value] = $current_type;
                 if ($key_value instanceof TLiteralClassString) {

diff --git a/src/Psalm/Internal/Type/TypeCombination.php b/src/Psalm/Internal/Type/TypeCombination.php
@@ -55,6 +55,9 @@ final class TypeCombination
     /** @var array<string|int, Union> */
     public array $objectlike_entries = [];
 
+    /** @var array<string, bool> */
+    public array $objectlike_class_string_keys = [];
+
     public bool $objectlike_sealed = true;
 
     public ?Union $objectlike_key_type = null;

diff --git a/src/Psalm/Internal/Type/TypeCombiner.php b/src/Psalm/Internal/Type/TypeCombiner.php
@@ -667,6 +667,7 @@ private static function scrapeTypeProperties(
 
             $has_defined_keys = false;
 
+            $class_strings = $type->class_strings ?? [];
             foreach ($type->properties as $candidate_property_name => $candidate_property_type) {
                 $value_type = $combination->objectlike_entries[$candidate_property_name] ?? null;
 
@@ -706,6 +707,19 @@ private static function scrapeTypeProperties(
                 }
 
                 unset($missing_entries[$candidate_property_name]);
+
+                if (is_int($candidate_property_name)) {
+                    continue;
+                }
+
+                if (isset($combination->objectlike_class_string_keys[$candidate_property_name])) {
+                    $combination->objectlike_class_string_keys[$candidate_property_name] =
+                        $combination->objectlike_class_string_keys[$candidate_property_name]
+                        && ($class_strings[$candidate_property_name] ?? false);
+                } else {
+                    $combination->objectlike_class_string_keys[$candidate_property_name] =
+                        ($class_strings[$candidate_property_name] ?? false);
+                }
             }
 
             if ($type->fallback_params) {
@@ -1421,7 +1435,7 @@ private static function handleKeyedArrayEntries(
                 } else {
                     $objectlike = new TKeyedArray(
                         $combination->objectlike_entries,
-                        null,
+                        array_filter($combination->objectlike_class_string_keys),
                         $sealed || $fallback_key_type === null || $fallback_value_type === null
                             ? null
                             : [$fallback_key_type, $fallback_value_type],

diff --git a/src/Psalm/Type/Reconciler.php b/src/Psalm/Type/Reconciler.php
@@ -1148,7 +1148,9 @@ private static function adjustTKeyedArrayType(
 
         $base_key = implode($key_parts);
 
-        $result_type = $result_type->setPossiblyUndefined(count($array_key_offsets) > 1);
+        $result_type = $result_type->setPossiblyUndefined(
+            $result_type->possibly_undefined || count($array_key_offsets) > 1,
+        );
 
         foreach ($array_key_offsets as $array_key_offset) {
             if (isset($existing_types[$base_key]) && $array_key_offset !== false) {

diff --git a/tests/ArrayAssignmentTest.php b/tests/ArrayAssignmentTest.php
@@ -55,6 +55,24 @@ public function providerValidCodeParse(): iterable
                     '$resultOpt===' => 'array{a?: true, b?: true}',
                 ],
             ],
+            'assignUnionOfLiteralsClassKeys' => [
+                'code' => '<?php
+                    class a {}
+                    class b {}
+
+                    $result = [];
+
+                    foreach ([a::class, b::class] as $k) {
+                        $result[$k] = true;
+                    }
+
+                    foreach ($result as $k => $v) {
+                        $vv = new $k;
+                    }',
+                'assertions' => [
+                    '$result===' => 'array{a::class: true, b::class: true}',
+                ],
+            ],
             'genericArrayCreationWithSingleIntValue' => [
                 'code' => '<?php
                     $out = [];