Merge branch '10.5' into 11.5

Author: sebastianbergmann

src/Metadata/Parser/AttributeParser.php

@@ -80,7 +80,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;
 
@@ -275,7 +275,7 @@ public function forClass(string $className): MetadataCollection
                     assert($attributeInstance instanceof RequiresPhp);
 
                     $result[] = Metadata::requiresPhpOnClass(
-                        ConstraintRequirement::from(
+                        Requirement::from(
                             $attributeInstance->versionRequirement(),
                         ),
                     );
@@ -289,7 +289,7 @@ public function forClass(string $className): MetadataCollection
                     $versionRequirement = $attributeInstance->versionRequirement();
 
                     if ($versionRequirement !== null) {
-                        $versionConstraint = ConstraintRequirement::from($versionRequirement);
+                        $versionConstraint = Requirement::from($versionRequirement);
                     }
 
                     $result[] = Metadata::requiresPhpExtensionOnClass(
@@ -303,7 +303,7 @@ public function forClass(string $className): MetadataCollection
                     assert($attributeInstance instanceof RequiresPhpunit);
 
                     $result[] = Metadata::requiresPhpunitOnClass(
-                        ConstraintRequirement::from(
+                        Requirement::from(
                             $attributeInstance->versionRequirement(),
                         ),
                     );
@@ -655,7 +655,7 @@ public function forMethod(string $className, string $methodName): MetadataCollec
                     assert($attributeInstance instanceof RequiresPhp);
 
                     $result[] = Metadata::requiresPhpOnMethod(
-                        ConstraintRequirement::from(
+                        Requirement::from(
                             $attributeInstance->versionRequirement(),
                         ),
                     );
@@ -669,7 +669,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(
@@ -683,7 +683,7 @@ public function forMethod(string $className, string $methodName): MetadataCollec
                     assert($attributeInstance instanceof RequiresPhpunit);
 
                     $result[] = Metadata::requiresPhpunitOnMethod(
-                        ConstraintRequirement::from(
+                        Requirement::from(
                             $attributeInstance->versionRequirement(),
                         ),
                     );