symfony · ABGEO · Apr 23, 2020 · Apr 25, 2020 · Apr 25, 2020 · Apr 25, 2020
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 5.1.0
 -----

+ * allow multiple `atPath()` on ConstraintViolationBuilder
 * added the `Hostname` constraint and validator
 * added the `alpha3` option to the `Country` and `Language` constraints
 * allow to define a reusable set of constraints by extending the `Compound` constraint

diff --git a/src/Symfony/Component/Validator/Tests/ConstraintViolationBuilderTest.php b/src/Symfony/Component/Validator/Tests/ConstraintViolationBuilderTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Translation\Translator;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Validator\ConstraintViolationList;
+use Symfony\Component\Validator\Violation\ConstraintViolationBuilder;
+
+class ConstraintViolationBuilderTest extends TestCase
+{
+    private $violations;
+    private $builder;
+
+    protected function setUp(): void
+    {
+        $this->violations = new ConstraintViolationList();
+
+        $this->builder = new ConstraintViolationBuilder(
+            $this->violations,
+            new NotBlank(),
+            'myMessage',
+            [],
+            null,
+            'root',
+            null,
+            new Translator('en_EN')
+        );
+    }
+
+    public function testMultipleAtPathCall()
+    {
+        $this->builder
+            ->atPath('firstName')
+            ->atPath('lastName')
+            ->atPath('email')
+            ->addViolation();
+
+        $violationFirst = $this->violations->get(0);
+        $violationLast = $this->violations->get(2);
+
+        $this->assertCount(3, $this->violations);
+        $this->assertEquals('root.firstName', $violationFirst->getPropertyPath());
+        $this->assertEquals('myMessage', $violationFirst->getMessage());
+        $this->assertEquals('root.email', $violationLast->getPropertyPath());
+        $this->assertEquals('myMessage', $violationLast->getMessage());
+    }
+}
diff --git a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php
@@ -31,7 +31,8 @@ class ConstraintViolationBuilder implements ConstraintViolationBuilderInterface
    private $parameters;
    private $root;
    private $invalidValue;
-    private $propertyPath;
+    private $basePropertyPath;
+    private $propertyPaths;
    private $translator;
    private $translationDomain;
    private $plural;
@@ -52,7 +53,8 @@ public function __construct(ConstraintViolationList $violations, Constraint $con
        $this->message = $message;
        $this->parameters = $parameters;
        $this->root = $root;
-        $this->propertyPath = $propertyPath;
+        $this->basePropertyPath = $propertyPath;
+        $this->propertyPaths = [];
        $this->invalidValue = $invalidValue;
        $this->translator = $translator;
        $this->translationDomain = $translationDomain;
@@ -64,7 +66,7 @@ public function __construct(ConstraintViolationList $violations, Constraint $con
     */
    public function atPath(string $path)
    {
-        $this->propertyPath = PropertyPath::append($this->propertyPath, $path);
+        $this->propertyPaths[] = PropertyPath::append($this->basePropertyPath, $path);

        return $this;
    }
@@ -144,6 +146,8 @@ public function setCause($cause)
     */
    public function addViolation()
    {
+        $paths = empty($this->propertyPaths) ? [$this->basePropertyPath] : $this->propertyPaths;
+
        if (null === $this->plural) {
            $translatedMessage = $this->translator->trans(
                $this->message,
@@ -158,17 +162,19 @@ public function addViolation()
            );
        }

-        $this->violations->add(new ConstraintViolation(
-            $translatedMessage,
-            $this->message,
-            $this->parameters,
-            $this->root,
-            $this->propertyPath,
-            $this->invalidValue,
-            $this->plural,
-            $this->code,
-            $this->constraint,
-            $this->cause
-        ));
+        foreach ($paths as $propertyPath) {
+            $this->violations->add(new ConstraintViolation(
+                $translatedMessage,
+                $this->message,
+                $this->parameters,
+                $this->root,
+                $propertyPath,
+                $this->invalidValue,
+                $this->plural,
+                $this->code,
+                $this->constraint,
+                $this->cause
+            ));
+        }
    }
 }