Improve static keyword conflict resolution in @method

Author: JanTvrdik

src/Parser/PhpDocParser.php

@@ -924,20 +924,24 @@ private function parsePropertyTagValue(TokenIterator $tokens): Ast\PhpDoc\Proper
 
 	private function parseMethodTagValue(TokenIterator $tokens): Ast\PhpDoc\MethodTagValueNode
 	{
-		$isStatic = $tokens->tryConsumeTokenValue('static');
-		$startLine = $tokens->currentTokenLine();
-		$startIndex = $tokens->currentTokenIndex();
-		$returnTypeOrMethodName = $this->typeParser->parse($tokens);
+		$staticKeywordOrReturnTypeOrMethodName = $this->typeParser->parse($tokens);
+
+		if ($staticKeywordOrReturnTypeOrMethodName instanceof Ast\Type\IdentifierTypeNode && $staticKeywordOrReturnTypeOrMethodName->name === 'static') {
+			$isStatic = true;
+			$returnTypeOrMethodName = $this->typeParser->parse($tokens);
+
+		} else {
+			$isStatic = false;
+			$returnTypeOrMethodName = $staticKeywordOrReturnTypeOrMethodName;
+		}
 
 		if ($tokens->isCurrentTokenType(Lexer::TOKEN_IDENTIFIER)) {
 			$returnType = $returnTypeOrMethodName;
 			$methodName = $tokens->currentTokenValue();
 			$tokens->next();
 
 		} elseif ($returnTypeOrMethodName instanceof Ast\Type\IdentifierTypeNode) {
-			$returnType = $isStatic
-				? $this->typeParser->enrichWithAttributes($tokens, new Ast\Type\IdentifierTypeNode('static'), $startLine, $startIndex)
-				: null;
+			$returnType = $isStatic ? $staticKeywordOrReturnTypeOrMethodName : null;
 			$methodName = $returnTypeOrMethodName->name;
 			$isStatic = false;
 

tests/PHPStan/Parser/PhpDocParserTest.php

@@ -2626,6 +2626,26 @@ public function provideMethodTagsData(): Iterator
 				),
 			]),
 		];
+
+		yield [
+			'OK non-static with return type that starts with static type',
+			'/** @method static|null foo() */',
+			new PhpDocNode([
+				new PhpDocTagNode(
+					'@method',
+					new MethodTagValueNode(
+						false,
+						new UnionTypeNode([
+							new IdentifierTypeNode('static'),
+							new IdentifierTypeNode('null'),
+						]),
+						'foo',
+						[],
+						''
+					)
+				),
+			]),
+		];
 	}