bug #25529 [Validator] Fix access to root object when using composite constraint (ostrolucky)

fabpot · fabpot · commit d975ad63a07c · 2018-01-03T09:00:37.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [Validator] Fix access to root object when using composite constraint | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #12315, #20477, #21706 | License | MIT | Doc PR | Commits ------- b18cdcf [Validator] Fix access to root object when using composite constraint
diff --git a/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Constraints\Collection;
+use Symfony\Component\Validator\Constraints\Expression;
 use Symfony\Component\Validator\Constraints\GroupSequence;
 use Symfony\Component\Validator\Constraints\NotNull;
 use Symfony\Component\Validator\Constraints\Traverse;
@@ -648,6 +649,7 @@ public function testAccessCurrentObject()
         $called = false;
         $entity = new Entity();
         $entity->firstName = 'Bernhard';
+        $entity->data = array('firstName' => 'Bernhard');
 
         $callback = function ($value, ExecutionContextInterface $context) use ($test, $entity, &$called) {
             $called = true;
@@ -656,6 +658,7 @@ public function testAccessCurrentObject()
 
         $this->metadata->addConstraint(new Callback($callback));
         $this->metadata->addPropertyConstraint('firstName', new Callback($callback));
+        $this->metadata->addPropertyConstraint('data', new Collection(array('firstName' => new Expression('value == this.firstName'))));
 
         $this->validator->validate($entity);
 
diff --git a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
@@ -108,7 +108,7 @@ public function validate($value, $constraints = null, $groups = null)
 
             $this->validateGenericNode(
                 $value,
-                null,
+                $previousObject,
                 is_object($value) ? spl_object_hash($value) : null,
                 $metadata,
                 $this->defaultPropertyPath,

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public function validate($value, $constraints = null, $groups = null)`
`108`	`108`
`109`	`109`	`$this->validateGenericNode(`
`110`	`110`	`$value,`
`111`		`- null,`
	`111`	`+ $previousObject,`
`112`	`112`	`is_object($value) ? spl_object_hash($value) : null,`
`113`	`113`	`$metadata,`
`114`	`114`	`$this->defaultPropertyPath,`