Allow [] after generic type or array shape - closes #36

Author: iluuu1994

src/Parser/TypeParser.php

@@ -33,14 +33,8 @@ private function parseAtomic(TokenIterator $tokens): Ast\Type\TypeNode
 		if ($tokens->tryConsumeTokenType(Lexer::TOKEN_OPEN_PARENTHESES)) {
 			$type = $this->parse($tokens);
 			$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_PARENTHESES);
-
-			if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
-				$type = $this->tryParseArray($tokens, $type);
-			}
-
 		} elseif ($tokens->tryConsumeTokenType(Lexer::TOKEN_THIS_VARIABLE)) {
-			return new Ast\Type\ThisTypeNode();
-
+			$type = new Ast\Type\ThisTypeNode();
 		} else {
 			$type = new Ast\Type\IdentifierTypeNode($tokens->currentTokenValue());
 			$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
@@ -51,14 +45,15 @@ private function parseAtomic(TokenIterator $tokens): Ast\Type\TypeNode
 			} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_PARENTHESES)) {
 				$type = $this->tryParseCallable($tokens, $type);
 
-			} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
-				$type = $this->tryParseArray($tokens, $type);
-
 			} elseif ($type->name === 'array' && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET) && !$tokens->isPrecededByHorizontalWhitespace()) {
 				$type = $this->parseArrayShape($tokens, $type);
 			}
 		}
 
+		if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
+			$type = $this->tryParseArray($tokens, $type);
+		}
+
 		return $type;
 	}
 

tests/PHPStan/Parser/TypeParserTest.php

@@ -711,6 +711,60 @@ public function provideParseData(): array
 					new IdentifierTypeNode("\xA009")
 				),
 			],
+			[
+				'Collection<array-key, int>[]',
+				new ArrayTypeNode(
+					new GenericTypeNode(
+						new IdentifierTypeNode('Collection'),
+						[
+							new IdentifierTypeNode('array-key'),
+							new IdentifierTypeNode('int'),
+						]
+					)
+				),
+			],
+			[
+				'int | Collection<array-key, int>[]',
+				new UnionTypeNode([
+					new IdentifierTypeNode('int'),
+					new ArrayTypeNode(
+						new GenericTypeNode(
+							new IdentifierTypeNode('Collection'),
+							[
+								new IdentifierTypeNode('array-key'),
+								new IdentifierTypeNode('int'),
+							]
+						)
+					),
+				]),
+			],
+			[
+				'array{foo: int}[]',
+				new ArrayTypeNode(
+					new ArrayShapeNode([
+						new ArrayShapeItemNode(
+							new IdentifierTypeNode('foo'),
+							false,
+							new IdentifierTypeNode('int')
+						),
+					])
+				),
+			],
+			[
+				'int | array{foo: int}[]',
+				new UnionTypeNode([
+					new IdentifierTypeNode('int'),
+					new ArrayTypeNode(
+						new ArrayShapeNode([
+							new ArrayShapeItemNode(
+								new IdentifierTypeNode('foo'),
+								false,
+								new IdentifierTypeNode('int')
+							),
+						])
+					),
+				]),
+			],
 		];
 	}