fix parsing non-static @method annotation returning static type

Author: JanTvrdik

src/Parser/PhpDocParser.php

@@ -181,8 +181,9 @@ private function parseMethodTagValue(TokenIterator $tokens): Ast\PhpDoc\MethodTa
 			$tokens->next();
 
 		} elseif ($returnTypeOrMethodName instanceof Ast\Type\IdentifierTypeNode) {
-			$returnType = null;
+			$returnType = $isStatic ? new Ast\Type\IdentifierTypeNode('static') : null;
 			$methodName = $returnTypeOrMethodName->name;
+			$isStatic = false;
 
 		} else {
 			$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER); // will throw exception

tests/PHPStan/Parser/PhpDocParserTest.php

@@ -43,6 +43,7 @@ protected function setUp()
 	 * @dataProvider provideReturnTagsData
 	 * @dataProvider provideThrowsTagsData
 	 * @dataProvider providePropertyTagsData
+	 * @dataProvider provideMethodTagsData
 	 * @dataProvider provideSingleLinePhpDocData
 	 * @dataProvider provideMultiLinePhpDocData
 	 * @param string     $label
@@ -951,6 +952,27 @@ public function provideThrowsTagsData(): iterable
 	}
 
 
+	public function provideMethodTagsData(): iterable
+	{
+		yield [
+			'OK',
+			'/** @method static foo() */',
+			new PhpDocNode([
+				new PhpDocTagNode(
+					'@method',
+					new MethodTagValueNode(
+						false,
+						new IdentifierTypeNode('static'),
+						'foo',
+						[],
+						''
+					)
+				),
+			]),
+		];
+	}
+
+
 	public function provideSingleLinePhpDocData(): iterable
 	{
 		yield [
@@ -1352,8 +1374,8 @@ public function provideMultiLinePhpDocData(): array
 					new PhpDocTagNode(
 						'@method',
 						new MethodTagValueNode(
-							true,
-							null,
+							false,
+							new IdentifierTypeNode('static'),
 							'methodWithNoReturnTypeStatically',
 							[],
 							''
@@ -1498,8 +1520,8 @@ public function provideMultiLinePhpDocData(): array
 					new PhpDocTagNode(
 						'@method',
 						new MethodTagValueNode(
-							true,
-							null,
+							false,
+							new IdentifierTypeNode('static'),
 							'methodWithNoReturnTypeStaticallyWithDescription',
 							[],
 							'Do something with a description statically, but what, who knows!'
@@ -1604,8 +1626,8 @@ public function provideMultiLinePhpDocData(): array
 					new PhpDocTagNode(
 						'@method',
 						new MethodTagValueNode(
-							true,
-							null,
+							false,
+							new IdentifierTypeNode('static'),
 							'methodWithNoReturnTypeStaticallyNoParams',
 							[],
 							''