diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Validator] Fixed ExpressionValidator when the validation root is not an object

This commit is contained in:
Bernhard Schussek 2014-07-28 16:32:19 +02:00
parent ef6f5f50c5
commit 2bf1b375c1
2 changed files with 66 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Symfony/Component/Validator/Constraints/ExpressionValidator.php
View File

@ -74,14 +74,18 @@ class ExpressionValidator extends ConstraintValidator
$variables['value'] = $value;
$variables['this'] = $value;
} else {
// Extract the object that the property belongs to from the object
// graph
$path = new PropertyPath($this->context->getPropertyPath());
$parentPath = $path->getParent();
$root = $this->context->getRoot();
$variables['value'] = $value;
$variables['this'] = $parentPath ? $this->getPropertyAccessor()->getValue($root, $parentPath) : $root;
if (is_object($root)) {
// Extract the object that the property belongs to from the object
// graph
$path = new PropertyPath($this->context->getPropertyPath());
$parentPath = $path->getParent();
$variables['this'] = $parentPath ? $this->getPropertyAccessor()->getValue($root, $parentPath) : $root;
} else {
$variables['this'] = null;
}
}
if (!$this->getExpressionLanguage()->evaluate($constraint->expression, $variables)) {

56
src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php
View File

@ -194,4 +194,60 @@ class ExpressionValidatorTest extends \PHPUnit_Framework_TestCase
$this->validator->validate('2', $constraint);
}
/**
* When validatePropertyValue() is called with a class name
* https://github.com/symfony/symfony/pull/11498
*/
public function testSucceedingExpressionAtPropertyLevelWithoutRoot()
{
$constraint = new Expression('value == "1"');
$this->context->expects($this->any())
->method('getPropertyName')
->will($this->returnValue('property'));
$this->context->expects($this->any())
->method('getPropertyPath')
->will($this->returnValue(''));
$this->context->expects($this->any())
->method('getRoot')
->will($this->returnValue('1'));
$this->context->expects($this->never())
->method('addViolation');
$this->validator->validate('1', $constraint);
}
/**
* When validatePropertyValue() is called with a class name
* https://github.com/symfony/symfony/pull/11498
*/
public function testFailingExpressionAtPropertyLevelWithoutRoot()
{
$constraint = new Expression(array(
'expression' => 'value == "1"',
'message' => 'myMessage',
));
$this->context->expects($this->any())
->method('getPropertyName')
->will($this->returnValue('property'));
$this->context->expects($this->any())
->method('getPropertyPath')
->will($this->returnValue(''));
$this->context->expects($this->any())
->method('getRoot')
->will($this->returnValue('2'));
$this->context->expects($this->once())
->method('addViolation')
->with('myMessage');
$this->validator->validate('2', $constraint);
}
}