Support parsing constants in shapes

Fixes #10669
vimeo · Feb 8, 2024 · 2f0b85f · 2f0b85f
1 parent 4a5dbca
commit 2f0b85f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/Psalm/Internal/Type/ParseTreeCreator.php b/src/Psalm/Internal/Type/ParseTreeCreator.php
@@ -869,15 +869,6 @@ private function handleValue(array $type_token): void
             case '::':
                 $nexter_token = $this->t + 2 < $this->type_token_count ? $this->type_tokens[$this->t + 2] : null;
 
-                if ($this->current_leaf instanceof ParseTree\KeyedArrayTree
-                    && $nexter_token
-                    && strtolower($nexter_token[0]) !== 'class'
-                ) {
-                    throw new TypeParseTreeException(
-                        ':: in array key is only allowed for ::class',
-                    );
-                }
-
                 if (!$nexter_token
                     || (!preg_match('/^([a-zA-Z_][a-zA-Z_0-9]*\*?|\*)$/', $nexter_token[0])
                         && strtolower($nexter_token[0]) !== 'class')

diff --git a/src/Psalm/Internal/Type/TypeParser.php b/src/Psalm/Internal/Type/TypeParser.php
@@ -1468,8 +1468,12 @@ private static function getTypeFromKeyedArrayTree(
                     if ($const_name === 'class') {
                         $property_key = $fq_classlike_name;
                         $class_string = true;
-                    } else {
+                    } elseif ($property_branch->value[0] === '"' || $property_branch->value[0] === "'") {
                         $property_key = $property_branch->value;
+                    } else {
+                        throw new TypeParseTreeException(
+                            ':: in array key is only allowed for ::class',
+                        );
                     }
                 } else {
                     $property_key = $property_branch->value;

diff --git a/tests/TypeParseTest.php b/tests/TypeParseTest.php
@@ -356,6 +356,11 @@ public function testTKeyedArrayWithQuotedKeys(): void
         $this->assertSame('array{\'\\"\': int, \'\\\'\': string}', (string) Type::parseString('array{"\\"": int, "\\\'": string}'));
     }
 
+    public function testTKeyedArrayWithClassConstantValueType(): void
+    {
+        $this->assertSame('list{A::X|A::Y, B::X}', (string) Type::parseString('list{A::X|A::Y, B::X}'));
+    }
+
     public function testTKeyedArrayWithClassConstantKey(): void
     {
         $this->expectException(TypeParseTreeException::class);