Merge branch '3.2'

* 3.2: Switch to NoRFCWarningsValidation
symfony · Nov 29, 2016 · e765849 · e765849
2 parents 2cdc6d2 + 0e12427
commit e765849
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
@@ -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 @@ public function validate($value, Constraint $constraint)
 
             $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)

diff --git a/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
@@ -174,6 +174,7 @@ public function getInvalidEmailsForStrictChecks()
             array('test@email>'),
             array('test@email<'),
             array('test@email{'),
+            array(str_repeat('x', 254).'@example.com'), //email with warnings
         );
     }