Merge branch '0.4.x' into master

Author: ondrejmirtes

src/Parser/TokenIterator.php

@@ -124,7 +124,7 @@ public function tryConsumeTokenType(int $tokenType): bool
 
 	public function getSkippedHorizontalWhiteSpaceIfAny(): string
 	{
-		if ($this->tokens[$this->index - 1][Lexer::TYPE_OFFSET] === Lexer::TOKEN_HORIZONTAL_WS) {
+		if ($this->index > 0 && $this->tokens[$this->index - 1][Lexer::TYPE_OFFSET] === Lexer::TOKEN_HORIZONTAL_WS) {
 			return $this->tokens[$this->index - 1][Lexer::VALUE_OFFSET];
 		}
 

tests/PHPStan/Parser/PhpDocParserTest.php

@@ -3410,6 +3410,19 @@ public function dataParseTagValue(): array
 					''
 				),
 			],
+			[
+				'@var',
+				'$foo string[]',
+				new InvalidTagValueNode(
+					'$foo string[]',
+					new \PHPStan\PhpDocParser\Parser\ParserException(
+						'$foo',
+						Lexer::TOKEN_VARIABLE,
+						0,
+						Lexer::TOKEN_IDENTIFIER
+					)
+				),
+			],
 		];
 	}