fix

Author: staabm

src/Analyser/MutatingScope.php

@@ -145,7 +145,6 @@
 use function implode;
 use function in_array;
 use function is_bool;
-use function is_int;
 use function is_numeric;
 use function is_string;
 use function ltrim;
@@ -5727,35 +5726,10 @@ public function getPhpVersion(): PhpVersions
 	{
 		$versionExpr = new ConstFetch(new Name('PHP_VERSION_ID'));
 		if (!$this->hasExpressionType($versionExpr)->yes()) {
-			return new PhpVersions([$this->phpVersion->getVersionId()]);
+			return new PhpVersions(new ConstantIntegerType($this->phpVersion->getVersionId()));
 		}
 
-		$versionId = $this->getType($versionExpr);
-		if ($versionId instanceof IntegerRangeType) {
-			if ($versionId->getMin() !== null && $versionId->getMax() !== null) {
-				return new PhpVersions([$versionId->getMin(), $versionId->getMax()]);
-			}
-			if ($versionId->getMin() !== null) {
-				return new PhpVersions([$versionId->getMin()]);
-			}
-			if ($versionId->getMax() !== null) {
-				return new PhpVersions([$versionId->getMax()]);
-			}
-		}
-
-		$scalars = $versionId->getConstantScalarValues();
-		if ($scalars !== []) {
-			$ints = [];
-			foreach ($scalars as $scalar) {
-				if (!is_int($scalar)) {
-					throw new ShouldNotHappenException();
-				}
-				$ints[] = $scalar;
-			}
-			return new PhpVersions($ints);
-		}
-
-		return new PhpVersions([$this->phpVersion->getVersionId()]);
+		return new PhpVersions($this->getType($versionExpr));
 	}
 
 }

src/Php/PhpVersions.php

@@ -2,56 +2,25 @@
 
 namespace PHPStan\Php;
 
-use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
-use function max;
-use function min;
+use PHPStan\Type\IntegerRangeType;
+use PHPStan\Type\Type;
 
 /**
  * @api
  */
 final class PhpVersions
 {
 
-	private int $minVersionId;
-
-	private int $maxVersionId;
-
-	/**
-	 * @param list<int> $phpVersionIds
-	 */
 	public function __construct(
-		array $phpVersionIds,
+		private Type $phpVersions,
 	)
 	{
-		if ($phpVersionIds === []) {
-			throw new ShouldNotHappenException();
-		}
-
-		$normalizedPhpVersionIds = [];
-		foreach ($phpVersionIds as $versionId) {
-			// drop patch version part and replace with 00
-			$normalizedPhpVersionIds[] = ((int) ($versionId / 100)) * 100;
-		}
-
-		$this->minVersionId = min($normalizedPhpVersionIds);
-		$this->maxVersionId = max($normalizedPhpVersionIds);
 	}
 
 	public function producesWarningForFinalPrivateMethods(): TrinaryLogic
 	{
-		return $this->minPhpVersion(80000);
-	}
-
-	private function minPhpVersion(int $versionId): TrinaryLogic
-	{
-		if ($this->minVersionId >= $versionId) {
-			return TrinaryLogic::createYes();
-		}
-		if ($this->maxVersionId >= $versionId) {
-			return TrinaryLogic::createMaybe();
-		}
-		return TrinaryLogic::createNo();
+		return $this->phpVersions->isSuperTypeOf(IntegerRangeType::fromInterval(80000, null))->result;
 	}
 
 }

tests/PHPStan/Rules/Methods/FinalPrivateMethodRuleTest.php

@@ -29,6 +29,10 @@ public function testRule(): void
 				'Private method FinalPrivateMethod\FooBarPhp74OrHigher::foo() cannot be final as it is never overridden by other classes.',
 				59,
 			],
+			[
+				'Private method FinalPrivateMethod\FooBarPhp8orHigher::foo() cannot be final as it is never overridden by other classes.',
+				69,
+			],
 		]);
 	}
 

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

@@ -61,3 +61,13 @@ final private function foo(): void
 		}
 	}
 }
+
+if (PHP_VERSION_ID < 70400 || PHP_VERSION_ID >= 80100) {
+	class FooBarPhp8orHigher
+	{
+
+		final private function foo(): void
+		{
+		}
+	}
+}