TestMethodsHelper - speed-up by asking for immediate methods only

Author: ondrejmirtes

src/Rules/PHPUnit/AttributeRequiresPhpVersionRule.php

@@ -10,7 +10,6 @@
 use PHPUnit\Framework\TestCase;
 use function count;
 use function is_numeric;
-use function method_exists;
 use function sprintf;
 
 /**
@@ -56,13 +55,8 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		/** @phpstan-ignore function.alreadyNarrowedType */
-		if (!method_exists($reflectionMethod, 'getAttributes')) {
-			return [];
-		}
-
 		$errors = [];
-		foreach ($reflectionMethod->getAttributes('PHPUnit\Framework\Attributes\RequiresPhp') as $attr) {
+		foreach ($reflectionMethod->getAttributesByName('PHPUnit\Framework\Attributes\RequiresPhp') as $attr) {
 			$args = $attr->getArguments();
 			if (count($args) !== 1) {
 				continue;

src/Rules/PHPUnit/DataProviderHelper.php

@@ -11,6 +11,7 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\NodeFinder;
 use PHPStan\Analyser\Scope;
+use PHPStan\BetterReflection\Reflection\ReflectionMethod;
 use PHPStan\Parser\Parser;
 use PHPStan\PhpDoc\ResolvedPhpDocBlock;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
@@ -20,11 +21,9 @@
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\FileTypeMapper;
-use ReflectionMethod;
 use function array_merge;
 use function count;
 use function explode;
-use function method_exists;
 use function preg_match;
 use function sprintf;
 
@@ -282,21 +281,13 @@ private function yieldDataProviderAttributes($node, ClassReflection $classReflec
 		if (
 			$node instanceof ReflectionMethod
 		) {
-			/** @phpstan-ignore function.alreadyNarrowedType */
-			if (!method_exists($node, 'getAttributes')) {
-				return;
-			}
-
-			foreach ($node->getAttributes('PHPUnit\Framework\Attributes\DataProvider') as $attr) {
+			foreach ($node->getAttributesByName('PHPUnit\Framework\Attributes\DataProvider') as $attr) {
 				$args = $attr->getArguments();
 				if (count($args) !== 1) {
 					continue;
 				}
 
 				$startLine = $node->getStartLine();
-				if ($startLine === false) {
-					$startLine = -1;
-				}
 
 				yield [$classReflection, $args[0], $startLine];
 			}
@@ -329,7 +320,7 @@ private function yieldDataProviderAttributes($node, ClassReflection $classReflec
 	private function yieldDataProviderAnnotations($node, Scope $scope, ClassReflection $classReflection): iterable
 	{
 		$docComment = $node->getDocComment();
-		if ($docComment === null || $docComment === false) {
+		if ($docComment === null) {
 			return;
 		}
 
@@ -348,10 +339,6 @@ private function yieldDataProviderAnnotations($node, Scope $scope, ClassReflecti
 			}
 
 			$startLine = $node->getStartLine();
-			if ($startLine === false) {
-				$startLine = -1;
-			}
-
 			$dataProviderMethod = $this->parseDataProviderAnnotationValue($scope, $dataProviderValue);
 			$dataProviderMethod[] = $startLine;
 

src/Rules/PHPUnit/TestMethodsHelper.php

@@ -3,12 +3,12 @@
 namespace PHPStan\Rules\PHPUnit;
 
 use PHPStan\Analyser\Scope;
+use PHPStan\BetterReflection\Reflection\ReflectionMethod;
 use PHPStan\PhpDoc\ResolvedPhpDocBlock;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\FileTypeMapper;
 use PHPUnit\Framework\TestCase;
-use ReflectionMethod;
 use function str_starts_with;
 use function strtolower;
 
@@ -49,7 +49,7 @@ public function getTestMethods(ClassReflection $classReflection, Scope $scope):
 		}
 
 		$testMethods = [];
-		foreach ($classReflection->getNativeReflection()->getMethods() as $reflectionMethod) {
+		foreach ($classReflection->getNativeReflection()->getBetterReflection()->getImmediateMethods() as $reflectionMethod) {
 			if (!$reflectionMethod->isPublic()) {
 				continue;
 			}
@@ -60,7 +60,7 @@ public function getTestMethods(ClassReflection $classReflection, Scope $scope):
 			}
 
 			$docComment = $reflectionMethod->getDocComment();
-			if ($docComment !== false) {
+			if ($docComment !== null) {
 				$methodPhpDoc = $this->fileTypeMapper->getResolvedPhpDoc(
 					$scope->getFile(),
 					$classReflection->getName(),
@@ -79,7 +79,7 @@ public function getTestMethods(ClassReflection $classReflection, Scope $scope):
 				continue;
 			}
 
-			$testAttributes = $reflectionMethod->getAttributes('PHPUnit\Framework\Attributes\Test'); // @phpstan-ignore argument.type
+			$testAttributes = $reflectionMethod->getAttributesByName('PHPUnit\Framework\Attributes\Test'); // @phpstan-ignore argument.type
 			if ($testAttributes === []) {
 				continue;
 			}