Fix PHPVersion based checks

.github/workflows/e2e-tests.yml

@@ -0,0 +1,59 @@
+# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
+
+name: "E2E Tests"
+
+on:
+  pull_request:
+  push:
+    branches:
+      - "2.0.x"
+
+concurrency:
+  group: e2e-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  e2e-tests:
+    name: "E2E tests"
+    runs-on: "ubuntu-latest"
+    timeout-minutes: 60
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - script: |
+              cd e2e/composer-version
+              composer install
+              OUTPUT=$(../bashunit -a exit_code "1" "vendor/bin/phpstan analyze test.php --error-format=raw")
+              echo "$OUTPUT"
+              ../bashunit -a contains 'test.php:12:Version requirement will always evaluate to false.' "$OUTPUT"
+              ../bashunit -a contains 'test.php:32:Version requirement will always evaluate to false.' "$OUTPUT"
+
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
+        with:
+          egress-policy: audit
+
+      - name: "Checkout"
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc" # v2.37.1
+        with:
+          coverage: "none"
+          php-version: "8.3"
+
+      - uses: "ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda" # v4.0.0
+
+      - name: "Install bashunit"
+        uses: "TypedDevs/bashunit@ffa9c79e71ecbb9990e777348bc9ba12314b62d0" # 0.39.1
+        with:
+          directory: "e2e"
+
+      - name: "Test"
+        run: ${{ matrix.script }}

composer.json

