[Validator] remove the API_VERSION
This commit is contained in:
parent
2a6b629e39
commit
8fd32ba9fe
@ -22,7 +22,6 @@ use Symfony\Bridge\Doctrine\Tests\Fixtures\AssociationEntity;
|
||||
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
|
||||
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntityValidator;
|
||||
use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest;
|
||||
use Symfony\Component\Validator\Validation;
|
||||
use Doctrine\ORM\Tools\SchemaTool;
|
||||
|
||||
/**
|
||||
@ -47,11 +46,6 @@ class UniqueEntityValidatorTest extends AbstractConstraintValidatorTest
|
||||
*/
|
||||
protected $repository;
|
||||
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function setUp()
|
||||
{
|
||||
$this->em = DoctrineTestHelper::createTestEntityManager();
|
||||
|
@ -22,7 +22,6 @@ use Symfony\Component\Validator\Constraints\NotNull;
|
||||
use Symfony\Component\Validator\Constraints\NotBlank;
|
||||
use Symfony\Component\Validator\Constraints\Valid;
|
||||
use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest;
|
||||
use Symfony\Component\Validator\Validation;
|
||||
|
||||
/**
|
||||
* @author Bernhard Schussek <bschussek@gmail.com>
|
||||
@ -56,11 +55,6 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
|
||||
parent::setUp();
|
||||
}
|
||||
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new FormValidator($this->serverParams);
|
||||
|
@ -13,7 +13,6 @@ namespace Symfony\Component\Validator\Constraints;
|
||||
|
||||
use Symfony\Component\Validator\Constraint;
|
||||
use Symfony\Component\Validator\ConstraintValidator;
|
||||
use Symfony\Component\Validator\Context\ExecutionContextInterface;
|
||||
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
|
||||
|
||||
/**
|
||||
@ -40,17 +39,10 @@ class AllValidator extends ConstraintValidator
|
||||
|
||||
$context = $this->context;
|
||||
|
||||
if ($context instanceof ExecutionContextInterface) {
|
||||
$validator = $context->getValidator()->inContext($context);
|
||||
$validator = $context->getValidator()->inContext($context);
|
||||
|
||||
foreach ($value as $key => $element) {
|
||||
$validator->atPath('['.$key.']')->validate($element, $constraint->constraints);
|
||||
}
|
||||
} else {
|
||||
// 2.4 API
|
||||
foreach ($value as $key => $element) {
|
||||
$context->validateValue($element, $constraint->constraints, '['.$key.']');
|
||||
}
|
||||
foreach ($value as $key => $element) {
|
||||
$validator->atPath('['.$key.']')->validate($element, $constraint->constraints);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -13,7 +13,6 @@ namespace Symfony\Component\Validator\Constraints;
|
||||
|
||||
use Symfony\Component\Validator\Constraint;
|
||||
use Symfony\Component\Validator\ConstraintValidator;
|
||||
use Symfony\Component\Validator\Context\ExecutionContextInterface;
|
||||
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
|
||||
|
||||
/**
|
||||
@ -56,53 +55,30 @@ class CollectionValidator extends ConstraintValidator
|
||||
|
||||
if ($existsInArray || $existsInArrayAccess) {
|
||||
if (count($fieldConstraint->constraints) > 0) {
|
||||
if ($context instanceof ExecutionContextInterface) {
|
||||
$context->getValidator()
|
||||
->inContext($context)
|
||||
->atPath('['.$field.']')
|
||||
->validate($value[$field], $fieldConstraint->constraints);
|
||||
} else {
|
||||
// 2.4 API
|
||||
$context->validateValue($value[$field], $fieldConstraint->constraints, '['.$field.']');
|
||||
}
|
||||
$context->getValidator()
|
||||
->inContext($context)
|
||||
->atPath('['.$field.']')
|
||||
->validate($value[$field], $fieldConstraint->constraints);
|
||||
}
|
||||
} elseif (!$fieldConstraint instanceof Optional && !$constraint->allowMissingFields) {
|
||||
if ($context instanceof ExecutionContextInterface) {
|
||||
$context->buildViolation($constraint->missingFieldsMessage)
|
||||
->atPath('['.$field.']')
|
||||
->setParameter('{{ field }}', $this->formatValue($field))
|
||||
->setInvalidValue(null)
|
||||
->setCode(Collection::MISSING_FIELD_ERROR)
|
||||
->addViolation();
|
||||
} else {
|
||||
$this->buildViolationInContext($context, $constraint->missingFieldsMessage)
|
||||
->atPath('['.$field.']')
|
||||
->setParameter('{{ field }}', $this->formatValue($field))
|
||||
->setInvalidValue(null)
|
||||
->setCode(Collection::MISSING_FIELD_ERROR)
|
||||
->addViolation();
|
||||
}
|
||||
$context->buildViolation($constraint->missingFieldsMessage)
|
||||
->atPath('['.$field.']')
|
||||
->setParameter('{{ field }}', $this->formatValue($field))
|
||||
->setInvalidValue(null)
|
||||
->setCode(Collection::MISSING_FIELD_ERROR)
|
||||
->addViolation();
|
||||
}
|
||||
}
|
||||
|
||||
if (!$constraint->allowExtraFields) {
|
||||
foreach ($value as $field => $fieldValue) {
|
||||
if (!isset($constraint->fields[$field])) {
|
||||
if ($context instanceof ExecutionContextInterface) {
|
||||
$context->buildViolation($constraint->extraFieldsMessage)
|
||||
->atPath('['.$field.']')
|
||||
->setParameter('{{ field }}', $this->formatValue($field))
|
||||
->setInvalidValue($fieldValue)
|
||||
->setCode(Collection::NO_SUCH_FIELD_ERROR)
|
||||
->addViolation();
|
||||
} else {
|
||||
$this->buildViolationInContext($context, $constraint->extraFieldsMessage)
|
||||
->atPath('['.$field.']')
|
||||
->setParameter('{{ field }}', $this->formatValue($field))
|
||||
->setInvalidValue($fieldValue)
|
||||
->setCode(Collection::NO_SUCH_FIELD_ERROR)
|
||||
->addViolation();
|
||||
}
|
||||
$context->buildViolation($constraint->extraFieldsMessage)
|
||||
->atPath('['.$field.']')
|
||||
->setParameter('{{ field }}', $this->formatValue($field))
|
||||
->setInvalidValue($fieldValue)
|
||||
->setCode(Collection::NO_SUCH_FIELD_ERROR)
|
||||
->addViolation();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -204,11 +204,6 @@ abstract class AbstractConstraintValidatorTest extends \PHPUnit_Framework_TestCa
|
||||
return new ConstraintViolationAssertion($this->context, $message, $this->constraint);
|
||||
}
|
||||
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
abstract protected function createValidator();
|
||||
}
|
||||
|
||||
|
@ -19,11 +19,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class AllValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new AllValidator();
|
||||
|
@ -17,11 +17,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class BlankValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new BlankValidator();
|
||||
|
@ -46,11 +46,6 @@ class CallbackValidatorTest_Object
|
||||
|
||||
class CallbackValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new CallbackValidator();
|
||||
|
@ -17,11 +17,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class CardSchemeValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new CardSchemeValidator();
|
||||
|
@ -22,11 +22,6 @@ function choice_callback()
|
||||
|
||||
class ChoiceValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new ChoiceValidator();
|
||||
|
@ -21,11 +21,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
abstract class CollectionValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new CollectionValidator();
|
||||
|
@ -20,11 +20,6 @@ use Symfony\Component\Validator\Validation;
|
||||
*/
|
||||
abstract class CountValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new CountValidator();
|
||||
|
@ -18,11 +18,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class CountryValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new CountryValidator();
|
||||
|
@ -18,11 +18,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class CurrencyValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new CurrencyValidator();
|
||||
|
@ -17,11 +17,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class DateTimeValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new DateTimeValidator();
|
||||
|
@ -17,11 +17,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class DateValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new DateValidator();
|
||||
|
@ -17,11 +17,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class EmailValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new EmailValidator(false);
|
||||
|
@ -20,11 +20,6 @@ use Symfony\Component\Validator\Validation;
|
||||
*/
|
||||
class EqualToValidatorTest extends AbstractComparisonValidatorTestCase
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new EqualToValidator();
|
||||
|
@ -19,11 +19,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class ExpressionValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new ExpressionValidator(PropertyAccess::createPropertyAccessor());
|
||||
|
@ -22,11 +22,6 @@ abstract class FileValidatorTest extends AbstractConstraintValidatorTest
|
||||
|
||||
protected $file;
|
||||
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new FileValidator();
|
||||
|
@ -20,11 +20,6 @@ use Symfony\Component\Validator\Validation;
|
||||
*/
|
||||
class GreaterThanOrEqualValidatorTest extends AbstractComparisonValidatorTestCase
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new GreaterThanOrEqualValidator();
|
||||
|
@ -20,11 +20,6 @@ use Symfony\Component\Validator\Validation;
|
||||
*/
|
||||
class GreaterThanValidatorTest extends AbstractComparisonValidatorTestCase
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new GreaterThanValidator();
|
||||
|
@ -17,11 +17,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class IbanValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new IbanValidator();
|
||||
|
@ -20,11 +20,6 @@ use Symfony\Component\Validator\Validation;
|
||||
*/
|
||||
class IdenticalToValidatorTest extends AbstractComparisonValidatorTestCase
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new IdenticalToValidator();
|
||||
|
@ -33,11 +33,6 @@ class ImageValidatorTest extends AbstractConstraintValidatorTest
|
||||
protected $imagePortrait;
|
||||
protected $image4By3;
|
||||
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new ImageValidator();
|
||||
|
@ -17,11 +17,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class IpValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new IpValidator();
|
||||
|
@ -17,11 +17,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class IsFalseValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new IsFalseValidator();
|
||||
|
@ -17,11 +17,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class IsNullValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new IsNullValidator();
|
||||
|
@ -17,11 +17,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class IsTrueValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new IsTrueValidator();
|
||||
|
@ -20,11 +20,6 @@ use Symfony\Component\Validator\Validation;
|
||||
*/
|
||||
class IsbnValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new IsbnValidator();
|
||||
|
@ -20,11 +20,6 @@ use Symfony\Component\Validator\Validation;
|
||||
*/
|
||||
class IssnValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new IssnValidator();
|
||||
|
@ -18,11 +18,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class LanguageValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new LanguageValidator();
|
||||
|
@ -17,11 +17,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class LengthValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new LengthValidator();
|
||||
|
@ -20,11 +20,6 @@ use Symfony\Component\Validator\Validation;
|
||||
*/
|
||||
class LessThanOrEqualValidatorTest extends AbstractComparisonValidatorTestCase
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new LessThanOrEqualValidator();
|
||||
|
@ -20,11 +20,6 @@ use Symfony\Component\Validator\Validation;
|
||||
*/
|
||||
class LessThanValidatorTest extends AbstractComparisonValidatorTestCase
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new LessThanValidator();
|
||||
|
@ -17,11 +17,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class LocaleValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new LocaleValidator();
|
||||
|
@ -17,11 +17,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class LuhnValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new LuhnValidator();
|
||||
|
@ -17,11 +17,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class NotBlankValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new NotBlankValidator();
|
||||
|
@ -20,11 +20,6 @@ use Symfony\Component\Validator\Validation;
|
||||
*/
|
||||
class NotEqualToValidatorTest extends AbstractComparisonValidatorTestCase
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new NotEqualToValidator();
|
||||
|
@ -20,11 +20,6 @@ use Symfony\Component\Validator\Validation;
|
||||
*/
|
||||
class NotIdenticalToValidatorTest extends AbstractComparisonValidatorTestCase
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new NotIdenticalToValidator();
|
||||
|
@ -17,11 +17,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class NotNullValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new NotNullValidator();
|
||||
|
@ -18,11 +18,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class RangeValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new RangeValidator();
|
||||
|
@ -17,11 +17,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class RegexValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new RegexValidator();
|
||||
|
@ -17,11 +17,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class TimeValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new TimeValidator();
|
||||
|
@ -19,11 +19,6 @@ class TypeValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected static $file;
|
||||
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new TypeValidator();
|
||||
|
@ -17,11 +17,6 @@ use Symfony\Component\Validator\Validation;
|
||||
|
||||
class UrlValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new UrlValidator();
|
||||
|
@ -20,11 +20,6 @@ use Symfony\Component\Validator\Validation;
|
||||
*/
|
||||
class UuidValidatorTest extends AbstractConstraintValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
return Validation::API_VERSION_2_5;
|
||||
}
|
||||
|
||||
protected function createValidator()
|
||||
{
|
||||
return new UuidValidator();
|
||||
|
@ -1,658 +0,0 @@
|
||||
<?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;
|
||||
|
||||
/**
|
||||
* Verifies that a validator satisfies the API of Symfony 2.5+.
|
||||
*
|
||||
* @since 2.5
|
||||
*
|
||||
* @author Bernhard Schussek <bschussek@gmail.com>
|
||||
*/
|
||||
abstract class Abstract2Dot5ApiTest 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());
|
||||
}
|
||||
}
|
@ -1,57 +0,0 @@
|
||||
<?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 RecursiveValidator2Dot5ApiTest extends Abstract2Dot5ApiTest
|
||||
{
|
||||
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());
|
||||
}
|
||||
}
|
@ -18,24 +18,6 @@ namespace Symfony\Component\Validator;
|
||||
*/
|
||||
final class Validation
|
||||
{
|
||||
/**
|
||||
* The Validator API provided by Symfony 2.4 and older.
|
||||
*
|
||||
* @deprecated use API_VERSION_2_5_BC instead.
|
||||
*/
|
||||
const API_VERSION_2_4 = 1;
|
||||
|
||||
/**
|
||||
* The Validator API provided by Symfony 2.5 and newer.
|
||||
*/
|
||||
const API_VERSION_2_5 = 2;
|
||||
|
||||
/**
|
||||
* The Validator API provided by Symfony 2.5 and newer with a backwards
|
||||
* compatibility layer for 2.4 and older.
|
||||
*/
|
||||
const API_VERSION_2_5_BC = 3;
|
||||
|
||||
/**
|
||||
* Creates a new validator.
|
||||
*
|
||||
|
Reference in New Issue
Block a user