Allow empty array shape

phpstan · Jun 11, 2021 · ea0b174 · ea0b174
1 parent edb31b3
commit ea0b174
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/Parser/TypeParser.php b/src/Parser/TypeParser.php
@@ -345,6 +345,10 @@ private function tryParseArray(TokenIterator $tokens, Ast\Type\TypeNode $type):
 	private function parseArrayShape(TokenIterator $tokens, Ast\Type\TypeNode $type): Ast\Type\ArrayShapeNode
 	{
 		$tokens->consumeTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET);
+		if ($tokens->tryConsumeTokenType(Lexer::TOKEN_CLOSE_CURLY_BRACKET)) {
+			return new Ast\Type\ArrayShapeNode([]);
+		}
+
 		$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
 		$items = [$this->parseArrayShapeItem($tokens)];
 

diff --git a/tests/PHPStan/Parser/TypeParserTest.php b/tests/PHPStan/Parser/TypeParserTest.php
@@ -975,6 +975,18 @@ public function provideParseData(): array
 					]
 				),
 			],
+			[
+				'array{}',
+				new ArrayShapeNode([]),
+			],
+			[
+				'array{}|int',
+				new UnionTypeNode([new ArrayShapeNode([]), new IdentifierTypeNode('int')]),
+			],
+			[
+				'int|array{}',
+				new UnionTypeNode([new IdentifierTypeNode('int'), new ArrayShapeNode([])]),
+			],
 		];
 	}