Merge pull request #7312 from orklah/empty-array

Support PHPStan notation for empty-arrays
vimeo · Jan 6, 2022 · f3bc55e · f3bc55e
2 parents b6559dc + 9d3a51d
commit f3bc55e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/src/Psalm/Internal/Type/ParseTreeCreator.php b/src/Psalm/Internal/Type/ParseTreeCreator.php
@@ -751,6 +751,16 @@ private function handleValue(array $type_token): void
                     $new_parent
                 );
                 ++$this->t;
+
+                $nexter_token = $this->t + 1 < $this->type_token_count ? $this->type_tokens[$this->t + 1] : null;
+
+                if ($nexter_token !== null && $nexter_token[0] === '}') {
+                    $new_leaf->terminated = true;
+                    ++$this->t;
+                } elseif ($nexter_token === null) {
+                    throw new TypeParseTreeException('Unclosed bracket in keyed array');
+                }
+
                 break;
 
             case '(':

diff --git a/src/Psalm/Internal/Type/TypeParser.php b/src/Psalm/Internal/Type/TypeParser.php
@@ -1233,7 +1233,7 @@ private static function getTypeFromIndexAccessTree(
     /**
      * @param  array<string, array<string, Union>> $template_type_map
      * @param  array<string, TypeAlias> $type_aliases
-     * @return TCallableKeyedArray|TKeyedArray|TObjectWithProperties
+     * @return TCallableKeyedArray|TKeyedArray|TObjectWithProperties|TArray
      * @throws TypeParseTreeException
      */
     private static function getTypeFromKeyedArrayTree(
@@ -1312,7 +1312,7 @@ private static function getTypeFromKeyedArrayTree(
         }
 
         if (!$properties) {
-            throw new TypeParseTreeException('No properties supplied for TKeyedArray');
+            return new TArray([Type::getNever(), Type::getNever()]);
         }
 
         if ($type === 'object') {

diff --git a/tests/AnnotationTest.php b/tests/AnnotationTest.php
@@ -1490,14 +1490,6 @@ public function bar() {
                     ',
                 'error_message' => 'UndefinedDocblockClass',
             ],
-            'preventBadTKeyedArrayFormat' => [
-                '<?php
-                    /**
-                     * @param array{} $arr
-                     */
-                    function bar(array $arr): void {}',
-                'error_message' => 'InvalidDocblock',
-            ],
             'noPhpStormAnnotationsThankYou' => [
                 '<?php
                     /** @param ArrayIterator|string[] $i */

diff --git a/tests/TypeParseTest.php b/tests/TypeParseTest.php
@@ -893,6 +893,14 @@ public function testSingleLiteralString(): void
         );
     }
 
+    public function testEmptyArrayShape(): void
+    {
+        $this->assertSame(
+            'array<never, never>',
+            (string)Type::parseString('array{}')
+        );
+    }
+
     public function testSingleLiteralInt(): void
     {
         $this->assertSame(