merged branch bschussek/issue6246 (PR #6322)
This PR was merged into the master branch.
Commits
-------
81bdab8
[Validator] Fixed: Arrays are validated recursively by default
Discussion
----------
[Validator] Arrays are validated recursively now by default
Bug fix: yes
Feature addition: yes?
Backwards compatibility break: yes
Symfony2 tests pass: yes
Fixes the following tickets: #6246
Todo: -
License of the code: MIT
Documentation PR: -
This commit is contained in:
commit
21f8f8c62d
@ -26,6 +26,8 @@ CHANGELOG
|
|||||||
* changed `ValidatorInterface::getMetadataFactory` to return a `MetadataFactoryInterface` instead of a `ClassMetadataFactoryInterface`
|
* changed `ValidatorInterface::getMetadataFactory` to return a `MetadataFactoryInterface` instead of a `ClassMetadataFactoryInterface`
|
||||||
* removed `ClassMetadataFactoryInterface` type hint from `ValidatorBuilderInterface::setMetadataFactory`.
|
* removed `ClassMetadataFactoryInterface` type hint from `ValidatorBuilderInterface::setMetadataFactory`.
|
||||||
As of Symfony 2.3, this method will be typed against `MetadataFactoryInterface` instead.
|
As of Symfony 2.3, this method will be typed against `MetadataFactoryInterface` instead.
|
||||||
|
* [BC BREAK] the switches `traverse` and `deep` in the `Valid` constraint and in `GraphWalker::walkReference`
|
||||||
|
are ignored for arrays now. Arrays are always traversed recursively.
|
||||||
|
|
||||||
2.1.0
|
2.1.0
|
||||||
-----
|
-----
|
||||||
|
@ -426,6 +426,46 @@ class ValidationVisitorTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->assertEquals($violations, $this->visitor->getViolations());
|
$this->assertEquals($violations, $this->visitor->getViolations());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// https://github.com/symfony/symfony/issues/6246
|
||||||
|
public function testValidateCascadedPropertyRecursesArraysByDefault()
|
||||||
|
{
|
||||||
|
$entity = new Entity();
|
||||||
|
$entity->reference = array(
|
||||||
|
'key' => array(
|
||||||
|
'nested' => new Entity(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
// add a constraint for the entity that always fails
|
||||||
|
$this->metadata->addConstraint(new FailingConstraint());
|
||||||
|
|
||||||
|
// validate iterator when validating the property "reference"
|
||||||
|
$this->metadata->addPropertyConstraint('reference', new Valid());
|
||||||
|
|
||||||
|
$this->visitor->validate($entity, 'Default', '');
|
||||||
|
|
||||||
|
$violations = new ConstraintViolationList(array(
|
||||||
|
// generated by the root object
|
||||||
|
new ConstraintViolation(
|
||||||
|
'Failed',
|
||||||
|
array(),
|
||||||
|
'Root',
|
||||||
|
'',
|
||||||
|
$entity
|
||||||
|
),
|
||||||
|
// nothing generated by the reference!
|
||||||
|
new ConstraintViolation(
|
||||||
|
'Failed',
|
||||||
|
array(),
|
||||||
|
'Root',
|
||||||
|
'reference[key][nested]',
|
||||||
|
$entity->reference['key']['nested']
|
||||||
|
),
|
||||||
|
));
|
||||||
|
|
||||||
|
$this->assertEquals($violations, $this->visitor->getViolations());
|
||||||
|
}
|
||||||
|
|
||||||
public function testValidateCascadedPropertyRecursesIfDeepIsSet()
|
public function testValidateCascadedPropertyRecursesIfDeepIsSet()
|
||||||
{
|
{
|
||||||
$entity = new Entity();
|
$entity = new Entity();
|
||||||
|
@ -129,7 +129,10 @@ class ValidationVisitor implements ValidationVisitorInterface, GlobalExecutionCo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($traverse && (is_array($value) || $value instanceof \Traversable)) {
|
// Validate arrays recursively by default, otherwise every driver needs
|
||||||
|
// to implement special handling for arrays.
|
||||||
|
// https://github.com/symfony/symfony/issues/6246
|
||||||
|
if (is_array($value) || ($traverse && $value instanceof \Traversable)) {
|
||||||
foreach ($value as $key => $element) {
|
foreach ($value as $key => $element) {
|
||||||
// Ignore any scalar values in the collection
|
// Ignore any scalar values in the collection
|
||||||
if (is_object($element) || is_array($element)) {
|
if (is_object($element) || is_array($element)) {
|
||||||
|
Reference in New Issue
Block a user