Fix parsing phpdoc with no trailing whitespace

phpstan · Jun 8, 2022 · 7c621a2 · TomasVotruba · Jun 9, 2022 · TomasVotruba
1 parent 9d45205
commit 7c621a2
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/src/Parser/PhpDocParser.php b/src/Parser/PhpDocParser.php
@@ -90,7 +90,7 @@ private function parseText(TokenIterator $tokens): Ast\PhpDoc\PhpDocTextNode
 			$tokens->pushSavePoint();
 			$tokens->next();
 
-			if ($tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_TAG) || $tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL) || $tokens->isCurrentTokenType(Lexer::TOKEN_CLOSE_PHPDOC) || $tokens->isCurrentTokenType(Lexer::TOKEN_END)) {
+			if ($tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_TAG, Lexer::TOKEN_PHPDOC_EOL, Lexer::TOKEN_CLOSE_PHPDOC, Lexer::TOKEN_END)) {
 				$tokens->rollback();
 				break;
 			}
@@ -491,7 +491,10 @@ private function parseOptionalDescription(TokenIterator $tokens, bool $limitStar
 				$tokens->consumeTokenType(Lexer::TOKEN_OTHER); // will throw exception
 			}
 
-			if (!$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL) && !$tokens->isPrecededByHorizontalWhitespace()) {
+			if (
+				!$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL, Lexer::TOKEN_CLOSE_PHPDOC, Lexer::TOKEN_END)
+				&& !$tokens->isPrecededByHorizontalWhitespace()
+			) {
 				$tokens->consumeTokenType(Lexer::TOKEN_HORIZONTAL_WS); // will throw exception
 			}
 		}

diff --git a/src/Parser/TokenIterator.php b/src/Parser/TokenIterator.php
@@ -63,9 +63,9 @@ public function isCurrentTokenValue(string $tokenValue): bool
 	}
 
 
-	public function isCurrentTokenType(int $tokenType): bool
+	public function isCurrentTokenType(int ...$tokenType): bool
 	{
-		return $this->tokens[$this->index][Lexer::TYPE_OFFSET] === $tokenType;
+		return in_array($this->tokens[$this->index][Lexer::TYPE_OFFSET], $tokenType, true);
 	}
 
 

diff --git a/tests/PHPStan/Parser/PhpDocParserTest.php b/tests/PHPStan/Parser/PhpDocParserTest.php
@@ -692,6 +692,36 @@ public function provideVarTagsData(): Iterator
 			]),
 		];
 
+		yield [
+			'OK with no description and no trailing whitespace',
+			'/** @var Foo $var*/',
+			new PhpDocNode([
+				new PhpDocTagNode(
+					'@var',
+					new VarTagValueNode(
+						new IdentifierTypeNode('Foo'),
+						'$var',
+						''
+					)
+				),
+			]),
+		];
+
+		yield [
+			'OK with no variable name and description and no trailing whitespace',
+			'/** @var Foo*/',
+			new PhpDocNode([
+				new PhpDocTagNode(
+					'@var',
+					new VarTagValueNode(
+						new IdentifierTypeNode('Foo'),
+						'',
+						''
+					)
+				),
+			]),
+		];
+
 		yield [
 			'invalid without type, variable name and description',
 			'/** @var */',