Merge branch '11.5' into 12.3

Author: sebastianbergmann

src/Metadata/Parser/AttributeParser.php

@@ -91,7 +91,7 @@
 use PHPUnit\Metadata\InvalidAttributeException;
 use PHPUnit\Metadata\Metadata;
 use PHPUnit\Metadata\MetadataCollection;
-use PHPUnit\Metadata\Version\ConstraintRequirement;
+use PHPUnit\Metadata\Version\Requirement;
 use ReflectionClass;
 use ReflectionMethod;
 
@@ -349,7 +349,7 @@ public function forClass(string $className): MetadataCollection
                     assert($attributeInstance instanceof RequiresPhp);
 
                     $result[] = Metadata::requiresPhpOnClass(
-                        ConstraintRequirement::from(
+                        Requirement::from(
                             $attributeInstance->versionRequirement(),
                         ),
                     );
@@ -363,7 +363,7 @@ public function forClass(string $className): MetadataCollection
                     $versionRequirement = $attributeInstance->versionRequirement();
 
                     if ($versionRequirement !== null) {
-                        $versionConstraint = ConstraintRequirement::from($versionRequirement);
+                        $versionConstraint = Requirement::from($versionRequirement);
                     }
 
                     $result[] = Metadata::requiresPhpExtensionOnClass(
@@ -377,7 +377,7 @@ public function forClass(string $className): MetadataCollection
                     assert($attributeInstance instanceof RequiresPhpunit);
 
                     $result[] = Metadata::requiresPhpunitOnClass(
-                        ConstraintRequirement::from(
+                        Requirement::from(
                             $attributeInstance->versionRequirement(),
                         ),
                     );
@@ -765,7 +765,7 @@ public function forMethod(string $className, string $methodName): MetadataCollec
                     assert($attributeInstance instanceof RequiresPhp);
 
                     $result[] = Metadata::requiresPhpOnMethod(
-                        ConstraintRequirement::from(
+                        Requirement::from(
                             $attributeInstance->versionRequirement(),
                         ),
                     );
@@ -779,7 +779,7 @@ public function forMethod(string $className, string $methodName): MetadataCollec
                     $versionRequirement = $attributeInstance->versionRequirement();
 
                     if ($versionRequirement !== null) {
-                        $versionConstraint = ConstraintRequirement::from($versionRequirement);
+                        $versionConstraint = Requirement::from($versionRequirement);
                     }
 
                     $result[] = Metadata::requiresPhpExtensionOnMethod(
@@ -793,7 +793,7 @@ public function forMethod(string $className, string $methodName): MetadataCollec
                     assert($attributeInstance instanceof RequiresPhpunit);
 
                     $result[] = Metadata::requiresPhpunitOnMethod(
-                        ConstraintRequirement::from(
+                        Requirement::from(
                             $attributeInstance->versionRequirement(),
                         ),
                     );