extract PHPUnitVersionDetector

Author: staabm

extension.neon

@@ -50,8 +50,14 @@ services:
 	-
 		class: PHPStan\Rules\PHPUnit\AnnotationHelper
 
+	-
+		class: PHPStan\Rules\PHPUnit\PHPUnitVersionDetector
+
 	-
 		class: PHPStan\Rules\PHPUnit\TestMethodsHelper
+		factory: @PHPStan\Rules\PHPUnit\TestMethodsHelperFactory::create()
+	-
+		class: PHPStan\Rules\PHPUnit\TestMethodsHelperFactory
 		arguments:
 			parser: @defaultAnalysisParser
 

src/Rules/PHPUnit/DataProviderHelperFactory.php

@@ -5,6 +5,12 @@
 use PHPStan\Parser\Parser;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\FileTypeMapper;
+use PHPUnit\Framework\TestCase;
+use function dirname;
+use function explode;
+use function file_get_contents;
+use function is_file;
+use function json_decode;
 
 class DataProviderHelperFactory
 {
@@ -21,7 +27,7 @@ public function __construct(
 		ReflectionProvider $reflectionProvider,
 		FileTypeMapper $fileTypeMapper,
 		Parser $parser,
-		PHPUnitVersionDetector $PHPUnitVersionDetector
+		PHPUnitVersionDetector $PHPUnitVersionDetector,
 	)
 	{
 		$this->reflectionProvider = $reflectionProvider;

src/Rules/PHPUnit/TestMethodsHelper.php

@@ -21,15 +21,19 @@ final class TestMethodsHelper
 
 	private Parser $parser;
 
+	private bool $phpunit10OrNewer;
+
 	public function __construct(
 		ReflectionProvider $reflectionProvider,
 		FileTypeMapper $fileTypeMapper,
-		Parser $parser
+		Parser $parser,
+		bool $phpunit10OrNewer,
 	)
 	{
 		$this->reflectionProvider = $reflectionProvider;
 		$this->fileTypeMapper = $fileTypeMapper;
 		$this->parser = $parser;
+		$this->phpunit10OrNewer = $phpunit10OrNewer;
 	}
 
 	/**
@@ -64,12 +68,9 @@ public function getTestMethods(ClassReflection $classReflection, Scope $scope):
 				}
 			}
 
-			// todo: detect tests with @test annotation
-
-			// XXX
-			//if (!$this->phpunit10OrNewer) {
-			//	return;
-			//}
+			if (!$this->phpunit10OrNewer) {
+				continue;
+			}
 
 			$testAttributes = $reflectionMethod->getAttributes('PHPUnit\Framework\Attributes\Test');
 			if ($testAttributes === []) {

src/Rules/PHPUnit/TestMethodsHelperFactory.php

@@ -0,0 +1,44 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\PHPUnit;
+
+use PHPStan\Parser\Parser;
+use PHPStan\Reflection\ReflectionProvider;
+use PHPStan\Type\FileTypeMapper;
+use PHPUnit\Framework\TestCase;
+use function dirname;
+use function explode;
+use function file_get_contents;
+use function is_file;
+use function json_decode;
+
+class TestMethodsHelperFactory
+{
+
+	private ReflectionProvider $reflectionProvider;
+
+	private FileTypeMapper $fileTypeMapper;
+
+	private Parser $parser;
+
+	private PHPUnitVersionDetector $PHPUnitVersionDetector;
+
+	public function __construct(
+		ReflectionProvider $reflectionProvider,
+		FileTypeMapper $fileTypeMapper,
+		Parser $parser,
+		PHPUnitVersionDetector $PHPUnitVersionDetector,
+	)
+	{
+		$this->reflectionProvider = $reflectionProvider;
+		$this->fileTypeMapper = $fileTypeMapper;
+		$this->parser = $parser;
+		$this->PHPUnitVersionDetector = $PHPUnitVersionDetector;
+	}
+
+	public function create(): TestMethodsHelper
+	{
+		return new TestMethodsHelper($this->reflectionProvider, $this->fileTypeMapper, $this->parser, $this->PHPUnitVersionDetector->isPHPUnit10OrNewer());
+	}
+
+}

tests/Rules/PHPUnit/DataProviderDataRuleTest.php

@@ -11,6 +11,7 @@
 use PHPStan\Rules\PhpDoc\UnresolvableTypeHelper;
 use PHPStan\Rules\PHPUnit\DataProviderDataRule;
 use PHPStan\Rules\PHPUnit\DataProviderHelper;
+use PHPStan\Rules\PHPUnit\PHPUnitVersionDetector;
 use PHPStan\Rules\PHPUnit\TestMethodsHelper;
 use PHPStan\Rules\Properties\PropertyReflectionFinder;
 use PHPStan\Rules\Rule;
@@ -30,8 +31,19 @@ protected function getRule(): Rule
 
 		return new CompositeRule(new DirectRegistry([
 			new DataProviderDataRule(
-				new TestMethodsHelper($reflectionProvider, self::getContainer()->getByType(FileTypeMapper::class), self::getContainer()->getService('defaultAnalysisParser')),
-				new DataProviderHelper($reflectionProvider, self::getContainer()->getByType(FileTypeMapper::class), self::getContainer()->getService('defaultAnalysisParser'), true),
+				new TestMethodsHelper(
+					$reflectionProvider,
+					self::getContainer()->getByType(FileTypeMapper::class),
+					self::getContainer()->getService('defaultAnalysisParser'),
+					true
+				),
+				new DataProviderHelper(
+					$reflectionProvider,
+					self::getContainer()->getByType(FileTypeMapper::class),
+					self::getContainer()->getService('defaultAnalysisParser'),
+					true
+				),
+
 			),
 			self::getContainer()->getByType(CallMethodsRule::class)
 		]));

tests/Rules/PHPUnit/DataProviderDeclarationRuleTest.php

@@ -17,7 +17,12 @@ protected function getRule(): Rule
 		$reflection = $this->createReflectionProvider();
 
 		return new DataProviderDeclarationRule(
-			new DataProviderHelper($reflection, self::getContainer()->getByType(FileTypeMapper::class), self::getContainer()->getService('defaultAnalysisParser'), true),
+			new DataProviderHelper(
+				$reflection,
+				self::getContainer()->getByType(FileTypeMapper::class),
+				self::getContainer()->getService('defaultAnalysisParser'),
+				true
+			),
 			true,
 			true
 		);