From 1678a3dbdf09c4d5b41e2af627fbd09a1cee0148 Mon Sep 17 00:00:00 2001 From: Bernhard Schussek Date: Sat, 28 Jan 2012 15:21:08 +0100 Subject: [PATCH] [Validator] Fixed: Validator::validateValue() propagates empty validation root instead of the provided value --- src/Symfony/Component/Validator/Validator.php | 2 +- .../Tests/Component/Validator/ValidatorTest.php | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Validator/Validator.php b/src/Symfony/Component/Validator/Validator.php index d20a623256..54ae2f9456 100644 --- a/src/Symfony/Component/Validator/Validator.php +++ b/src/Symfony/Component/Validator/Validator.php @@ -108,7 +108,7 @@ class Validator implements ValidatorInterface return $walker->walkConstraint($constraint, $value, $group, ''); }; - return $this->validateGraph($value, $walk, $groups); + return $this->validateGraph('', $walk, $groups); } protected function validateGraph($root, \Closure $walk, $groups = null) diff --git a/tests/Symfony/Tests/Component/Validator/ValidatorTest.php b/tests/Symfony/Tests/Component/Validator/ValidatorTest.php index 86c8ee98a6..c161a49970 100644 --- a/tests/Symfony/Tests/Component/Validator/ValidatorTest.php +++ b/tests/Symfony/Tests/Component/Validator/ValidatorTest.php @@ -148,9 +148,16 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase public function testValidateValue() { - $result = $this->validator->validateValue('Bernhard', new FailingConstraint()); + $violations = new ConstraintViolationList(); + $violations->add(new ConstraintViolation( + '', + array(), + '', + '', + 'Bernhard' + )); - $this->assertCount(1, $result); + $this->assertEquals($violations, $this->validator->validateValue('Bernhard', new FailingConstraint())); } public function testGetMetadataFactory()