Test

vimeo · Jan 18, 2024 · acddb7c · acddb7c
1 parent d8bdecd
commit acddb7c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php b/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php
@@ -3754,9 +3754,7 @@ private static function getArrayKeyExistsAssertions(
                     || $atomic_type instanceof TKeyedArray
                 ) {
                     if ($atomic_type instanceof TKeyedArray) {
-                        $key_type = $atomic_type->getGenericKeyType(
-                            !$atomic_type->allShapeKeysAlwaysDefined(),
-                        );
+                        $key_type = $atomic_type->getGenericKeyType();
                     } else {
                         $key_type = $atomic_type->type_params[0];
                     }

diff --git a/src/Psalm/Internal/Type/TypeParser.php b/src/Psalm/Internal/Type/TypeParser.php
@@ -727,7 +727,7 @@ private static function getTypeFromGenericTree(
 
             if ($changed) {
                 $generic_params[0] = $generic_params[0]->setTypes(
-                    $final ?: [Type::getArrayKey($from_docblock)],
+                    $final ?: [new TArrayKey($from_docblock)],
                 );
             }
             if ($literals) {

diff --git a/tests/TypeCombinationTest.php b/tests/TypeCombinationTest.php
@@ -539,7 +539,7 @@ public function providerTestValidTypeCombination(): array
                 ],
             ],
             'objectLikePlusArrayEqualsArray' => [
-                "array<'a'|'b'|'c', 1|2|3>",
+                "array{a?: 1|2|3, b?: 1|2|3, c?: 1|2|3}",
                 [
                     'array<"a"|"b"|"c", 1|2|3>',
                     'array{a: 1|2, b: 2|3, c: 1|3}',

diff --git a/tests/TypeParseTest.php b/tests/TypeParseTest.php
@@ -146,7 +146,7 @@ public function testArrayWithLiteralKeys(): void
 
         // TODO: needs a non-empty flag for unsealed arrays
         $this->assertSame('non-empty-array<0|1, string>', Type::parseString('non-empty-array<0|1, string>')->getId(true));
-        $this->assertSame("non-empty-array<'a'|'b', string>", (string) Type::parseString('non-empty-array<"a"|"b", string>')->getId(true));
+        $this->assertSame("non-empty-array<'a'|'b', string>", Type::parseString('non-empty-array<"a"|"b", string>')->getId(true));
     }
 
     public function testGeneric(): void