Support all atomic types as nullable types

phpstan · Jun 8, 2022 · 1e355a3 · 1e355a3
1 parent 7c621a2
commit 1e355a3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/doc/grammars/type.abnf b/doc/grammars/type.abnf
@@ -20,7 +20,7 @@ Conditional
     = 1*ByteHorizontalWs TokenIs [TokenNot] Atomic TokenNullable Atomic TokenColon Atomic
 
 Nullable
-	= TokenNullable TokenIdentifier [Generic]
+	= TokenNullable Atomic
 
 Atomic
 	= TokenIdentifier [Generic / Callable / Array]

diff --git a/src/Parser/TypeParser.php b/src/Parser/TypeParser.php
@@ -282,19 +282,7 @@ private function parseNullable(TokenIterator $tokens): Ast\Type\TypeNode
 	{
 		$tokens->consumeTokenType(Lexer::TOKEN_NULLABLE);
 
-		$type = new Ast\Type\IdentifierTypeNode($tokens->currentTokenValue());
-		$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
-
-		if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET)) {
-			$type = $this->parseGeneric($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->tryParseArrayOrOffsetAccess($tokens, $type);
-		}
+		$type = $this->parseAtomic($tokens);
 
 		return new Ast\Type\NullableTypeNode($type);
 	}

diff --git a/tests/PHPStan/Parser/TypeParserTest.php b/tests/PHPStan/Parser/TypeParserTest.php
@@ -1255,6 +1255,17 @@ public function provideParseData(): array
 					false
 				),
 			],
+			[
+				'?Currency::CURRENCY_*',
+				new NullableTypeNode(
+					new ConstTypeNode(
+						new ConstFetchNode(
+							'Currency',
+							'CURRENCY_*'
+						)
+					)
+				),
+			],
 		];
 	}