Introduce value object to represent version_compare() operator

src/Util/Configuration.php

@@ -1051,7 +1051,7 @@ private function satisfiesPhpVersion(DOMElement $node): bool
             $phpVersionOperator = (string) $node->getAttribute('phpVersionOperator');
         }
 
-        return \version_compare(\PHP_VERSION, $phpVersion, $phpVersionOperator);
+        return \version_compare(\PHP_VERSION, $phpVersion, (new VersionComparisonOperator($phpVersionOperator))->asString());
     }
 
     /**

src/Util/Test.php

@@ -158,12 +158,10 @@ public static function getMissingRequirements(string $className, string $methodN
         $hint     = null;
 
         if (!empty($required['PHP'])) {
-            $operator = empty($required['PHP']['operator']) ? '>=' : $required['PHP']['operator'];
+            $operator = new VersionComparisonOperator(empty($required['PHP']['operator']) ? '>=' : $required['PHP']['operator']);
 
-            self::ensureOperatorIsValid($operator);
-
-            if (!\version_compare(\PHP_VERSION, $required['PHP']['version'], $operator)) {
-                $missing[] = \sprintf('PHP %s %s is required.', $operator, $required['PHP']['version']);
+            if (!\version_compare(\PHP_VERSION, $required['PHP']['version'], $operator->asString())) {
+                $missing[] = \sprintf('PHP %s %s is required.', $operator->asString(), $required['PHP']['version']);
                 $hint      = $hint ?? 'PHP';
             }
         } elseif (!empty($required['PHP_constraint'])) {
@@ -182,12 +180,10 @@ public static function getMissingRequirements(string $className, string $methodN
         if (!empty($required['PHPUnit'])) {
             $phpunitVersion = Version::id();
 
-            $operator = empty($required['PHPUnit']['operator']) ? '>=' : $required['PHPUnit']['operator'];
-
-            self::ensureOperatorIsValid($operator);
+            $operator = new VersionComparisonOperator(empty($required['PHPUnit']['operator']) ? '>=' : $required['PHPUnit']['operator']);
 
-            if (!\version_compare($phpunitVersion, $required['PHPUnit']['version'], $operator)) {
-                $missing[] = \sprintf('PHPUnit %s %s is required.', $operator, $required['PHPUnit']['version']);
+            if (!\version_compare($phpunitVersion, $required['PHPUnit']['version'], $operator->asString())) {
+                $missing[] = \sprintf('PHPUnit %s %s is required.', $operator->asString(), $required['PHPUnit']['version']);
                 $hint      = $hint ?? 'PHPUnit';
             }
         } elseif (!empty($required['PHPUnit_constraint'])) {
@@ -260,12 +256,10 @@ public static function getMissingRequirements(string $className, string $methodN
             foreach ($required['extension_versions'] as $extension => $req) {
                 $actualVersion = \phpversion($extension);
 
-                $operator = empty($req['operator']) ? '>=' : $req['operator'];
-
-                self::ensureOperatorIsValid($operator);
+                $operator = new VersionComparisonOperator(empty($req['operator']) ? '>=' : $req['operator']);
 
-                if ($actualVersion === false || !\version_compare($actualVersion, $req['version'], $operator)) {
-                    $missing[] = \sprintf('Extension %s %s %s is required.', $extension, $operator, $req['version']);
+                if ($actualVersion === false || !\version_compare($actualVersion, $req['version'], $operator->asString())) {
+                    $missing[] = \sprintf('Extension %s %s %s is required.', $extension, $operator->asString(), $req['version']);
                     $hint      = $hint ?? 'extension_' . $extension;
                 }
             }
@@ -897,19 +891,4 @@ private static function mergeArraysRecursively(array $a, array $b): array
 
         return $a;
     }
-
-    /**
-     * @throws Exception
-     */
-    private static function ensureOperatorIsValid(string $operator): void
-    {
-        if (!\in_array($operator, ['<', 'lt', '<=', 'le', '>', 'gt', '>=', 'ge', '==', '=', 'eq', '!=', '<>', 'ne'])) {
-            throw new Exception(
-                \sprintf(
-                    '"%s" is not a valid version_compare() operator',
-                    $operator
-                )
-            );
-        }
-    }
 }

src/Util/VersionComparisonOperator.php

@@ -0,0 +1,54 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\Util;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ * @psalm-immutable
+ */
+final class VersionComparisonOperator
+{
+    /**
+     * @var '<'|'lt'|'<='|'le'|'>'|'gt'|'>='|'ge'|'=='|'='|'eq'|'!='|'<>'|'ne'
+     */
+    private $operator;
+
+    public function __construct(string $operator)
+    {
+        $this->ensureOperatorIsValid($operator);
+
+        $this->operator = $operator;
+    }
+
+    /**
+     * @return '<'|'lt'|'<='|'le'|'>'|'gt'|'>='|'ge'|'=='|'='|'eq'|'!='|'<>'|'ne'
+     */
+    public function asString(): string
+    {
+        return $this->operator;
+    }
+
+    /**
+     * @throws Exception
+     *
+     * @psalm-assert '<'|'lt'|'<='|'le'|'>'|'gt'|'>='|'ge'|'=='|'='|'eq'|'!='|'<>'|'ne' $operator
+     */
+    private function ensureOperatorIsValid(string $operator): void
+    {
+        if (!\in_array($operator, ['<', 'lt', '<=', 'le', '>', 'gt', '>=', 'ge', '==', '=', 'eq', '!=', '<>', 'ne'])) {
+            throw new Exception(
+                \sprintf(
+                    '"%s" is not a valid version_compare() operator',
+                    $operator
+                )
+            );
+        }
+    }
+}