cs

Author: staabm

src/Rules/PHPUnit/AttributeRequiresPhpVersionRule.php

@@ -2,11 +2,8 @@
 
 namespace PHPStan\Rules\PHPUnit;
 
-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;
@@ -15,20 +12,20 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPUnit\Framework\TestCase;
-use UnexpectedValueException;
 use function count;
 use function is_numeric;
 use function method_exists;
 use function preg_match;
 use function sprintf;
+use function version_compare;
 
 /**
  * @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 const VERSION_COMPARISON = "/(?P<operator>!=|<|<=|<>|=|==|>|>=)?\s*(?P<version>[\d\.-]+(dev|(RC|alpha|beta)[\d\.])?)[ \t]*\r?$/m";
 
 	private Version $phpstanPhpVersion;
 
@@ -95,13 +92,7 @@ public function processNode(Node $node, Scope $scope): array
 						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 {
+					if (preg_match(self::VERSION_COMPARISON, $args[0], $matches) <= 0) {
 						$errors[] = RuleErrorBuilder::message(
 							sprintf($e->getMessage()),
 						)
@@ -110,6 +101,12 @@ public function processNode(Node $node, Scope $scope): array
 
 						continue;
 					}
+
+					$operator = $matches['operator'] !== '' ? $matches['operator'] : '>=';
+
+					if (version_compare($this->phpstanPhpVersion->getVersionString(), $matches['version'], $operator)) {
+						continue;
+					}
 				}
 
 				$errors[] = RuleErrorBuilder::message(