@@ -9,7 +9,7 @@
 	"require": {
 		"php": "^7.4 || ^8.0",
 		"phar-io/version": "^3.2",
-		"phpstan/phpstan": "^2.2.3"
+		"phpstan/phpstan": "^2.2.6"
 	},
 	"conflict": {
 		"phpunit/phpunit": "<7.0"

e2e/composer-version/.gitignore

@@ -0,0 +1,2 @@
+/vendor
+composer.lock

e2e/composer-version/composer.json

@@ -0,0 +1,20 @@
+{
+	"require": {
+		"php": "^8.1",
+		"phpstan/phpstan": "@dev",
+		"phpstan/phpstan-phpunit": "@dev",
+		"phpunit/phpunit": "^12.5",
+		"phpstan/extension-installer": "^1.4"
+	},
+	"repositories": [
+		{
+			"type": "path",
+			"url": "../../"
+		}
+	],
+	"config": {
+		"allow-plugins": {
+			"phpstan/extension-installer": true
+		}
+	}
+}

e2e/composer-version/phpstan.neon

@@ -0,0 +1,5 @@
+includes:
+	- phar://phpstan.phar/conf/bleedingEdge.neon
+
+parameters:
+	level: 5

e2e/composer-version/test.php

@@ -0,0 +1,34 @@
+<?php
+
+use PHPUnit\Framework\Attributes\RequiresPhp;
+use PHPUnit\Framework\Attributes\RequiresPhpunit;
+
+class A extends \PHPUnit\Framework\TestCase {
+	#[RequiresPhp('<=8.2.0')]
+	public function testFoo() {}
+}
+
+class B extends \PHPUnit\Framework\TestCase {
+	#[RequiresPhp('<=8.0.0')]
+	public function testFoo() {}
+}
+
+class C extends \PHPUnit\Framework\TestCase {
+	#[RequiresPhp('^8.0.0')]
+	public function testFoo() {}
+}
+
+class D extends \PHPUnit\Framework\TestCase {
+	#[RequiresPhp('^8.1.0')]
+	public function testFoo() {}
+}
+
+class E extends \PHPUnit\Framework\TestCase {
+	#[RequiresPhpunit('^12.0.0')]
+	public function testFoo() {}
+}
+
+class F extends \PHPUnit\Framework\TestCase {
+	#[RequiresPhpunit('^11.0.0')]
+	public function testFoo() {}
+}

src/Rules/PHPUnit/AttributeVersionRequirementHelper.php

@@ -7,12 +7,10 @@
 use PharIo\Version\VersionConstraintParser;
 use PHPStan\Analyser\Scope;
 use PHPStan\BetterReflection\Reflection\ReflectionAttribute;
+use PHPStan\Php\ConfiguredPhpVersionRangeHelper;
 use PHPStan\Php\PhpMinorVersionIterator;
-use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPStan\Type\Constant\ConstantIntegerType;
-use PHPStan\Type\IntegerRangeType;
 use function count;
 use function is_numeric;
 use function preg_match;
@@ -28,8 +26,6 @@ final class AttributeVersionRequirementHelper
 
 	private PHPUnitVersion $PHPUnitVersion;
 
-	private PhpVersion $fallbackPhpVersion;
-
 	/**
 	 * When phpstan-deprecation-rules is installed, rule reports deprecated usages.
 	 */
@@ -42,19 +38,21 @@ final class AttributeVersionRequirementHelper
 
 	private bool $bleedingEdge;
 
+	private ConfiguredPhpVersionRangeHelper $phpVersionRangeHelper;
+
 	public function __construct(
 		PHPUnitVersion $PHPUnitVersion,
-		PhpVersion $phpVersion,
+		ConfiguredPhpVersionRangeHelper $phpVersionRangeHelper,
 		bool $deprecationRulesInstalled = false,
 		bool $bleedingEdge = false,
 		bool $warnAboutIncompleteVersion = true
 	)
 	{
 		$this->PHPUnitVersion = $PHPUnitVersion;
 		$this->deprecationRulesInstalled = $deprecationRulesInstalled;
-		$this->fallbackPhpVersion = $phpVersion;
 		$this->warnAboutIncompleteVersion = $warnAboutIncompleteVersion;
 		$this->bleedingEdge = $bleedingEdge;
+		$this->phpVersionRangeHelper = $phpVersionRangeHelper;
 	}
 
 	/**
@@ -64,11 +62,6 @@ public function __construct(
 	 */
 	public function checkVersionRequirement(array $attributes, Scope $scope): array
 	{
-		$phpstanPharIoVersions = $this->getAnalyzedPhpVersions($scope);
-		if ($phpstanPharIoVersions === []) {
-			return [];
-		}
-
 		$errors = [];
 		$parser = new VersionConstraintParser();
 		foreach ($attributes as $attr) {
@@ -99,7 +92,7 @@ public function checkVersionRequirement(array $attributes, Scope $scope): array
 
 				$pharIoVersions = strpos($attr->getName(), 'RequiresPhpunit') !== false
 					? $this->PHPUnitVersion->getPharIoVersions()
-					: $phpstanPharIoVersions;
+					: $this->getAnalyzedPhpVersions();
 				if ($pharIoVersions === []) {
 					continue;
 				}
@@ -168,29 +161,23 @@ public function checkVersionRequirement(array $attributes, Scope $scope): array
 	/**
 	 * @return Version[]
 	 */
-	private function getAnalyzedPhpVersions(Scope $scope): array
+	private function getAnalyzedPhpVersions(): array
 	{
-		$scopePhpVersion = $scope->getPhpVersion()->getType();
-		if ($scopePhpVersion instanceof ConstantIntegerType) {
-			$v = new PhpVersion($scopePhpVersion->getValue());
-			return [new Version($v->getVersionString())];
-		} elseif ($scopePhpVersion instanceof IntegerRangeType) {
-			if ($scopePhpVersion->getMin() === null || $scopePhpVersion->getMax() === null) {
-				return [];
-			}
-
+		// @phpstan-ignore phpstanApi.method
+		[$minVersion, $maxVersion] = $this->phpVersionRangeHelper->getVersionRange();
+		if ($minVersion !== null && $maxVersion !== null) {
 			$versions = [];
 			$minorVersionIterator = new PhpMinorVersionIterator(
-				new PhpVersion($scopePhpVersion->getMin()),
-				new PhpVersion($scopePhpVersion->getMax()),
+				$minVersion,
+				$maxVersion,
 			);
 			foreach ($minorVersionIterator as $phpstanVersion) {
 				$versions[] = new Version($phpstanVersion->getVersionString());
 			}
 			return $versions;
 		}
 
-		return [new Version($this->fallbackPhpVersion->getVersionString())];
+		return [];
 	}
 
 	// see https://github.com/sebastianbergmann/phpunit/issues/6451

tests/Rules/PHPUnit/AttributeRequiresPhpVersionRangeRuleTest.php

@@ -2,7 +2,7 @@
 
 namespace PHPStan\Rules\PHPUnit;
 
-use PHPStan\Php\PhpVersion;
+use PHPStan\Php\ConfiguredPhpVersionRangeHelper;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use PHPStan\Type\FileTypeMapper;
@@ -13,8 +13,6 @@
 final class AttributeRequiresPhpVersionRangeRuleTest extends RuleTestCase
 {
 
-	private int $phpVersion = 80500;
-
 	public function testPhpVersionMismatch(): void
 	{
 		$this->analyse([__DIR__ . '/data/requires-php-version-mismatch.php'], [
@@ -52,7 +50,7 @@ protected function getRule(): Rule
 			),
 			new AttributeVersionRequirementHelper(
 				$phpunitVersion,
-				new PhpVersion($this->phpVersion),
+				self::getContainer()->getByType(ConfiguredPhpVersionRangeHelper::class), // @phpstan-ignore phpstanApi.classConstant
 				false,
 				true,
 			),

tests/Rules/PHPUnit/AttributeRequiresPhpVersionRule.neon

@@ -1,2 +1,4 @@
 parameters:
-	phpVersion: 80500
+	phpVersion:
+		min: 80500
+		max: 80599

tests/Rules/PHPUnit/AttributeRequiresPhpVersionRuleTest.php

@@ -2,7 +2,7 @@
 
 namespace PHPStan\Rules\PHPUnit;
 
-use PHPStan\Php\PhpVersion;
+use PHPStan\Php\ConfiguredPhpVersionRangeHelper;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use PHPStan\Type\FileTypeMapper;
@@ -13,8 +13,6 @@
 final class AttributeRequiresPhpVersionRuleTest extends RuleTestCase
 {
 
-	private int $phpVersion = 80500;
-
 	private ?int $phpunitMajorVersion;
 
 	private ?int $phpunitMinorVersion;
@@ -196,7 +194,7 @@ protected function getRule(): Rule
 			),
 			new AttributeVersionRequirementHelper(
 				$phpunitVersion,
-				new PhpVersion($this->phpVersion),
+				self::getContainer()->getByType(ConfiguredPhpVersionRangeHelper::class), // @phpstan-ignore phpstanApi.classConstant
 				$this->deprecationRulesInstalled,
 				true,
 				$this->warnAboutIncompleteVersion,

tests/Rules/PHPUnit/AttributeRequiresSinglePhpVersionRule.neon

@@ -0,0 +1,2 @@
+parameters:
+	phpVersion: 80210

tests/Rules/PHPUnit/AttributeRequiresSinglePhpVersionRuleTest.php

@@ -0,0 +1,46 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\PHPUnit;
+
+use PHPStan\Php\ConfiguredPhpVersionRangeHelper;
+use PHPStan\Rules\Rule;
+use PHPStan\Testing\RuleTestCase;
+use PHPStan\Type\FileTypeMapper;
+
+/**
+ * @extends RuleTestCase<AttributeRequiresPhpVersionRule>
+ */
+final class AttributeRequiresSinglePhpVersionRuleTest extends RuleTestCase
+{
+
+	public function testPhpVersionMismatch(): void
+	{
+		$this->analyse([__DIR__ . '/data/requires-php-version-mismatch.php'], []);
+	}
+
+	protected function getRule(): Rule
+	{
+		$phpunitVersion = new PHPUnitVersion(null, null);
+
+		return new AttributeRequiresPhpVersionRule(
+			new TestMethodsHelper(
+				self::getContainer()->getByType(FileTypeMapper::class),
+				$phpunitVersion,
+			),
+			new AttributeVersionRequirementHelper(
+				$phpunitVersion,
+				self::getContainer()->getByType(ConfiguredPhpVersionRangeHelper::class), // @phpstan-ignore phpstanApi.classConstant
+				false,
+				true,
+			),
+		);
+	}
+
+	public static function getAdditionalConfigFiles(): array
+	{
+		return [
+			__DIR__ . '/AttributeRequiresSinglePhpVersionRule.neon',
+		];
+	}
+
+}

tests/Rules/PHPUnit/ClassAttributeRequiresPhpVersionRule.neon

@@ -1,2 +1,4 @@
 parameters:
-	phpVersion: 80500
+	phpVersion:
+		min: 80500
+		max: 80599

tests/Rules/PHPUnit/ClassAttributeRequiresPhpVersionRuleTest.php

@@ -2,7 +2,7 @@
 
 namespace PHPStan\Rules\PHPUnit;
 
-use PHPStan\Php\PhpVersion;
+use PHPStan\Php\ConfiguredPhpVersionRangeHelper;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 
@@ -12,8 +12,6 @@
 final class ClassAttributeRequiresPhpVersionRuleTest extends RuleTestCase
 {
 
-	private int $phpVersion = 80500;
-
 	private int $phpunitMajorVersion;
 
 	private int $phpunitMinorVersion;
@@ -59,7 +57,7 @@ protected function getRule(): Rule
 		return new ClassAttributeRequiresPhpVersionRule(
 			new AttributeVersionRequirementHelper(
 				$phpunitVersion,
-				new PhpVersion($this->phpVersion),
+				self::getContainer()->getByType(ConfiguredPhpVersionRangeHelper::class), // @phpstan-ignore phpstanApi.classConstant
 				false,
 				true,
 				$this->warnAboutIncompleteVersion,