bug #40211 [Validator] fix taking error message from the correct violation (xabbuh)

xabbuh · xabbuh · commit b148f8935bbd · 2021-02-17T12:42:45.000+01:00
This PR was merged into the 5.2 branch. Discussion ---------- [Validator] fix taking error message from the correct violation | Q | A | ------------- | --- | Branch? | 5.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #40082 | License | MIT | Doc PR | Commits ------- 32cd77a fix taking error message from the correct violation
diff --git a/src/Symfony/Component/Validator/Constraints/AtLeastOneOfValidator.php b/src/Symfony/Component/Validator/Constraints/AtLeastOneOfValidator.php
@@ -48,7 +48,7 @@ public function validate($value, Constraint $constraint)
                 if ($item instanceof All || $item instanceof Collection) {
                     $message .= $constraint->messageCollection;
                 } else {
-                    $message .= $violations->get(0)->getMessage();
+                    $message .= $violations->get(\count($violations) - 1)->getMessage();
                 }
 
                 $messages[] = $message;
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/AtLeastOneOfValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/AtLeastOneOfValidatorTest.php
@@ -206,6 +206,35 @@ public function hasMetadataFor($classOrObject): bool
 
         $this->assertCount(0, $violations);
     }
+
+    public function testEmbeddedMessageTakenFromFailingConstraint()
+    {
+        $validator = Validation::createValidatorBuilder()
+            ->setMetadataFactory(new class() implements MetadataFactoryInterface {
+                public function getMetadataFor($classOrObject): MetadataInterface
+                {
+                    return (new ClassMetadata(Data::class))
+                        ->addPropertyConstraint('foo', new NotNull(['message' => 'custom message foo']))
+                        ->addPropertyConstraint('bar', new AtLeastOneOf([
+                            new NotNull(['message' => 'custom message bar']),
+                        ]))
+                    ;
+                }
+
+                public function hasMetadataFor($classOrObject): bool
+                {
+                    return Data::class === $classOrObject;
+                }
+            })
+            ->getValidator()
+        ;
+
+        $violations = $validator->validate(new Data(), new Valid());
+
+        $this->assertCount(2, $violations);
+        $this->assertSame('custom message foo', $violations->get(0)->getMessage());
+        $this->assertSame('This value should satisfy at least one of the following constraints: [1] custom message bar', $violations->get(1)->getMessage());
+    }
 }
 
 class ExpressionConstraintNested
@@ -217,3 +246,9 @@ public function getFoobar(): string
         return 'bar';
     }
 }
+
+class Data
+{
+    public $foo;
+    public $bar;
+}

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function validate($value, Constraint $constraint)`
`48`	`48`	`if ($item instanceof All \|\| $item instanceof Collection) {`
`49`	`49`	`$message .= $constraint->messageCollection;`
`50`	`50`	`} else {`
`51`		`- $message .= $violations->get(0)->getMessage();`
	`51`	`+ $message .= $violations->get(\count($violations) - 1)->getMessage();`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`$messages[] = $message;`