refactor

Author: staabm

src/Rules/PHPUnit/DataProviderHelper.php

@@ -37,19 +37,19 @@ class DataProviderHelper
 
 	private Parser $parser;
 
-	private bool $phpunit10OrNewer;
+	private PHPUnitVersion $PHPUnitVersion;
 
 	public function __construct(
 		ReflectionProvider $reflectionProvider,
 		FileTypeMapper $fileTypeMapper,
 		Parser $parser,
-		bool $phpunit10OrNewer
+		PHPUnitVersion $PHPUnitVersion
 	)
 	{
 		$this->reflectionProvider = $reflectionProvider;
 		$this->fileTypeMapper = $fileTypeMapper;
 		$this->parser = $parser;
-		$this->phpunit10OrNewer = $phpunit10OrNewer;
+		$this->PHPUnitVersion = $PHPUnitVersion;
 	}
 
 	/**
@@ -65,7 +65,7 @@ public function getDataProviderMethods(
 	{
 		yield from $this->yieldDataProviderAnnotations($testMethod, $scope, $classReflection);
 
-		if (!$this->phpunit10OrNewer) {
+		if (!$this->PHPUnitVersion->supportsDataProviderAttribute()) {
 			return;
 		}
 
@@ -156,7 +156,7 @@ public function processDataProvider(
 				->build();
 		}
 
-		if ($deprecationRulesInstalled && $this->phpunit10OrNewer && !$dataProviderMethodReflection->isStatic()) {
+		if ($deprecationRulesInstalled && $this->PHPUnitVersion->requiresStaticDataProviders() && !$dataProviderMethodReflection->isStatic()) {
 			$errorBuilder = RuleErrorBuilder::message(sprintf(
 				'@dataProvider %s related method must be static in PHPUnit 10 and newer.',
 				$dataProviderValue,

src/Rules/PHPUnit/DataProviderHelperFactory.php

@@ -32,7 +32,7 @@ public function __construct(
 
 	public function create(): DataProviderHelper
 	{
-		return new DataProviderHelper($this->reflectionProvider, $this->fileTypeMapper, $this->parser, $this->PHPUnitVersionDetector->isPHPUnit10OrNewer());
+		return new DataProviderHelper($this->reflectionProvider, $this->fileTypeMapper, $this->parser, $this->PHPUnitVersionDetector->getPHPUnitVersion());
 	}
 
 }

src/Rules/PHPUnit/PHPUnitVersion.php

@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\PHPUnit;
+
+class PHPUnitVersion
+{
+
+	private ?int $majorVersion;
+
+
+	public function __construct(?int $majorVersion)
+	{
+		$this->majorVersion = $majorVersion;
+	}
+
+	public function supportsDataProviderAttribute(): bool
+	{
+		return $this->majorVersion !== null && $this->majorVersion >= 10;
+	}
+
+	public function supportsTestAttribute(): bool
+	{
+		return $this->majorVersion !== null && $this->majorVersion >= 10;
+	}
+
+	public function requiresStaticDataProviders(): bool
+	{
+		return $this->majorVersion !== null && $this->majorVersion >= 10;
+	}
+
+}

src/Rules/PHPUnit/PHPUnitVersionDetector.php

@@ -13,9 +13,7 @@
 class PHPUnitVersionDetector
 {
 
-	private bool $initialized = false;
-
-	private ?int $majorVersion = null;
+	private ?PHPUnitVersion $PHPUnitVersion = null;
 
 	private ReflectionProvider $reflectionProvider;
 
@@ -24,19 +22,13 @@ public function __construct(ReflectionProvider $reflectionProvider)
 		$this->reflectionProvider = $reflectionProvider;
 	}
 
-	public function isPHPUnit10OrNewer(): bool
-	{
-		$majorVersion = $this->getMajorVersion();
-		return $majorVersion !== null && $majorVersion >= 10;
-	}
-
-	private function getMajorVersion(): ?int
+	public function getPHPUnitVersion(): PHPUnitVersion
 	{
-		if ($this->initialized) {
-			return $this->majorVersion;
+		if ($this->PHPUnitVersion !== null) {
+			return $this->PHPUnitVersion;
 		}
-		$this->initialized = true;
 
+		$majorVersion = null;
 		if ($this->reflectionProvider->hasClass(TestCase::class)) {
 			$testCase = $this->reflectionProvider->getClass(TestCase::class);
 			$file = $testCase->getFileName();
@@ -49,14 +41,14 @@ private function getMajorVersion(): ?int
 						$json = json_decode($composerJson, true);
 						$version = $json['extra']['branch-alias']['dev-main'] ?? null;
 						if ($version !== null) {
-							$this->majorVersion = (int) explode('.', $version)[0];
+							$majorVersion = (int) explode('.', $version)[0];
 						}
 					}
 				}
 			}
 		}
 
-		return $this->majorVersion;
+		return $this->PHPUnitVersion = new PHPUnitVersion($majorVersion);
 	}
 
 }

src/Rules/PHPUnit/TestMethodsHelper.php

@@ -16,15 +16,15 @@ final class TestMethodsHelper
 
 	private FileTypeMapper $fileTypeMapper;
 
-	private bool $phpunit10OrNewer;
+	private PHPUnitVersion $PHPUnitVersion;
 
 	public function __construct(
 		FileTypeMapper $fileTypeMapper,
-		bool $phpunit10OrNewer
+		PHPUnitVersion $PHPUnitVersion
 	)
 	{
 		$this->fileTypeMapper = $fileTypeMapper;
-		$this->phpunit10OrNewer = $phpunit10OrNewer;
+		$this->PHPUnitVersion = $PHPUnitVersion;
 	}
 
 	/**
@@ -63,7 +63,7 @@ public function getTestMethods(ClassReflection $classReflection, Scope $scope):
 				}
 			}
 
-			if (!$this->phpunit10OrNewer) {
+			if (!$this->PHPUnitVersion->supportsTestAttribute()) {
 				continue;
 			}
 

src/Rules/PHPUnit/TestMethodsHelperFactory.php

@@ -22,7 +22,7 @@ public function __construct(
 
 	public function create(): TestMethodsHelper
 	{
-		return new TestMethodsHelper($this->fileTypeMapper, $this->PHPUnitVersionDetector->isPHPUnit10OrNewer());
+		return new TestMethodsHelper($this->fileTypeMapper, $this->PHPUnitVersionDetector->getPHPUnitVersion());
 	}
 
 }

tests/Rules/PHPUnit/DataProviderDataRuleTest.php

@@ -24,13 +24,13 @@ protected function getRule(): Rule
 			new DataProviderDataRule(
 				new TestMethodsHelper(
 					self::getContainer()->getByType(FileTypeMapper::class),
-					true
+					new PHPUnitVersion(11)
 				),
 				new DataProviderHelper(
 					$reflectionProvider,
 					self::getContainer()->getByType(FileTypeMapper::class),
 					self::getContainer()->getService('defaultAnalysisParser'),
-					true
+					new PHPUnitVersion(11)
 				),
 
 			),

tests/Rules/PHPUnit/DataProviderDeclarationRuleTest.php

@@ -21,7 +21,7 @@ protected function getRule(): Rule
 				$reflection,
 				self::getContainer()->getByType(FileTypeMapper::class),
 				self::getContainer()->getService('defaultAnalysisParser'),
-				true
+				new PHPUnitVersion(11)
 			),
 			true,
 			true