Support test annotation and attribute

Author: staabm

src/Rules/PHPUnit/DataProviderDataRule.php

@@ -81,7 +81,7 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$testsWithProvider = [];
-		$testMethods = $this->testMethodsHelper->getTestMethods($classReflection);
+		$testMethods = $this->testMethodsHelper->getTestMethods($classReflection, $scope);
 		foreach ($testMethods as $testMethod) {
 			foreach ($this->dataProviderHelper->getDataProviderMethods($scope, $testMethod, $classReflection) as [, $providerMethodName]) {
 				if ($providerMethodName === $method->getName()) {

src/Rules/PHPUnit/TestMethodsHelper.php

@@ -2,7 +2,9 @@
 
 namespace PHPStan\Rules\PHPUnit;
 
+use PHPStan\Analyser\Scope;
 use PHPStan\Parser\Parser;
+use PHPStan\PhpDoc\ResolvedPhpDocBlock;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\FileTypeMapper;
@@ -33,18 +35,43 @@ public function __construct(
 	/**
 	 * @return array<ReflectionMethod>
 	 */
-	public function getTestMethods(ClassReflection $class): array
+	public function getTestMethods(ClassReflection $classReflection, Scope $scope): array
 	{
 		$testMethods = [];
-		foreach ($class->getNativeReflection()->getMethods() as $reflectionMethod) {
+		foreach ($classReflection->getNativeReflection()->getMethods() as $reflectionMethod) {
+			if (!$reflectionMethod->isPublic()) {
+				continue;
+			}
+
 			if (str_starts_with(strtolower($reflectionMethod->getName()), 'test')) {
 				$testMethods[] = $reflectionMethod;
 				continue;
 			}
 
+			$docComment = $reflectionMethod->getDocComment();
+			if ($docComment !== false) {
+				$methodPhpDoc = $this->fileTypeMapper->getResolvedPhpDoc(
+					$scope->getFile(),
+					$classReflection->getName(),
+					$scope->isInTrait() ? $scope->getTraitReflection()->getName() : null,
+					$reflectionMethod->getName(),
+					$docComment,
+				);
+
+				if ($this->hasTestAnnotation($methodPhpDoc)) {
+					$testMethods[] = $reflectionMethod;
+					continue;
+				}
+			}
+
 			// todo: detect tests with @test annotation
 
-			$testAttributes = $reflectionMethod->getAttributes('PHPUnit\Framework\Attribute\Test');
+			// XXX
+			//if (!$this->phpunit10OrNewer) {
+			//	return;
+			//}
+
+			$testAttributes = $reflectionMethod->getAttributes('PHPUnit\Framework\Attributes\Test');
 			if ($testAttributes === []) {
 				continue;
 			}
@@ -55,4 +82,22 @@ public function getTestMethods(ClassReflection $class): array
 		return $testMethods;
 	}
 
+	private function hasTestAnnotation(?ResolvedPhpDocBlock $phpDoc): bool
+	{
+		if ($phpDoc === null) {
+			return false;
+		}
+
+		$phpDocNodes = $phpDoc->getPhpDocNodes();
+
+		foreach ($phpDocNodes as $docNode) {
+			$tags = $docNode->getTagsByName('@test');
+			if ($tags !== []) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 }

tests/Rules/PHPUnit/DataProviderDataRuleTest.php

@@ -42,35 +42,35 @@ public function testRule(): void
 		$this->analyse([__DIR__ . '/data/data-provider-data.php'], [
 			[
 				'Parameter #2 $input of method DataProviderDataTest\FooTest::testWithAttribute() expects string, int given.',
-				23,
+				24,
 			],
 			[
 				'Parameter #2 $input of method DataProviderDataTest\FooTest::testWithAttribute() expects string, false given.',
-				27,
+				28,
 			],
 			[
 				'Parameter #2 $input of method DataProviderDataTest\BarTest::testWithAnnotation() expects string, int given.',
-				50,
+				51,
 			],
 			[
 				'Parameter #2 $input of method DataProviderDataTest\BarTest::testWithAnnotation() expects string, false given.',
-				54,
+				55,
 			],
 			[
-				'Parameter #2 $input of method DataProviderDataTest\YieldTest::testYield() expects string, int given.',
-				79,
+				'Parameter #2 $input of method DataProviderDataTest\YieldTest::myTestMethod() expects string, int given.',
+				81,
 			],
 			[
-				'Parameter #2 $input of method DataProviderDataTest\YieldTest::testYield() expects string, false given.',
-				85,
+				'Parameter #2 $input of method DataProviderDataTest\YieldTest::myTestMethod() expects string, false given.',
+				87,
 			],
 			[
-				'Parameter #2 $input of method DataProviderDataTest\YieldFromTest::testYieldFrom() expects string, int given.',
-				107,
+				'Parameter #2 $input of method DataProviderDataTest\YieldFromTest::myTestMethod() expects string, int given.',
+				112,
 			],
 			[
-				'Parameter #2 $input of method DataProviderDataTest\YieldFromTest::testYieldFrom() expects string, false given.',
-				111,
+				'Parameter #2 $input of method DataProviderDataTest\YieldFromTest::myTestMethod() expects string, false given.',
+				116,
 			],
 		]);
 	}

tests/Rules/PHPUnit/data/data-provider-data.php

@@ -3,6 +3,7 @@
 namespace DataProviderDataTest;
 
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
 class FooTest extends TestCase
@@ -62,8 +63,9 @@ public function aProvider(): array
 class YieldTest extends TestCase
 {
 
-	/** @dataProvider yieldProvider */
-	public function testYield(string $expectedResult, string $input): void
+	#[DataProvider('yieldProvider')]
+	#[Test]
+	public function myTestMethod(string $expectedResult, string $input): void
 	{
 	}
 
@@ -92,8 +94,11 @@ public function yieldProvider(): iterable
 class YieldFromTest extends TestCase
 {
 
-	/** @dataProvider yieldProvider */
-	public function testYieldFrom(string $expectedResult, string $input): void
+	/**
+	 * @dataProvider yieldProvider
+	 * @test
+	 */
+	public function myTestMethod(string $expectedResult, string $input): void
 	{
 	}