Rename option to stopOnFirst

Jean-Beru · Jean-Beru · commit 8f36692dba04 · 2025-02-06T10:35:27.000+01:00
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.3
+---
+
+ * Add the `stopOnFirstError` option to the `Unique` constraint
+
 7.2
 ---
 
diff --git a/src/Symfony/Component/Validator/Constraints/Unique.php b/src/Symfony/Component/Validator/Constraints/Unique.php
@@ -26,7 +26,7 @@ class Unique extends Constraint
 
     public array|string $fields = [];
     public ?string $errorPath = null;
-    public bool $multipleErrors = false;
+    public bool $stopOnFirstError = true;
 
     protected const ERROR_NAMES = [
         self::IS_NOT_UNIQUE => 'IS_NOT_UNIQUE',
@@ -49,15 +49,15 @@ public function __construct(
         mixed $payload = null,
         array|string|null $fields = null,
         ?string $errorPath = null,
-        ?bool $multipleErrors = null,
+        ?bool $stopOnFirstError = null,
     ) {
         parent::__construct($options, $groups, $payload);
 
         $this->message = $message ?? $this->message;
         $this->normalizer = $normalizer ?? $this->normalizer;
         $this->fields = $fields ?? $this->fields;
         $this->errorPath = $errorPath ?? $this->errorPath;
-        $this->multipleErrors = $multipleErrors ?? $this->multipleErrors;
+        $this->stopOnFirstError = $stopOnFirstError ?? $this->stopOnFirstError;
 
         if (null !== $this->normalizer && !\is_callable($this->normalizer)) {
             throw new InvalidArgumentException(\sprintf('The "normalizer" option must be a valid callable ("%s" given).', get_debug_type($this->normalizer)));
diff --git a/src/Symfony/Component/Validator/Constraints/UniqueValidator.php b/src/Symfony/Component/Validator/Constraints/UniqueValidator.php
@@ -51,13 +51,13 @@ public function validate(mixed $value, Constraint $constraint): void
                     ->setParameter('{{ value }}', $this->formatValue($element))
                     ->setCode(Unique::IS_NOT_UNIQUE);
 
-                if ($constraint->multipleErrors || null !== $constraint->errorPath) {
+                if (!$constraint->stopOnFirstError || null !== $constraint->errorPath) {
                     $violationBuilder->atPath("[$index]".(null !== $constraint->errorPath ? ".{$constraint->errorPath}" : ''));
                 }
 
                 $violationBuilder->addViolation();
 
-                if (!$constraint->multipleErrors) {
+                if ($constraint->stopOnFirstError) {
                     return;
                 }
             } else {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UniqueValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UniqueValidatorTest.php
@@ -394,11 +394,11 @@ public function testErrorPathWithNonList()
             ->assertRaised();
     }
 
-    public function testMultiple()
+    public function testWithoutStopOnFirstError()
     {
         $this->validator->validate(
             ['a1', 'a2', 'a1', 'a1', 'a2'],
-            new Unique(multipleErrors: true),
+            new Unique(stopOnFirstError: false),
         );
 
         $this
@@ -420,7 +420,7 @@ public function testMultiple()
             ->assertRaised();
     }
 
-    public function testMultipleWithErrorPath()
+    public function testWithoutStopOnFirstErrorWithErrorPath()
     {
         $array = [
             new DummyClassOne(),
@@ -442,7 +442,7 @@ public function testMultipleWithErrorPath()
                 normalizer: [self::class, 'normalizeDummyClassOne'],
                 fields: 'code',
                 errorPath: 'code',
-                multipleErrors: true,
+                stopOnFirstError: false,
             )
         );
 

Original file line number	Diff line number	Diff line change
`@@ -51,13 +51,13 @@ public function validate(mixed $value, Constraint $constraint): void`
`51`	`51`	`->setParameter('{{ value }}', $this->formatValue($element))`
`52`	`52`	`->setCode(Unique::IS_NOT_UNIQUE);`
`53`	`53`
`54`		`- if ($constraint->multipleErrors \|\| null !== $constraint->errorPath) {`
	`54`	`+ if (!$constraint->stopOnFirstError \|\| null !== $constraint->errorPath) {`
`55`	`55`	`$violationBuilder->atPath("[$index]".(null !== $constraint->errorPath ? ".{$constraint->errorPath}" : ''));`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`$violationBuilder->addViolation();`
`59`	`59`
`60`		`- if (!$constraint->multipleErrors) {`
	`60`	`+ if ($constraint->stopOnFirstError) {`
`61`	`61`	`return;`
`62`	`62`	`}`
`63`	`63`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -394,11 +394,11 @@ public function testErrorPathWithNonList()`
`394`	`394`	`->assertRaised();`
`395`	`395`	`}`
`396`	`396`
`397`		`- public function testMultiple()`
	`397`	`+ public function testWithoutStopOnFirstError()`
`398`	`398`	`{`
`399`	`399`	`$this->validator->validate(`
`400`	`400`	`['a1', 'a2', 'a1', 'a1', 'a2'],`
`401`		`- new Unique(multipleErrors: true),`
	`401`	`+ new Unique(stopOnFirstError: false),`
`402`	`402`	`);`
`403`	`403`
`404`	`404`	`$this`
`@@ -420,7 +420,7 @@ public function testMultiple()`
`420`	`420`	`->assertRaised();`
`421`	`421`	`}`
`422`	`422`
`423`		`- public function testMultipleWithErrorPath()`
	`423`	`+ public function testWithoutStopOnFirstErrorWithErrorPath()`
`424`	`424`	`{`
`425`	`425`	`$array = [`
`426`	`426`	`new DummyClassOne(),`
`@@ -442,7 +442,7 @@ public function testMultipleWithErrorPath()`
`442`	`442`	`normalizer: [self::class, 'normalizeDummyClassOne'],`
`443`	`443`	`fields: 'code',`
`444`	`444`	`errorPath: 'code',`
`445`		`- multipleErrors: true,`
	`445`	`+ stopOnFirstError: false,`
`446`	`446`	`)`
`447`	`447`	`);`
`448`	`448`