[Validator][ULID] Stop to first violation

ogizanagi · ogizanagi · commit 7554478ecb23 · 2022-09-06T14:53:09.000+02:00
diff --git a/src/Symfony/Component/Validator/Constraints/UlidValidator.php b/src/Symfony/Component/Validator/Constraints/UlidValidator.php
@@ -48,13 +48,17 @@ public function validate($value, Constraint $constraint)
                 ->setParameter('{{ value }}', $this->formatValue($value))
                 ->setCode(26 > \strlen($value) ? Ulid::TOO_SHORT_ERROR : Ulid::TOO_LONG_ERROR)
                 ->addViolation();
+
+            return;
         }
 
         if (\strlen($value) !== strspn($value, '0123456789ABCDEFGHJKMNPQRSTVWXYZabcdefghjkmnpqrstvwxyz')) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
                 ->setCode(Ulid::INVALID_CHARACTERS_ERROR)
                 ->addViolation();
+
+            return;
         }
 
         // Largest valid ULID is '7ZZZZZZZZZZZZZZZZZZZZZZZZZ'
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UlidValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UlidValidatorTest.php
@@ -78,6 +78,7 @@ public function getInvalidUlids()
             ['01ARZ3NDEKTSV4RRFFQ69G5FAVA', Ulid::TOO_LONG_ERROR],
             ['01ARZ3NDEKTSV4RRFFQ69G5FAO', Ulid::INVALID_CHARACTERS_ERROR],
             ['Z1ARZ3NDEKTSV4RRFFQ69G5FAV', Ulid::TOO_LARGE_ERROR],
+            ['not-even-ulid-like', Ulid::TOO_SHORT_ERROR],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ public function getInvalidUlids()`
`78`	`78`	`['01ARZ3NDEKTSV4RRFFQ69G5FAVA', Ulid::TOO_LONG_ERROR],`
`79`	`79`	`['01ARZ3NDEKTSV4RRFFQ69G5FAO', Ulid::INVALID_CHARACTERS_ERROR],`
`80`	`80`	`['Z1ARZ3NDEKTSV4RRFFQ69G5FAV', Ulid::TOO_LARGE_ERROR],`
	`81`	`+ ['not-even-ulid-like', Ulid::TOO_SHORT_ERROR],`
`81`	`82`	`];`
`82`	`83`	`}`
`83`	`84`