[Form] removed usage of Validator deprecated features
This commit is contained in:
parent
8fd32ba9fe
commit
17cedd3435
@ -14,7 +14,6 @@ namespace Symfony\Component\Form\Extension\Validator\EventListener;
|
||||
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
|
||||
use Symfony\Component\Form\Extension\Validator\ViolationMapper\ViolationMapperInterface;
|
||||
use Symfony\Component\Validator\Validator\ValidatorInterface;
|
||||
use Symfony\Component\Validator\ValidatorInterface as LegacyValidatorInterface;
|
||||
use Symfony\Component\Form\FormEvents;
|
||||
use Symfony\Component\Form\FormEvent;
|
||||
use Symfony\Component\Form\Extension\Validator\Constraints\Form;
|
||||
@ -37,15 +36,11 @@ class ValidationListener implements EventSubscriberInterface
|
||||
}
|
||||
|
||||
/**
|
||||
* @param ValidatorInterface|LegacyValidatorInterface $validator
|
||||
* @param ViolationMapperInterface $violationMapper
|
||||
* @param ValidatorInterface $validator
|
||||
* @param ViolationMapperInterface $violationMapper
|
||||
*/
|
||||
public function __construct($validator, ViolationMapperInterface $violationMapper)
|
||||
public function __construct(ValidatorInterface $validator, ViolationMapperInterface $violationMapper)
|
||||
{
|
||||
if (!$validator instanceof ValidatorInterface && !$validator instanceof LegacyValidatorInterface) {
|
||||
throw new \InvalidArgumentException('Validator must be instance of Symfony\Component\Validator\Validator\ValidatorInterface or Symfony\Component\Validator\ValidatorInterface');
|
||||
}
|
||||
|
||||
$this->validator = $validator;
|
||||
$this->violationMapper = $violationMapper;
|
||||
}
|
||||
|
@ -15,7 +15,6 @@ use Symfony\Component\Form\FormBuilderInterface;
|
||||
use Symfony\Component\Form\Extension\Validator\ViolationMapper\ViolationMapper;
|
||||
use Symfony\Component\Form\Extension\Validator\EventListener\ValidationListener;
|
||||
use Symfony\Component\Validator\Validator\ValidatorInterface;
|
||||
use Symfony\Component\Validator\ValidatorInterface as LegacyValidatorInterface;
|
||||
use Symfony\Component\OptionsResolver\Options;
|
||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
|
||||
@ -35,14 +34,10 @@ class FormTypeValidatorExtension extends BaseValidatorExtension
|
||||
private $violationMapper;
|
||||
|
||||
/**
|
||||
* @param ValidatorInterface|LegacyValidatorInterface $validator
|
||||
* @param ValidatorInterface $validator
|
||||
*/
|
||||
public function __construct($validator)
|
||||
public function __construct(ValidatorInterface $validator)
|
||||
{
|
||||
if (!$validator instanceof ValidatorInterface && !$validator instanceof LegacyValidatorInterface) {
|
||||
throw new \InvalidArgumentException('Validator must be instance of Symfony\Component\Validator\Validator\ValidatorInterface or Symfony\Component\Validator\ValidatorInterface');
|
||||
}
|
||||
|
||||
$this->validator = $validator;
|
||||
$this->violationMapper = new ViolationMapper();
|
||||
}
|
||||
@ -67,18 +62,9 @@ class FormTypeValidatorExtension extends BaseValidatorExtension
|
||||
return is_object($constraints) ? array($constraints) : (array) $constraints;
|
||||
};
|
||||
|
||||
$cascadeValidationNormalizer = function (Options $options, $cascadeValidation) {
|
||||
if (null !== $cascadeValidation) {
|
||||
@trigger_error('The "cascade_validation" option is deprecated since version 2.8 and will be removed in 3.0. Use "constraints" with a Valid constraint instead.', E_USER_DEPRECATED);
|
||||
}
|
||||
|
||||
return null === $cascadeValidation ? false : $cascadeValidation;
|
||||
};
|
||||
|
||||
$resolver->setDefaults(array(
|
||||
'error_mapping' => array(),
|
||||
'constraints' => array(),
|
||||
'cascade_validation' => null,
|
||||
'invalid_message' => 'This value is not valid.',
|
||||
'invalid_message_parameters' => array(),
|
||||
'allow_extra_fields' => false,
|
||||
@ -86,7 +72,6 @@ class FormTypeValidatorExtension extends BaseValidatorExtension
|
||||
));
|
||||
|
||||
$resolver->setNormalizer('constraints', $constraintsNormalizer);
|
||||
$resolver->setNormalizer('cascade_validation', $cascadeValidationNormalizer);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -11,13 +11,11 @@
|
||||
|
||||
namespace Symfony\Component\Form\Extension\Validator;
|
||||
|
||||
use Symfony\Component\Form\Exception\UnexpectedTypeException;
|
||||
use Symfony\Component\Form\Extension\Validator\Constraints\Form;
|
||||
use Symfony\Component\Form\AbstractExtension;
|
||||
use Symfony\Component\Validator\Constraints\Valid;
|
||||
use Symfony\Component\Validator\Mapping\ClassMetadata;
|
||||
use Symfony\Component\Validator\Validator\ValidatorInterface;
|
||||
use Symfony\Component\Validator\ValidatorInterface as LegacyValidatorInterface;
|
||||
|
||||
/**
|
||||
* Extension supporting the Symfony Validator component in forms.
|
||||
@ -28,22 +26,9 @@ class ValidatorExtension extends AbstractExtension
|
||||
{
|
||||
private $validator;
|
||||
|
||||
/**
|
||||
* @param ValidatorInterface|LegacyValidatorInterface $validator
|
||||
*
|
||||
* @throws UnexpectedTypeException If $validator is invalid
|
||||
*/
|
||||
public function __construct($validator)
|
||||
public function __construct(ValidatorInterface $validator)
|
||||
{
|
||||
// 2.5 API
|
||||
if ($validator instanceof ValidatorInterface) {
|
||||
$metadata = $validator->getMetadataFor('Symfony\Component\Form\Form');
|
||||
// 2.4 API
|
||||
} elseif ($validator instanceof LegacyValidatorInterface) {
|
||||
$metadata = $validator->getMetadataFactory()->getMetadataFor('Symfony\Component\Form\Form');
|
||||
} else {
|
||||
throw new UnexpectedTypeException($validator, 'Symfony\Component\Validator\Validator\ValidatorInterface or Symfony\Component\Validator\ValidatorInterface');
|
||||
}
|
||||
$metadata = $validator->getMetadataFor('Symfony\Component\Form\Form');
|
||||
|
||||
// Register the form constraints in the validator programmatically.
|
||||
// This functionality is required when using the Form component without
|
||||
@ -59,13 +44,7 @@ class ValidatorExtension extends AbstractExtension
|
||||
|
||||
public function loadTypeGuesser()
|
||||
{
|
||||
// 2.5 API
|
||||
if ($this->validator instanceof ValidatorInterface) {
|
||||
return new ValidatorTypeGuesser($this->validator);
|
||||
}
|
||||
|
||||
// 2.4 API
|
||||
return new ValidatorTypeGuesser($this->validator->getMetadataFactory());
|
||||
return new ValidatorTypeGuesser($this->validator);
|
||||
}
|
||||
|
||||
protected function loadTypeExtensions()
|
||||
|
@ -180,33 +180,11 @@ class ValidationListenerTest extends \PHPUnit_Framework_TestCase
|
||||
$this->listener->validateForm(new FormEvent($form, null));
|
||||
}
|
||||
|
||||
public function testValidatorInterfaceSinceSymfony25()
|
||||
public function testValidatorInterface()
|
||||
{
|
||||
// Mock of ValidatorInterface since apiVersion 2.5
|
||||
$validator = $this->getMock('Symfony\Component\Validator\Validator\ValidatorInterface');
|
||||
|
||||
$listener = new ValidationListener($validator, $this->violationMapper);
|
||||
$this->assertAttributeSame($validator, 'validator', $listener);
|
||||
}
|
||||
|
||||
/**
|
||||
* @group legacy
|
||||
*/
|
||||
public function testValidatorInterfaceUntilSymfony24()
|
||||
{
|
||||
// Mock of ValidatorInterface until apiVersion 2.4
|
||||
$validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
|
||||
|
||||
$listener = new ValidationListener($validator, $this->violationMapper);
|
||||
$this->assertAttributeSame($validator, 'validator', $listener);
|
||||
}
|
||||
|
||||
/**
|
||||
* @group legacy
|
||||
* @expectedException \InvalidArgumentException
|
||||
*/
|
||||
public function testInvalidValidatorInterface()
|
||||
{
|
||||
new ValidationListener(null, $this->violationMapper);
|
||||
}
|
||||
}
|
||||
|
@ -45,32 +45,14 @@ class FormTypeValidatorExtensionTest extends BaseValidatorExtensionTest
|
||||
$this->assertSame(array($valid), $form->getConfig()->getOption('constraints'));
|
||||
}
|
||||
|
||||
public function testValidatorInterfaceSinceSymfony25()
|
||||
public function testValidatorInterface()
|
||||
{
|
||||
// Mock of ValidatorInterface since apiVersion 2.5
|
||||
$validator = $this->getMock('Symfony\Component\Validator\Validator\ValidatorInterface');
|
||||
|
||||
$formTypeValidatorExtension = new FormTypeValidatorExtension($validator);
|
||||
$this->assertAttributeSame($validator, 'validator', $formTypeValidatorExtension);
|
||||
}
|
||||
|
||||
public function testValidatorInterfaceUntilSymfony24()
|
||||
{
|
||||
// Mock of ValidatorInterface until apiVersion 2.4
|
||||
$validator = $this->getMock('Symfony\Component\Validator\ValidatorInterface');
|
||||
|
||||
$formTypeValidatorExtension = new FormTypeValidatorExtension($validator);
|
||||
$this->assertAttributeSame($validator, 'validator', $formTypeValidatorExtension);
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException \InvalidArgumentException
|
||||
*/
|
||||
public function testInvalidValidatorInterface()
|
||||
{
|
||||
new FormTypeValidatorExtension(null);
|
||||
}
|
||||
|
||||
protected function createForm(array $options = array())
|
||||
{
|
||||
return $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType', null, $options);
|
||||
|
654
src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php
Normal file
654
src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php
Normal file
@ -0,0 +1,654 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\Validator\Tests\Validator;
|
||||
|
||||
use Symfony\Component\Validator\Constraints\Callback;
|
||||
use Symfony\Component\Validator\Constraints\GroupSequence;
|
||||
use Symfony\Component\Validator\Constraints\NotNull;
|
||||
use Symfony\Component\Validator\Constraints\Traverse;
|
||||
use Symfony\Component\Validator\Constraints\Valid;
|
||||
use Symfony\Component\Validator\ConstraintViolationInterface;
|
||||
use Symfony\Component\Validator\Context\ExecutionContextInterface;
|
||||
use Symfony\Component\Validator\Mapping\ClassMetadata;
|
||||
use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;
|
||||
use Symfony\Component\Validator\Tests\Fixtures\Entity;
|
||||
use Symfony\Component\Validator\Tests\Fixtures\FailingConstraint;
|
||||
use Symfony\Component\Validator\Tests\Fixtures\FakeClassMetadata;
|
||||
use Symfony\Component\Validator\Tests\Fixtures\Reference;
|
||||
use Symfony\Component\Validator\Validator\ValidatorInterface;
|
||||
|
||||
/**
|
||||
* @author Bernhard Schussek <bschussek@gmail.com>
|
||||
*/
|
||||
abstract class AbstractTest extends AbstractValidatorTest
|
||||
{
|
||||
/**
|
||||
* @var ValidatorInterface
|
||||
*/
|
||||
protected $validator;
|
||||
|
||||
/**
|
||||
* @param MetadataFactoryInterface $metadataFactory
|
||||
*
|
||||
* @return ValidatorInterface
|
||||
*/
|
||||
abstract protected function createValidator(MetadataFactoryInterface $metadataFactory, array $objectInitializers = array());
|
||||
|
||||
protected function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
$this->validator = $this->createValidator($this->metadataFactory);
|
||||
}
|
||||
|
||||
protected function validate($value, $constraints = null, $groups = null)
|
||||
{
|
||||
return $this->validator->validate($value, $constraints, $groups);
|
||||
}
|
||||
|
||||
protected function validateProperty($object, $propertyName, $groups = null)
|
||||
{
|
||||
return $this->validator->validateProperty($object, $propertyName, $groups);
|
||||
}
|
||||
|
||||
protected function validatePropertyValue($object, $propertyName, $value, $groups = null)
|
||||
{
|
||||
return $this->validator->validatePropertyValue($object, $propertyName, $value, $groups);
|
||||
}
|
||||
|
||||
public function testValidateConstraintWithoutGroup()
|
||||
{
|
||||
$violations = $this->validator->validate(null, new NotNull());
|
||||
|
||||
$this->assertCount(1, $violations);
|
||||
}
|
||||
|
||||
public function testValidateWithEmptyArrayAsConstraint()
|
||||
{
|
||||
$violations = $this->validator->validate('value', array());
|
||||
$this->assertCount(0, $violations);
|
||||
}
|
||||
|
||||
public function testGroupSequenceAbortsAfterFailedGroup()
|
||||
{
|
||||
$entity = new Entity();
|
||||
|
||||
$callback1 = function ($value, ExecutionContextInterface $context) {
|
||||
$context->addViolation('Message 1');
|
||||
};
|
||||
$callback2 = function ($value, ExecutionContextInterface $context) {
|
||||
$context->addViolation('Message 2');
|
||||
};
|
||||
|
||||
$this->metadata->addConstraint(new Callback(array(
|
||||
'callback' => function () {},
|
||||
'groups' => 'Group 1',
|
||||
)));
|
||||
$this->metadata->addConstraint(new Callback(array(
|
||||
'callback' => $callback1,
|
||||
'groups' => 'Group 2',
|
||||
)));
|
||||
$this->metadata->addConstraint(new Callback(array(
|
||||
'callback' => $callback2,
|
||||
'groups' => 'Group 3',
|
||||
)));
|
||||
|
||||
$sequence = new GroupSequence(array('Group 1', 'Group 2', 'Group 3'));
|
||||
$violations = $this->validator->validate($entity, new Valid(), $sequence);
|
||||
|
||||
/* @var ConstraintViolationInterface[] $violations */
|
||||
$this->assertCount(1, $violations);
|
||||
$this->assertSame('Message 1', $violations[0]->getMessage());
|
||||
}
|
||||
|
||||
public function testGroupSequenceIncludesReferences()
|
||||
{
|
||||
$entity = new Entity();
|
||||
$entity->reference = new Reference();
|
||||
|
||||
$callback1 = function ($value, ExecutionContextInterface $context) {
|
||||
$context->addViolation('Reference violation 1');
|
||||
};
|
||||
$callback2 = function ($value, ExecutionContextInterface $context) {
|
||||
$context->addViolation('Reference violation 2');
|
||||
};
|
||||
|
||||
$this->metadata->addPropertyConstraint('reference', new Valid());
|
||||
$this->referenceMetadata->addConstraint(new Callback(array(
|
||||
'callback' => $callback1,
|
||||
'groups' => 'Group 1',
|
||||
)));
|
||||
$this->referenceMetadata->addConstraint(new Callback(array(
|
||||
'callback' => $callback2,
|
||||
'groups' => 'Group 2',
|
||||
)));
|
||||
|
||||
$sequence = new GroupSequence(array('Group 1', 'Entity'));
|
||||
$violations = $this->validator->validate($entity, new Valid(), $sequence);
|
||||
|
||||
/* @var ConstraintViolationInterface[] $violations */
|
||||
$this->assertCount(1, $violations);
|
||||
$this->assertSame('Reference violation 1', $violations[0]->getMessage());
|
||||
}
|
||||
|
||||
public function testValidateInSeparateContext()
|
||||
{
|
||||
$entity = new Entity();
|
||||
$entity->reference = new Reference();
|
||||
|
||||
$callback1 = function ($value, ExecutionContextInterface $context) use ($entity) {
|
||||
$violations = $context
|
||||
->getValidator()
|
||||
// Since the validator is not context aware, the group must
|
||||
// be passed explicitly
|
||||
->validate($value->reference, new Valid(), 'Group')
|
||||
;
|
||||
|
||||
/* @var ConstraintViolationInterface[] $violations */
|
||||
$this->assertCount(1, $violations);
|
||||
$this->assertSame('Message value', $violations[0]->getMessage());
|
||||
$this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
|
||||
$this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
|
||||
$this->assertSame('', $violations[0]->getPropertyPath());
|
||||
|
||||
// The root is different as we're in a new context
|
||||
$this->assertSame($entity->reference, $violations[0]->getRoot());
|
||||
$this->assertSame($entity->reference, $violations[0]->getInvalidValue());
|
||||
$this->assertNull($violations[0]->getPlural());
|
||||
$this->assertNull($violations[0]->getCode());
|
||||
|
||||
// Verify that this method is called
|
||||
$context->addViolation('Separate violation');
|
||||
};
|
||||
|
||||
$callback2 = function ($value, ExecutionContextInterface $context) use ($entity) {
|
||||
$this->assertSame($this::REFERENCE_CLASS, $context->getClassName());
|
||||
$this->assertNull($context->getPropertyName());
|
||||
$this->assertSame('', $context->getPropertyPath());
|
||||
$this->assertSame('Group', $context->getGroup());
|
||||
$this->assertSame($this->referenceMetadata, $context->getMetadata());
|
||||
$this->assertSame($entity->reference, $context->getRoot());
|
||||
$this->assertSame($entity->reference, $context->getValue());
|
||||
$this->assertSame($entity->reference, $value);
|
||||
|
||||
$context->addViolation('Message %param%', array('%param%' => 'value'));
|
||||
};
|
||||
|
||||
$this->metadata->addConstraint(new Callback(array(
|
||||
'callback' => $callback1,
|
||||
'groups' => 'Group',
|
||||
)));
|
||||
$this->referenceMetadata->addConstraint(new Callback(array(
|
||||
'callback' => $callback2,
|
||||
'groups' => 'Group',
|
||||
)));
|
||||
|
||||
$violations = $this->validator->validate($entity, new Valid(), 'Group');
|
||||
|
||||
/* @var ConstraintViolationInterface[] $violations */
|
||||
$this->assertCount(1, $violations);
|
||||
$this->assertSame('Separate violation', $violations[0]->getMessage());
|
||||
}
|
||||
|
||||
public function testValidateInContext()
|
||||
{
|
||||
$entity = new Entity();
|
||||
$entity->reference = new Reference();
|
||||
|
||||
$callback1 = function ($value, ExecutionContextInterface $context) {
|
||||
$previousValue = $context->getValue();
|
||||
$previousObject = $context->getObject();
|
||||
$previousMetadata = $context->getMetadata();
|
||||
$previousPath = $context->getPropertyPath();
|
||||
$previousGroup = $context->getGroup();
|
||||
|
||||
$context
|
||||
->getValidator()
|
||||
->inContext($context)
|
||||
->atPath('subpath')
|
||||
->validate($value->reference)
|
||||
;
|
||||
|
||||
// context changes shouldn't leak out of the validate() call
|
||||
$this->assertSame($previousValue, $context->getValue());
|
||||
$this->assertSame($previousObject, $context->getObject());
|
||||
$this->assertSame($previousMetadata, $context->getMetadata());
|
||||
$this->assertSame($previousPath, $context->getPropertyPath());
|
||||
$this->assertSame($previousGroup, $context->getGroup());
|
||||
};
|
||||
|
||||
$callback2 = function ($value, ExecutionContextInterface $context) use ($entity) {
|
||||
$this->assertSame($this::REFERENCE_CLASS, $context->getClassName());
|
||||
$this->assertNull($context->getPropertyName());
|
||||
$this->assertSame('subpath', $context->getPropertyPath());
|
||||
$this->assertSame('Group', $context->getGroup());
|
||||
$this->assertSame($this->referenceMetadata, $context->getMetadata());
|
||||
$this->assertSame($entity, $context->getRoot());
|
||||
$this->assertSame($entity->reference, $context->getValue());
|
||||
$this->assertSame($entity->reference, $value);
|
||||
|
||||
$context->addViolation('Message %param%', array('%param%' => 'value'));
|
||||
};
|
||||
|
||||
$this->metadata->addConstraint(new Callback(array(
|
||||
'callback' => $callback1,
|
||||
'groups' => 'Group',
|
||||
)));
|
||||
$this->referenceMetadata->addConstraint(new Callback(array(
|
||||
'callback' => $callback2,
|
||||
'groups' => 'Group',
|
||||
)));
|
||||
|
||||
$violations = $this->validator->validate($entity, new Valid(), 'Group');
|
||||
|
||||
/* @var ConstraintViolationInterface[] $violations */
|
||||
$this->assertCount(1, $violations);
|
||||
$this->assertSame('Message value', $violations[0]->getMessage());
|
||||
$this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
|
||||
$this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
|
||||
$this->assertSame('subpath', $violations[0]->getPropertyPath());
|
||||
$this->assertSame($entity, $violations[0]->getRoot());
|
||||
$this->assertSame($entity->reference, $violations[0]->getInvalidValue());
|
||||
$this->assertNull($violations[0]->getPlural());
|
||||
$this->assertNull($violations[0]->getCode());
|
||||
}
|
||||
|
||||
public function testValidateArrayInContext()
|
||||
{
|
||||
$entity = new Entity();
|
||||
$entity->reference = new Reference();
|
||||
|
||||
$callback1 = function ($value, ExecutionContextInterface $context) {
|
||||
$previousValue = $context->getValue();
|
||||
$previousObject = $context->getObject();
|
||||
$previousMetadata = $context->getMetadata();
|
||||
$previousPath = $context->getPropertyPath();
|
||||
$previousGroup = $context->getGroup();
|
||||
|
||||
$context
|
||||
->getValidator()
|
||||
->inContext($context)
|
||||
->atPath('subpath')
|
||||
->validate(array('key' => $value->reference))
|
||||
;
|
||||
|
||||
// context changes shouldn't leak out of the validate() call
|
||||
$this->assertSame($previousValue, $context->getValue());
|
||||
$this->assertSame($previousObject, $context->getObject());
|
||||
$this->assertSame($previousMetadata, $context->getMetadata());
|
||||
$this->assertSame($previousPath, $context->getPropertyPath());
|
||||
$this->assertSame($previousGroup, $context->getGroup());
|
||||
};
|
||||
|
||||
$callback2 = function ($value, ExecutionContextInterface $context) use ($entity) {
|
||||
$this->assertSame($this::REFERENCE_CLASS, $context->getClassName());
|
||||
$this->assertNull($context->getPropertyName());
|
||||
$this->assertSame('subpath[key]', $context->getPropertyPath());
|
||||
$this->assertSame('Group', $context->getGroup());
|
||||
$this->assertSame($this->referenceMetadata, $context->getMetadata());
|
||||
$this->assertSame($entity, $context->getRoot());
|
||||
$this->assertSame($entity->reference, $context->getValue());
|
||||
$this->assertSame($entity->reference, $value);
|
||||
|
||||
$context->addViolation('Message %param%', array('%param%' => 'value'));
|
||||
};
|
||||
|
||||
$this->metadata->addConstraint(new Callback(array(
|
||||
'callback' => $callback1,
|
||||
'groups' => 'Group',
|
||||
)));
|
||||
$this->referenceMetadata->addConstraint(new Callback(array(
|
||||
'callback' => $callback2,
|
||||
'groups' => 'Group',
|
||||
)));
|
||||
|
||||
$violations = $this->validator->validate($entity, new Valid(), 'Group');
|
||||
|
||||
/* @var ConstraintViolationInterface[] $violations */
|
||||
$this->assertCount(1, $violations);
|
||||
$this->assertSame('Message value', $violations[0]->getMessage());
|
||||
$this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
|
||||
$this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
|
||||
$this->assertSame('subpath[key]', $violations[0]->getPropertyPath());
|
||||
$this->assertSame($entity, $violations[0]->getRoot());
|
||||
$this->assertSame($entity->reference, $violations[0]->getInvalidValue());
|
||||
$this->assertNull($violations[0]->getPlural());
|
||||
$this->assertNull($violations[0]->getCode());
|
||||
}
|
||||
|
||||
public function testTraverseTraversableByDefault()
|
||||
{
|
||||
$entity = new Entity();
|
||||
$traversable = new \ArrayIterator(array('key' => $entity));
|
||||
|
||||
$callback = function ($value, ExecutionContextInterface $context) use ($entity, $traversable) {
|
||||
$this->assertSame($this::ENTITY_CLASS, $context->getClassName());
|
||||
$this->assertNull($context->getPropertyName());
|
||||
$this->assertSame('[key]', $context->getPropertyPath());
|
||||
$this->assertSame('Group', $context->getGroup());
|
||||
$this->assertSame($this->metadata, $context->getMetadata());
|
||||
$this->assertSame($traversable, $context->getRoot());
|
||||
$this->assertSame($entity, $context->getValue());
|
||||
$this->assertSame($entity, $value);
|
||||
|
||||
$context->addViolation('Message %param%', array('%param%' => 'value'));
|
||||
};
|
||||
|
||||
$this->metadataFactory->addMetadata(new ClassMetadata('ArrayIterator'));
|
||||
$this->metadata->addConstraint(new Callback(array(
|
||||
'callback' => $callback,
|
||||
'groups' => 'Group',
|
||||
)));
|
||||
|
||||
$violations = $this->validate($traversable, new Valid(), 'Group');
|
||||
|
||||
/* @var ConstraintViolationInterface[] $violations */
|
||||
$this->assertCount(1, $violations);
|
||||
$this->assertSame('Message value', $violations[0]->getMessage());
|
||||
$this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
|
||||
$this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
|
||||
$this->assertSame('[key]', $violations[0]->getPropertyPath());
|
||||
$this->assertSame($traversable, $violations[0]->getRoot());
|
||||
$this->assertSame($entity, $violations[0]->getInvalidValue());
|
||||
$this->assertNull($violations[0]->getPlural());
|
||||
$this->assertNull($violations[0]->getCode());
|
||||
}
|
||||
|
||||
public function testTraversalEnabledOnClass()
|
||||
{
|
||||
$entity = new Entity();
|
||||
$traversable = new \ArrayIterator(array('key' => $entity));
|
||||
|
||||
$callback = function ($value, ExecutionContextInterface $context) {
|
||||
$context->addViolation('Message');
|
||||
};
|
||||
|
||||
$traversableMetadata = new ClassMetadata('ArrayIterator');
|
||||
$traversableMetadata->addConstraint(new Traverse(true));
|
||||
|
||||
$this->metadataFactory->addMetadata($traversableMetadata);
|
||||
$this->metadata->addConstraint(new Callback(array(
|
||||
'callback' => $callback,
|
||||
'groups' => 'Group',
|
||||
)));
|
||||
|
||||
$violations = $this->validate($traversable, new Valid(), 'Group');
|
||||
|
||||
/* @var ConstraintViolationInterface[] $violations */
|
||||
$this->assertCount(1, $violations);
|
||||
}
|
||||
|
||||
public function testTraversalDisabledOnClass()
|
||||
{
|
||||
$entity = new Entity();
|
||||
$traversable = new \ArrayIterator(array('key' => $entity));
|
||||
|
||||
$callback = function ($value, ExecutionContextInterface $context) {
|
||||
$this->fail('Should not be called');
|
||||
};
|
||||
|
||||
$traversableMetadata = new ClassMetadata('ArrayIterator');
|
||||
$traversableMetadata->addConstraint(new Traverse(false));
|
||||
|
||||
$this->metadataFactory->addMetadata($traversableMetadata);
|
||||
$this->metadata->addConstraint(new Callback(array(
|
||||
'callback' => $callback,
|
||||
'groups' => 'Group',
|
||||
)));
|
||||
|
||||
$violations = $this->validate($traversable, new Valid(), 'Group');
|
||||
|
||||
/* @var ConstraintViolationInterface[] $violations */
|
||||
$this->assertCount(0, $violations);
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
|
||||
*/
|
||||
public function testExpectTraversableIfTraversalEnabledOnClass()
|
||||
{
|
||||
$entity = new Entity();
|
||||
|
||||
$this->metadata->addConstraint(new Traverse(true));
|
||||
|
||||
$this->validator->validate($entity);
|
||||
}
|
||||
|
||||
public function testReferenceTraversalDisabledOnClass()
|
||||
{
|
||||
$entity = new Entity();
|
||||
$entity->reference = new \ArrayIterator(array('key' => new Reference()));
|
||||
|
||||
$callback = function ($value, ExecutionContextInterface $context) {
|
||||
$this->fail('Should not be called');
|
||||
};
|
||||
|
||||
$traversableMetadata = new ClassMetadata('ArrayIterator');
|
||||
$traversableMetadata->addConstraint(new Traverse(false));
|
||||
|
||||
$this->metadataFactory->addMetadata($traversableMetadata);
|
||||
$this->referenceMetadata->addConstraint(new Callback(array(
|
||||
'callback' => $callback,
|
||||
'groups' => 'Group',
|
||||
)));
|
||||
$this->metadata->addPropertyConstraint('reference', new Valid());
|
||||
|
||||
$violations = $this->validate($entity, new Valid(), 'Group');
|
||||
|
||||
/* @var ConstraintViolationInterface[] $violations */
|
||||
$this->assertCount(0, $violations);
|
||||
}
|
||||
|
||||
public function testReferenceTraversalEnabledOnReferenceDisabledOnClass()
|
||||
{
|
||||
$entity = new Entity();
|
||||
$entity->reference = new \ArrayIterator(array('key' => new Reference()));
|
||||
|
||||
$callback = function ($value, ExecutionContextInterface $context) {
|
||||
$this->fail('Should not be called');
|
||||
};
|
||||
|
||||
$traversableMetadata = new ClassMetadata('ArrayIterator');
|
||||
$traversableMetadata->addConstraint(new Traverse(false));
|
||||
|
||||
$this->metadataFactory->addMetadata($traversableMetadata);
|
||||
$this->referenceMetadata->addConstraint(new Callback(array(
|
||||
'callback' => $callback,
|
||||
'groups' => 'Group',
|
||||
)));
|
||||
$this->metadata->addPropertyConstraint('reference', new Valid(array(
|
||||
'traverse' => true,
|
||||
)));
|
||||
|
||||
$violations = $this->validate($entity, new Valid(), 'Group');
|
||||
|
||||
/* @var ConstraintViolationInterface[] $violations */
|
||||
$this->assertCount(0, $violations);
|
||||
}
|
||||
|
||||
public function testReferenceTraversalDisabledOnReferenceEnabledOnClass()
|
||||
{
|
||||
$entity = new Entity();
|
||||
$entity->reference = new \ArrayIterator(array('key' => new Reference()));
|
||||
|
||||
$callback = function ($value, ExecutionContextInterface $context) {
|
||||
$this->fail('Should not be called');
|
||||
};
|
||||
|
||||
$traversableMetadata = new ClassMetadata('ArrayIterator');
|
||||
$traversableMetadata->addConstraint(new Traverse(true));
|
||||
|
||||
$this->metadataFactory->addMetadata($traversableMetadata);
|
||||
$this->referenceMetadata->addConstraint(new Callback(array(
|
||||
'callback' => $callback,
|
||||
'groups' => 'Group',
|
||||
)));
|
||||
$this->metadata->addPropertyConstraint('reference', new Valid(array(
|
||||
'traverse' => false,
|
||||
)));
|
||||
|
||||
$violations = $this->validate($entity, new Valid(), 'Group');
|
||||
|
||||
/* @var ConstraintViolationInterface[] $violations */
|
||||
$this->assertCount(0, $violations);
|
||||
}
|
||||
|
||||
public function testAddCustomizedViolation()
|
||||
{
|
||||
$entity = new Entity();
|
||||
|
||||
$callback = function ($value, ExecutionContextInterface $context) {
|
||||
$context->buildViolation('Message %param%')
|
||||
->setParameter('%param%', 'value')
|
||||
->setInvalidValue('Invalid value')
|
||||
->setPlural(2)
|
||||
->setCode(42)
|
||||
->addViolation();
|
||||
};
|
||||
|
||||
$this->metadata->addConstraint(new Callback($callback));
|
||||
|
||||
$violations = $this->validator->validate($entity);
|
||||
|
||||
/* @var ConstraintViolationInterface[] $violations */
|
||||
$this->assertCount(1, $violations);
|
||||
$this->assertSame('Message value', $violations[0]->getMessage());
|
||||
$this->assertSame('Message %param%', $violations[0]->getMessageTemplate());
|
||||
$this->assertSame(array('%param%' => 'value'), $violations[0]->getParameters());
|
||||
$this->assertSame('', $violations[0]->getPropertyPath());
|
||||
$this->assertSame($entity, $violations[0]->getRoot());
|
||||
$this->assertSame('Invalid value', $violations[0]->getInvalidValue());
|
||||
$this->assertSame(2, $violations[0]->getPlural());
|
||||
$this->assertSame(42, $violations[0]->getCode());
|
||||
}
|
||||
|
||||
public function testNoDuplicateValidationIfClassConstraintInMultipleGroups()
|
||||
{
|
||||
$entity = new Entity();
|
||||
|
||||
$callback = function ($value, ExecutionContextInterface $context) {
|
||||
$context->addViolation('Message');
|
||||
};
|
||||
|
||||
$this->metadata->addConstraint(new Callback(array(
|
||||
'callback' => $callback,
|
||||
'groups' => array('Group 1', 'Group 2'),
|
||||
)));
|
||||
|
||||
$violations = $this->validator->validate($entity, new Valid(), array('Group 1', 'Group 2'));
|
||||
|
||||
/* @var ConstraintViolationInterface[] $violations */
|
||||
$this->assertCount(1, $violations);
|
||||
}
|
||||
|
||||
public function testNoDuplicateValidationIfPropertyConstraintInMultipleGroups()
|
||||
{
|
||||
$entity = new Entity();
|
||||
|
||||
$callback = function ($value, ExecutionContextInterface $context) {
|
||||
$context->addViolation('Message');
|
||||
};
|
||||
|
||||
$this->metadata->addPropertyConstraint('firstName', new Callback(array(
|
||||
'callback' => $callback,
|
||||
'groups' => array('Group 1', 'Group 2'),
|
||||
)));
|
||||
|
||||
$violations = $this->validator->validate($entity, new Valid(), array('Group 1', 'Group 2'));
|
||||
|
||||
/* @var ConstraintViolationInterface[] $violations */
|
||||
$this->assertCount(1, $violations);
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException \Symfony\Component\Validator\Exception\RuntimeException
|
||||
*/
|
||||
public function testValidateFailsIfNoConstraintsAndNoObjectOrArray()
|
||||
{
|
||||
$this->validate('Foobar');
|
||||
}
|
||||
|
||||
public function testAccessCurrentObject()
|
||||
{
|
||||
$called = false;
|
||||
$entity = new Entity();
|
||||
$entity->firstName = 'Bernhard';
|
||||
|
||||
$callback = function ($value, ExecutionContextInterface $context) use ($entity, &$called) {
|
||||
$called = true;
|
||||
$this->assertSame($entity, $context->getObject());
|
||||
};
|
||||
|
||||
$this->metadata->addConstraint(new Callback($callback));
|
||||
$this->metadata->addPropertyConstraint('firstName', new Callback($callback));
|
||||
|
||||
$this->validator->validate($entity);
|
||||
|
||||
$this->assertTrue($called);
|
||||
}
|
||||
|
||||
public function testInitializeObjectsOnFirstValidation()
|
||||
{
|
||||
$entity = new Entity();
|
||||
$entity->initialized = false;
|
||||
|
||||
// prepare initializers that set "initialized" to true
|
||||
$initializer1 = $this->getMock('Symfony\\Component\\Validator\\ObjectInitializerInterface');
|
||||
$initializer2 = $this->getMock('Symfony\\Component\\Validator\\ObjectInitializerInterface');
|
||||
|
||||
$initializer1->expects($this->once())
|
||||
->method('initialize')
|
||||
->with($entity)
|
||||
->will($this->returnCallback(function ($object) {
|
||||
$object->initialized = true;
|
||||
}));
|
||||
|
||||
$initializer2->expects($this->once())
|
||||
->method('initialize')
|
||||
->with($entity);
|
||||
|
||||
$this->validator = $this->createValidator($this->metadataFactory, array(
|
||||
$initializer1,
|
||||
$initializer2,
|
||||
));
|
||||
|
||||
// prepare constraint which
|
||||
// * checks that "initialized" is set to true
|
||||
// * validates the object again
|
||||
$callback = function ($object, ExecutionContextInterface $context) {
|
||||
$this->assertTrue($object->initialized);
|
||||
|
||||
// validate again in same group
|
||||
$validator = $context->getValidator()->inContext($context);
|
||||
|
||||
$validator->validate($object);
|
||||
|
||||
// validate again in other group
|
||||
$validator->validate($object, null, 'SomeGroup');
|
||||
};
|
||||
|
||||
$this->metadata->addConstraint(new Callback($callback));
|
||||
|
||||
$this->validate($entity);
|
||||
|
||||
$this->assertTrue($entity->initialized);
|
||||
}
|
||||
|
||||
public function testPassConstraintToViolation()
|
||||
{
|
||||
$constraint = new FailingConstraint();
|
||||
$violations = $this->validate('Foobar', $constraint);
|
||||
|
||||
$this->assertCount(1, $violations);
|
||||
$this->assertSame($constraint, $violations[0]->getConstraint());
|
||||
}
|
||||
}
|
@ -0,0 +1,57 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\Validator\Tests\Validator;
|
||||
|
||||
use Symfony\Component\Translation\IdentityTranslator;
|
||||
use Symfony\Component\Validator\ConstraintValidatorFactory;
|
||||
use Symfony\Component\Validator\Context\ExecutionContextFactory;
|
||||
use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;
|
||||
use Symfony\Component\Validator\Tests\Fixtures\Entity;
|
||||
use Symfony\Component\Validator\Validator\RecursiveValidator;
|
||||
|
||||
class RecursiveValidatorTest extends AbstractTest
|
||||
{
|
||||
protected function createValidator(MetadataFactoryInterface $metadataFactory, array $objectInitializers = array())
|
||||
{
|
||||
$translator = new IdentityTranslator();
|
||||
$translator->setLocale('en');
|
||||
|
||||
$contextFactory = new ExecutionContextFactory($translator);
|
||||
$validatorFactory = new ConstraintValidatorFactory();
|
||||
|
||||
return new RecursiveValidator($contextFactory, $metadataFactory, $validatorFactory, $objectInitializers);
|
||||
}
|
||||
|
||||
public function testEmptyGroupsArrayDoesNotTriggerDeprecation()
|
||||
{
|
||||
$entity = new Entity();
|
||||
|
||||
$validatorContext = $this->getMock('Symfony\Component\Validator\Validator\ContextualValidatorInterface');
|
||||
$validatorContext
|
||||
->expects($this->once())
|
||||
->method('validate')
|
||||
->with($entity, null, array())
|
||||
->willReturnSelf();
|
||||
|
||||
$validator = $this
|
||||
->getMockBuilder('Symfony\Component\Validator\Validator\RecursiveValidator')
|
||||
->disableOriginalConstructor()
|
||||
->setMethods(array('startContext'))
|
||||
->getMock();
|
||||
$validator
|
||||
->expects($this->once())
|
||||
->method('startContext')
|
||||
->willReturn($validatorContext);
|
||||
|
||||
$validator->validate($entity, null, array());
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user