Merge branch '3.2'

* 3.2:
  Switch to NoRFCWarningsValidation
This commit is contained in:
Nicolas Grekas 2016-11-29 14:39:51 +01:00
commit e765849215
2 changed files with 3 additions and 2 deletions

View File

@ -12,7 +12,7 @@
namespace Symfony\Component\Validator\Constraints;
use Egulias\EmailValidator\Validation\EmailValidation;
use Egulias\EmailValidator\Validation\RFCValidation;
use Egulias\EmailValidator\Validation\NoRFCWarningsValidation;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintValidator;
use Symfony\Component\Validator\Exception\RuntimeException;
@ -63,7 +63,7 @@ class EmailValidator extends ConstraintValidator
$strictValidator = new \Egulias\EmailValidator\EmailValidator();
if (interface_exists(EmailValidation::class) && !$strictValidator->isValid($value, new RFCValidation())) {
if (interface_exists(EmailValidation::class) && !$strictValidator->isValid($value, new NoRFCWarningsValidation())) {
$this->context->buildViolation($constraint->message)
->setParameter('{{ value }}', $this->formatValue($value))
->setCode(Email::INVALID_FORMAT_ERROR)

View File

@ -174,6 +174,7 @@ class EmailValidatorTest extends ConstraintValidatorTestCase
array('test@email>'),
array('test@email<'),
array('test@email{'),
array(str_repeat('x', 254).'@example.com'), //email with warnings
);
}