Refactor DataProviderHelper

Author: staabm

src/Rules/PHPUnit/DataProviderHelper.php

@@ -19,6 +19,7 @@
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\FileTypeMapper;
+use ReflectionMethod;
 use function array_merge;
 use function count;
 use function explode;
@@ -58,56 +59,23 @@ public function __construct(
 	}
 
 	/**
+	 * @param ReflectionMethod|ClassMethod $node
+	 *
 	 * @return iterable<array{ClassReflection|null, string, int}>
 	 */
 	public function getDataProviderMethods(
 		Scope $scope,
-		ClassMethod $node,
+		$node,
 		ClassReflection $classReflection
 	): iterable
 	{
-		$docComment = $node->getDocComment();
-		if ($docComment !== null) {
-			$methodPhpDoc = $this->fileTypeMapper->getResolvedPhpDoc(
-				$scope->getFile(),
-				$classReflection->getName(),
-				$scope->isInTrait() ? $scope->getTraitReflection()->getName() : null,
-				$node->name->toString(),
-				$docComment->getText(),
-			);
-			foreach ($this->getDataProviderAnnotations($methodPhpDoc) as $annotation) {
-				$dataProviderValue = $this->getDataProviderAnnotationValue($annotation);
-				if ($dataProviderValue === null) {
-					// Missing value is already handled in NoMissingSpaceInMethodAnnotationRule
-					continue;
-				}
-
-				$dataProviderMethod = $this->parseDataProviderAnnotationValue($scope, $dataProviderValue);
-				$dataProviderMethod[] = $node->getStartLine();
-
-				yield $dataProviderValue => $dataProviderMethod;
-			}
-		}
+		yield from $this->yieldDataProviderAnnotations($node, $scope, $classReflection);
 
 		if (!$this->phpunit10OrNewer) {
 			return;
 		}
 
-		foreach ($node->attrGroups as $attrGroup) {
-			foreach ($attrGroup->attrs as $attr) {
-				$dataProviderMethod = null;
-				if ($attr->name->toLowerString() === 'phpunit\\framework\\attributes\\dataprovider') {
-					$dataProviderMethod = $this->parseDataProviderAttribute($attr, $classReflection);
-				} elseif ($attr->name->toLowerString() === 'phpunit\\framework\\attributes\\dataproviderexternal') {
-					$dataProviderMethod = $this->parseDataProviderExternalAttribute($attr);
-				}
-				if ($dataProviderMethod === null) {
-					continue;
-				}
-
-				yield from $dataProviderMethod;
-			}
-		}
+		yield from $this->yieldDataProviderAttributes($node, $classReflection);
 	}
 
 	/**
@@ -306,4 +274,59 @@ private function parseDataProviderAttribute(Attribute $attribute, ClassReflectio
 		];
 	}
 
+	/**
+	 * @param ReflectionMethod|ClassMethod $node
+	 *
+	 * @return iterable<array{ClassReflection|null, string, int}>
+	 */
+	private function yieldDataProviderAttributes($node, ClassReflection $classReflection): iterable
+	{
+		foreach ($node->attrGroups as $attrGroup) {
+			foreach ($attrGroup->attrs as $attr) {
+				$dataProviderMethod = null;
+				if ($attr->name->toLowerString() === 'phpunit\\framework\\attributes\\dataprovider') {
+					$dataProviderMethod = $this->parseDataProviderAttribute($attr, $classReflection);
+				} elseif ($attr->name->toLowerString() === 'phpunit\\framework\\attributes\\dataproviderexternal') {
+					$dataProviderMethod = $this->parseDataProviderExternalAttribute($attr);
+				}
+				if ($dataProviderMethod === null) {
+					continue;
+				}
+
+				yield from $dataProviderMethod;
+			}
+		}
+	}
+
+	/**
+	 * @param ReflectionMethod|ClassMethod $node
+	 *
+	 * @return iterable<array{ClassReflection|null, string, int}>
+	 */
+	private function yieldDataProviderAnnotations($node, Scope $scope, ClassReflection $classReflection): iterable
+	{
+		$docComment = $node->getDocComment();
+		if ($docComment !== null) {
+			$methodPhpDoc = $this->fileTypeMapper->getResolvedPhpDoc(
+				$scope->getFile(),
+				$classReflection->getName(),
+				$scope->isInTrait() ? $scope->getTraitReflection()->getName() : null,
+				$node->name->toString(),
+				$docComment->getText(),
+			);
+			foreach ($this->getDataProviderAnnotations($methodPhpDoc) as $annotation) {
+				$dataProviderValue = $this->getDataProviderAnnotationValue($annotation);
+				if ($dataProviderValue === null) {
+					// Missing value is already handled in NoMissingSpaceInMethodAnnotationRule
+					continue;
+				}
+
+				$dataProviderMethod = $this->parseDataProviderAnnotationValue($scope, $dataProviderValue);
+				$dataProviderMethod[] = $node->getStartLine();
+
+				yield $dataProviderValue => $dataProviderMethod;
+			}
+		}
+	}
+
 }