[Validator] Allow single integer for the versions option of the Uuid constraint

alexandre-daubois · alexandre-daubois · commit 3f52000502a2 · 2023-05-25T13:55:12.000+02:00
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.4
+---
+
+ * Allow single integer for the `versions` option of the `Uuid` constraint
+
 6.3
 ---
 
diff --git a/src/Symfony/Component/Validator/Constraints/Uuid.php b/src/Symfony/Component/Validator/Constraints/Uuid.php
@@ -100,12 +100,12 @@ class Uuid extends Constraint
     public $normalizer;
 
     /**
-     * @param int[]|null $versions
+     * @param int[]|int|null $versions
      */
     public function __construct(
         array $options = null,
         string $message = null,
-        array $versions = null,
+        array|int $versions = null,
         bool $strict = null,
         callable $normalizer = null,
         array $groups = null,
@@ -114,7 +114,7 @@ public function __construct(
         parent::__construct($options, $groups, $payload);
 
         $this->message = $message ?? $this->message;
-        $this->versions = $versions ?? $this->versions;
+        $this->versions = (array) ($versions ?? $this->versions);
         $this->strict = $strict ?? $this->strict;
         $this->normalizer = $normalizer ?? $this->normalizer;
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php
@@ -296,4 +296,13 @@ public static function getUuidForTimeBasedAssertions(): \Generator
         yield Uuid::V7_MONOTONIC => ['0184c292-b133-7e10-a3b4-d49c1ab49b2a', true];
         yield Uuid::V8_CUSTOM => ['00112233-4455-8677-8899-aabbccddeeff', false];
     }
+
+    public function testAcceptsSingleIntegerAsVersion()
+    {
+        $constraint = new Uuid(versions: 7);
+
+        $this->validator->validate('0184c292-b133-7e10-a3b4-d49c1ab49b2a', $constraint);
+
+        $this->assertNoViolation();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -296,4 +296,13 @@ public static function getUuidForTimeBasedAssertions(): \Generator`
`296`	`296`	`yield Uuid::V7_MONOTONIC => ['0184c292-b133-7e10-a3b4-d49c1ab49b2a', true];`
`297`	`297`	`yield Uuid::V8_CUSTOM => ['00112233-4455-8677-8899-aabbccddeeff', false];`
`298`	`298`	`}`
	`299`	`+`
	`300`	`+ public function testAcceptsSingleIntegerAsVersion()`
	`301`	`+ {`
	`302`	`+ $constraint = new Uuid(versions: 7);`
	`303`	`+`
	`304`	`+ $this->validator->validate('0184c292-b133-7e10-a3b4-d49c1ab49b2a', $constraint);`
	`305`	`+`
	`306`	`+ $this->assertNoViolation();`
	`307`	`+ }`
`299`	`308`	`}`