cleanup tests

Author: staabm

tests/PHPStan/Php/PhpVersionsTest.php

@@ -3,26 +3,29 @@
 namespace PHPStan\Php;
 
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\IntegerRangeType;
 use PHPStan\Type\Type;
-use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\UnionType;
 use PHPUnit\Framework\TestCase;
 
 class PhpVersionsTest extends TestCase
 {
+
 	/**
 	 * @dataProvider dataProducesWarningForFinalPrivateMethods
 	 */
-	public function testProducesWarningForFinalPrivateMethods(TrinaryLogic $expected, Type $versionType ) {
+	public function testProducesWarningForFinalPrivateMethods(TrinaryLogic $expected, Type $versionType): void
+	{
 		$phpVersions = new PhpVersions($versionType);
 		$this->assertSame(
 			$expected->describe(),
-			$phpVersions->producesWarningForFinalPrivateMethods()->describe()
+			$phpVersions->producesWarningForFinalPrivateMethods()->describe(),
 		);
 	}
 
-	public function dataProducesWarningForFinalPrivateMethods(): iterable {
+	public function dataProducesWarningForFinalPrivateMethods(): iterable
+	{
 		yield [
 			TrinaryLogic::createNo(),
 			new ConstantIntegerType(70400),
@@ -40,25 +43,26 @@ public function dataProducesWarningForFinalPrivateMethods(): iterable {
 
 		yield [
 			TrinaryLogic::createYes(),
-			IntegerRangeType::fromInterval(80000, null)
+			IntegerRangeType::fromInterval(80000, null),
 		];
 
 		yield [
 			TrinaryLogic::createMaybe(),
-			IntegerRangeType::fromInterval(null, 80000)
+			IntegerRangeType::fromInterval(null, 80000),
 		];
 
 		yield [
 			TrinaryLogic::createNo(),
-			IntegerRangeType::fromInterval(70200, 70400)
+			IntegerRangeType::fromInterval(70200, 70400),
 		];
 
 		yield [
 			TrinaryLogic::createMaybe(),
 			new UnionType([
 				IntegerRangeType::fromInterval(70200, 70400),
 				IntegerRangeType::fromInterval(80200, 80400),
-			])
+			]),
 		];
 	}
+
 }

tests/PHPStan/Rules/Methods/FinalPrivateMethodRuleTest.php

@@ -2,9 +2,9 @@
 
 namespace PHPStan\Rules\Methods;
 
+use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
-use function array_merge;
 use const PHP_VERSION_ID;
 
 /** @extends RuleTestCase<FinalPrivateMethodRule> */
@@ -16,34 +16,60 @@ protected function getRule(): Rule
 		return new FinalPrivateMethodRule();
 	}
 
-	public function testRule(): void
+	public function dataRule(): array
 	{
-		$errors = [];
-		if (PHP_VERSION_ID >= 80000) {
-			$errors = [
+		return [
+			[
+				70400,
+				[],
+			],
+			[
+				80000,
 				[
-					'Private method FinalPrivateMethod\Foo::foo() cannot be final as it is never overridden by other classes.',
-					8,
+					[
+						'Private method FinalPrivateMethod\Foo::foo() cannot be final as it is never overridden by other classes.',
+						8,
+					],
 				],
-			];
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider dataRule
+	 * @param list<array{0: string, 1: int, 2?: string}> $errors
+	 */
+	public function testRule(int $phpVersion, array $errors): void
+	{
+		$testVersion = new PhpVersion($phpVersion);
+		$runtimeVersion = new PhpVersion(PHP_VERSION_ID);
+
+		if (
+			$testVersion->getMajorVersionId() !== $runtimeVersion->getMajorVersionId()
+			|| $testVersion->getMinorVersionId() !== $runtimeVersion->getMinorVersionId()
+		) {
+			$this->markTestSkipped('Test requires PHP version ' . $phpVersion);
 		}
 
-		$errors = array_merge($errors, [
+		$this->analyse([__DIR__ . '/data/final-private-method.php'], $errors);
+	}
+
+	public function testRulePhpVersions(): void
+	{
+		$this->analyse([__DIR__ . '/data/final-private-method-phpversions.php'], [
 			[
-				'Private method FinalPrivateMethod\FooBarPhp8orHigher::foo() cannot be final as it is never overridden by other classes.',
-				39,
+				'Private method FinalPrivateMethodPhpVersions\FooBarPhp8orHigher::foo() cannot be final as it is never overridden by other classes.',
+				9,
 			],
 			[
-				'Private method FinalPrivateMethod\FooBarPhp74OrHigher::foo() cannot be final as it is never overridden by other classes.',
-				59,
+				'Private method FinalPrivateMethodPhpVersions\FooBarPhp74OrHigher::foo() cannot be final as it is never overridden by other classes.',
+				29,
 			],
 			[
-				'Private method FinalPrivateMethod\FooBarBaz::foo() cannot be final as it is never overridden by other classes.',
-				69,
+				'Private method FinalPrivateMethodPhpVersions\FooBarBaz::foo() cannot be final as it is never overridden by other classes.',
+				39,
 			],
 		]);
-
-		$this->analyse([__DIR__ . '/data/final-private-method.php'], $errors);
 	}
 
 }

tests/PHPStan/Rules/Methods/data/final-private-method-phpversions.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace FinalPrivateMethodPhpVersions;
+
+if (PHP_VERSION_ID >= 80000) {
+	class FooBarPhp8orHigher
+	{
+
+		final private function foo(): void
+		{
+		}
+	}
+}
+
+if (PHP_VERSION_ID < 80000) {
+	class FooBarPhp7
+	{
+
+		final private function foo(): void
+		{
+		}
+	}
+}
+
+if (PHP_VERSION_ID > 70400) {
+	class FooBarPhp74OrHigher
+	{
+
+		final private function foo(): void
+		{
+		}
+	}
+}
+
+if (PHP_VERSION_ID < 70400 || PHP_VERSION_ID >= 80100) {
+	class FooBarBaz
+	{
+
+		final private function foo(): void
+		{
+		}
+	}
+}

tests/PHPStan/Rules/Methods/data/final-private-method.php

@@ -31,43 +31,3 @@ final private function __construct()
 	}
 
 }
-
-if (PHP_VERSION_ID >= 80000) {
-	class FooBarPhp8orHigher
-	{
-
-		final private function foo(): void
-		{
-		}
-	}
-}
-
-if (PHP_VERSION_ID < 80000) {
-	class FooBarPhp7
-	{
-
-		final private function foo(): void
-		{
-		}
-	}
-}
-
-if (PHP_VERSION_ID > 70400) {
-	class FooBarPhp74OrHigher
-	{
-
-		final private function foo(): void
-		{
-		}
-	}
-}
-
-if (PHP_VERSION_ID < 70400 || PHP_VERSION_ID >= 80100) {
-	class FooBarBaz
-	{
-
-		final private function foo(): void
-		{
-		}
-	}
-}