Refactor PHPUnit version detection to ease re-use

Author: staabm

extension.neon

@@ -49,6 +49,9 @@ services:
 		class: PHPStan\Rules\PHPUnit\CoversHelper
 	-
 		class: PHPStan\Rules\PHPUnit\AnnotationHelper
+	-
+		class: PHPStan\Rules\PHPUnit\PHPUnitVersionDetector
+
 	-
 		class: PHPStan\Rules\PHPUnit\DataProviderHelper
 		factory: @PHPStan\Rules\PHPUnit\DataProviderHelperFactory::create()

src/Rules/PHPUnit/DataProviderHelperFactory.php

@@ -5,12 +5,6 @@
 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,43 +15,24 @@ class DataProviderHelperFactory
 
 	private Parser $parser;
 
+	private PHPUnitVersionDetector $PHPUnitVersionDetector;
+
 	public function __construct(
 		ReflectionProvider $reflectionProvider,
 		FileTypeMapper $fileTypeMapper,
-		Parser $parser
+		Parser $parser,
+		PHPUnitVersionDetector $PHPUnitVersionDetector
 	)
 	{
 		$this->reflectionProvider = $reflectionProvider;
 		$this->fileTypeMapper = $fileTypeMapper;
 		$this->parser = $parser;
+		$this->PHPUnitVersionDetector = $PHPUnitVersionDetector;
 	}
 
 	public function create(): DataProviderHelper
 	{
-		$phpUnit10OrNewer = false;
-		if ($this->reflectionProvider->hasClass(TestCase::class)) {
-			$testCase = $this->reflectionProvider->getClass(TestCase::class);
-			$file = $testCase->getFileName();
-			if ($file !== null) {
-				$phpUnitRoot = dirname($file, 3);
-				$phpUnitComposer = $phpUnitRoot . '/composer.json';
-				if (is_file($phpUnitComposer)) {
-					$composerJson = @file_get_contents($phpUnitComposer);
-					if ($composerJson !== false) {
-						$json = json_decode($composerJson, true);
-						$version = $json['extra']['branch-alias']['dev-main'] ?? null;
-						if ($version !== null) {
-							$majorVersion = (int) explode('.', $version)[0];
-							if ($majorVersion >= 10) {
-								$phpUnit10OrNewer = true;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return new DataProviderHelper($this->reflectionProvider, $this->fileTypeMapper, $this->parser, $phpUnit10OrNewer);
+		return new DataProviderHelper($this->reflectionProvider, $this->fileTypeMapper, $this->parser, $this->PHPUnitVersionDetector->isPHPUnit10OrNewer());
 	}
 
 }

src/Rules/PHPUnit/PHPUnitVersionDetector.php

@@ -0,0 +1,57 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\PHPUnit;
+
+use PHPStan\Reflection\ReflectionProvider;
+use PHPUnit\Framework\TestCase;
+use function dirname;
+use function explode;
+use function file_get_contents;
+use function is_file;
+use function json_decode;
+
+class PHPUnitVersionDetector
+{
+
+	private ?bool $is10OrNewer = null;
+
+	private ReflectionProvider $reflectionProvider;
+
+	public function __construct(ReflectionProvider $reflectionProvider)
+	{
+		$this->reflectionProvider = $reflectionProvider;
+	}
+
+	public function isPHPUnit10OrNewer(): bool
+	{
+		if ($this->is10OrNewer !== null) {
+			return $this->is10OrNewer;
+		}
+
+		$this->is10OrNewer = false;
+		if ($this->reflectionProvider->hasClass(TestCase::class)) {
+			$testCase = $this->reflectionProvider->getClass(TestCase::class);
+			$file = $testCase->getFileName();
+			if ($file !== null) {
+				$phpUnitRoot = dirname($file, 3);
+				$phpUnitComposer = $phpUnitRoot . '/composer.json';
+				if (is_file($phpUnitComposer)) {
+					$composerJson = @file_get_contents($phpUnitComposer);
+					if ($composerJson !== false) {
+						$json = json_decode($composerJson, true);
+						$version = $json['extra']['branch-alias']['dev-main'] ?? null;
+						if ($version !== null) {
+							$majorVersion = (int) explode('.', $version)[0];
+							if ($majorVersion >= 10) {
+								$this->is10OrNewer = true;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return $this->is10OrNewer;
+	}
+
+}