[Validator] enter the context in which to validate

xabbuh · xabbuh · commit 7359cbe0631e · 2017-11-16T09:10:44.000+01:00
diff --git a/src/Symfony/Component/Validator/Constraints/ValidValidator.php b/src/Symfony/Component/Validator/Constraints/ValidValidator.php
@@ -26,12 +26,9 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Valid');
         }
 
-        $violations = $this->context->getValidator()->validate($value, null, array($this->context->getGroup()));
-
-        foreach ($violations as $violation) {
-            $this->context->buildViolation($violation->getMessage(), $violation->getParameters())
-                ->atPath($violation->getPropertyPath())
-                ->addViolation();
-        }
+        $this->context
+            ->getValidator()
+            ->inContext($this->context)
+            ->validate($value, null, array($this->context->getGroup()));
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ValidValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ValidValidatorTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Symfony\Component\Validator\Tests\Constraints;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Constraints\ValidValidator;
+use Symfony\Component\Validator\ValidatorBuilder;
+
+class ValidValidatorTest extends TestCase
+{
+    public function testPropertyPathsArePassedToNestedContexts()
+    {
+        $validatorBuilder = new ValidatorBuilder();
+        $validator = $validatorBuilder->enableAnnotationMapping()->getValidator();
+
+        $violations = $validator->validate(new Foo(), null, array('nested'));
+
+        $this->assertCount(1, $violations);
+        $this->assertSame('fooBar.fooBarBaz.foo', $violations->get(0)->getPropertyPath());
+    }
+
+    protected function createValidator()
+    {
+        return new ValidValidator();
+    }
+}
+
+class Foo
+{
+    /**
+     * @Assert\Valid(groups={"nested"})
+     */
+    public $fooBar;
+
+    public function __construct()
+    {
+        $this->fooBar = new FooBar();
+    }
+}
+
+class FooBar
+{
+    /**
+     * @Assert\Valid(groups={"nested"})
+     */
+    public $fooBarBaz;
+
+    public function __construct()
+    {
+        $this->fooBarBaz = new FooBarBaz();
+    }
+}
+
+class FooBarBaz
+{
+    /**
+     * @Assert\NotBlank(groups={"nested"})
+     */
+    public $foo;
+}

Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,9 @@ public function validate($value, Constraint $constraint)`
`26`	`26`	`throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Valid');`
`27`	`27`	`}`
`28`	`28`
`29`		`- $violations = $this->context->getValidator()->validate($value, null, array($this->context->getGroup()));`
`30`		`-`
`31`		`- foreach ($violations as $violation) {`
`32`		`- $this->context->buildViolation($violation->getMessage(), $violation->getParameters())`
`33`		`- ->atPath($violation->getPropertyPath())`
`34`		`- ->addViolation();`
`35`		`- }`
	`29`	`+ $this->context`
	`30`	`+ ->getValidator()`
	`31`	`+ ->inContext($this->context)`
	`32`	`+ ->validate($value, null, array($this->context->getGroup()));`
`36`	`33`	`}`
`37`	`34`	`}`