Merge pull request #224 from mspirkov/fix-array-shapes

Fix handling of array shapes without keys

Author: jaapio

.gitignore

@@ -1,6 +1,7 @@
 # IDE Shizzle; it is recommended to use a global .gitignore for this but since this is an OSS project we want to make
 # it easy to contribute
 .idea
+.vscode
 /nbproject/private/
 .buildpath
 .project

src/PseudoTypes/ShapeItem.php

@@ -42,7 +42,7 @@ public function isOptional(): bool
 
     public function __toString(): string
     {
-        if ($this->key !== null) {
+        if ($this->key !== null && $this->key !== '') {
             return sprintf(
                 '%s%s: %s',
                 $this->key,

src/TypeResolver.php

@@ -255,7 +255,7 @@ public function createType(?TypeNode $type, Context $context): Type
                             ...array_map(
                                 function (ArrayShapeItemNode $item) use ($context): ArrayShapeItem {
                                     return new ArrayShapeItem(
-                                        (string) $item->keyName,
+                                        $item->keyName !== null ? (string) $item->keyName : null,
                                         $this->createType($item->valueType, $context),
                                         $item->optional
                                     );

tests/unit/PseudoTypes/ArrayShapeTest.php

@@ -23,4 +23,43 @@ public function testExposeItems(): void
 
         $this->assertSame([$item1, $item2], $arrayShape->getItems());
     }
+
+    /**
+     * @dataProvider provideToStringData
+     * @covers ::__toString
+     */
+    public function testToString(string $expectedResult, ArrayShape $arrayShape): void
+    {
+        $this->assertSame($expectedResult, (string) $arrayShape);
+    }
+
+    /**
+     * @return array<string, array{string, ArrayShape}>
+     */
+    public static function provideToStringData(): array
+    {
+        return [
+            'with keys' => [
+                'array{foo: true, bar?: false}',
+                new ArrayShape(
+                    new ArrayShapeItem('foo', new True_(), false),
+                    new ArrayShapeItem('bar', new False_(), true)
+                ),
+            ],
+            'with empty keys' => [
+                'array{true, false}',
+                new ArrayShape(
+                    new ArrayShapeItem('', new True_(), false),
+                    new ArrayShapeItem('', new False_(), false)
+                ),
+            ],
+            'without keys' => [
+                'array{true, false}',
+                new ArrayShape(
+                    new ArrayShapeItem(null, new True_(), false),
+                    new ArrayShapeItem(null, new False_(), false)
+                ),
+            ],
+        ];
+    }
 }

tests/unit/TypeResolverTest.php

@@ -1150,6 +1150,13 @@ public function shapeStructures(): array
                     new ArrayShapeItem('bar', new Integer(), false)
                 ),
             ],
+            [
+                'array{string, int}',
+                new ArrayShape(
+                    new ArrayShapeItem(null, new String_(), false),
+                    new ArrayShapeItem(null, new Integer(), false)
+                ),
+            ],
             [
                 'array{foo?: string, bar: int}',
                 new ArrayShape(