1:1 reimplement php-version detection

Author: staabm

composer.json

@@ -7,7 +7,7 @@
 	],
 	"require": {
 		"php": "^7.4 || ^8.0",
-		"composer/semver": "^3.4",
+		"phar-io/version": "^3.2",
 		"phpstan/phpstan": "^2.1.32"
 	},
 	"conflict": {

src/Rules/PHPUnit/AttributeRequiresPhpVersionRule.php

@@ -4,6 +4,10 @@
 
 use Composer\Semver\Constraint\ConstraintInterface;
 use Composer\Semver\VersionParser;
+use PharIo\Version\UnsupportedVersionConstraintException;
+use PharIo\Version\Version;
+use PharIo\Version\VersionConstraint;
+use PharIo\Version\VersionConstraintParser;
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\Node\InClassMethodNode;
@@ -15,15 +19,18 @@
 use function count;
 use function is_numeric;
 use function method_exists;
+use function preg_match;
 use function sprintf;
 
 /**
  * @implements Rule<InClassMethodNode>
  */
 class AttributeRequiresPhpVersionRule implements Rule
 {
+	private const VERSION_COMPARISON = "/(?P<operator>!=|<|<=|<>|=|==|>|>=)?\s*(?P<version>[\d\.-]+(dev|(RC|alpha|beta)[\d\.])?)[ \t]*\r?$/m";
 
-	private ConstraintInterface $phpstanVersionConstraint;
+
+	private Version $phpstanPhpVersion;
 
 	private PHPUnitVersion $PHPUnitVersion;
 
@@ -45,8 +52,7 @@ public function __construct(
 		$this->testMethodsHelper = $testMethodsHelper;
 		$this->deprecationRulesInstalled = $deprecationRulesInstalled;
 
-		$parser = new VersionParser();
-		$this->phpstanVersionConstraint = $parser->parseConstraints($phpVersion->getVersionString());
+		$this->phpstanPhpVersion = new Version($phpVersion->getVersionString());
 	}
 
 	public function getNodeType(): string
@@ -72,7 +78,7 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$errors = [];
-		$parser = new VersionParser();
+		$parser = new VersionConstraintParser();
 		foreach ($reflectionMethod->getAttributes('PHPUnit\Framework\Attributes\RequiresPhp') as $attr) {
 			$args = $attr->getArguments();
 			if (count($args) !== 1) {
@@ -82,21 +88,28 @@ public function processNode(Node $node, Scope $scope): array
 			if (
 				!is_numeric($args[0])
 			) {
-
 				try {
-					$testPhpVersionConstraint = $parser->parseConstraints($args[0]);
-				} catch (UnexpectedValueException $e) {
-					$errors[] = RuleErrorBuilder::message(
-						sprintf($e->getMessage()),
-					)
-						->identifier('phpunit.attributeRequiresPhpVersion')
-						->build();
-
-					continue;
-				}
-
-				if ($this->phpstanVersionConstraint->matches($testPhpVersionConstraint)) {
-					continue;
+					$testPhpVersionConstraint = $parser->parse($args[0]);
+
+					if ($testPhpVersionConstraint->complies($this->phpstanPhpVersion)) {
+						continue;
+					}
+				} catch (UnsupportedVersionConstraintException $e) {
+					if (preg_match(self::VERSION_COMPARISON, $args[0], $matches) > 0) {
+						$operator = $matches['operator'] !== '' ? $matches['operator'] : '>=';
+
+						if (version_compare($this->phpstanPhpVersion->getVersionString(), $matches['version'], $operator)) {
+							continue;
+						}
+					} else {
+						$errors[] = RuleErrorBuilder::message(
+							sprintf($e->getMessage()),
+						)
+							->identifier('phpunit.attributeRequiresPhpVersion')
+							->build();
+
+						continue;
+					}
 				}
 
 				$errors[] = RuleErrorBuilder::message(

tests/Rules/PHPUnit/AttributeRequiresPhpVersionRuleTest.php

@@ -103,7 +103,7 @@ public function testInvalidPhpVersion(): void
 
 		$this->analyse([__DIR__ . '/data/requires-php-version-invalid.php'], [
 			[
-				'Could not parse version constraint abc: Invalid version string "abc"',
+				'Version constraint abc is not supported.',
 				12,
 			],
 		]);