symfony · ThomasLandauer · Oct 14, 2021 · Oct 14, 2021 · Oct 14, 2021 · Oct 27, 2021
diff --git a/UPGRADE-5.4.md b/UPGRADE-5.4.md
@@ -151,3 +151,8 @@ Security
        }
    }
    ```
+
+Validator
+---------
+
+   * Deprecated email validation mode `loose`; will be removed in Symfony 6 in favor of `html5` (= new default)
diff --git a/UPGRADE-6.0.md b/UPGRADE-6.0.md
@@ -497,6 +497,8 @@ Validator
   $builder->enableAnnotationMapping(true)
       ->addDefaultDoctrineAnnotationReader();
   ```
+
+  * Removed email validation mode `loose`; default is now `html5`
 
 Workflow
 --------

diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
  * Add a `CssColor` constraint to validate CSS colors
  * Add support for `ConstraintViolationList::createFromMessage()`
  * Add error's uid to `Count` and `Length` constraints with "exactly" option enabled
+ * Deprecate email validation mode `loose`, use `html5` instead
 
 5.3
 ---

diff --git a/src/Symfony/Component/Validator/Constraints/Email.php b/src/Symfony/Component/Validator/Constraints/Email.php
@@ -27,6 +27,7 @@ class Email extends Constraint
 {
     public const VALIDATION_MODE_HTML5 = 'html5';
     public const VALIDATION_MODE_STRICT = 'strict';
+    /** @deprecated since Symfony 5.4; will be removed in Symfony 6.0; use email validation mode "html5" instead */
     public const VALIDATION_MODE_LOOSE = 'loose';
 
     public const INVALID_FORMAT_ERROR = 'bd79c0ab-ddba-46cc-a703-a7a4b08de310';

diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
@@ -40,6 +40,10 @@ public function __construct(string $defaultMode = Email::VALIDATION_MODE_LOOSE)
             throw new \InvalidArgumentException('The "defaultMode" parameter value is not valid.');
         }
 
+        if (Email::VALIDATION_MODE_LOOSE === $defaultMode) {
+            trigger_deprecation('symfony/validator', '5.4', 'The "loose" email validation mode is deprecated, use "html5" instead');
+        }
+
         $this->defaultMode = $defaultMode;
     }
 
@@ -69,6 +73,10 @@ public function validate($value, Constraint $constraint)
             $value = ($constraint->normalizer)($value);
         }
 
+        if (Email::VALIDATION_MODE_LOOSE === $constraint->mode) {
+            trigger_deprecation('symfony/validator', '5.4', 'The "loose" email validation mode is deprecated, use "html5" instead');
+        }
+
         if (null === $constraint->mode) {
             $constraint->mode = $this->defaultMode;
         }

diff --git a/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Constraints\EmailValidator;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
@@ -21,9 +22,11 @@
  */
 class EmailValidatorTest extends ConstraintValidatorTestCase
 {
+    use ExpectDeprecationTrait;
+
     protected function createValidator()
     {
-        return new EmailValidator(Email::VALIDATION_MODE_LOOSE);
+        return new EmailValidator(Email::VALIDATION_MODE_HTML5);
     }
 
     public function testUnknownDefaultModeTriggerException()
@@ -61,16 +64,18 @@ public function testExpectsStringCompatibleType()
     }
 
     /**
-     * @dataProvider getValidEmails
+     * @group legacy
+     * @dataProvider getValidEmailsLoose
      */
-    public function testValidEmails($email)
+    public function testValidEmailsLoose($email)
     {
-        $this->validator->validate($email, new Email());
+        $this->validator->validate($email, new Email(['mode' => Email::VALIDATION_MODE_LOOSE]));
 
+        $this->expectDeprecation('Since symfony/validator 5.4: The "loose" email validation mode is deprecated, use "html5" instead');
         $this->assertNoViolation();
     }
 
-    public function getValidEmails()
+    public function getValidEmailsLoose()
     {
         return [
             ['fabien@symfony.com'],
@@ -214,12 +219,16 @@ public function testModeHtml5()
              ->assertRaised();
     }
 
+    /**
+     * @group legacy
+     */
     public function testModeLoose()
     {
         $constraint = new Email(['mode' => Email::VALIDATION_MODE_LOOSE]);
 
         $this->validator->validate('example@example..com', $constraint);
 
+        $this->expectDeprecation('Since symfony/validator 5.4: The "loose" email validation mode is deprecated, use "html5" instead');
         $this->assertNoViolation();
     }
 

diff --git a/src/Symfony/Component/Validator/Tests/ValidationTest.php b/src/Symfony/Component/Validator/Tests/ValidationTest.php
@@ -23,13 +23,13 @@ class ValidationTest extends TestCase
 {
     public function testCreateCallableValid()
     {
-        $validator = Validation::createCallable(new Email());
+        $validator = Validation::createCallable(new Email(['mode' => Email::VALIDATION_MODE_HTML5]));
         $this->assertEquals('test@example.com', $validator('test@example.com'));
     }
 
     public function testCreateCallableInvalid()
     {
-        $validator = Validation::createCallable(new Email());
+        $validator = Validation::createCallable(new Email(['mode' => Email::VALIDATION_MODE_HTML5]));
         try {
             $validator('test');
             $this->fail('No ValidationFailedException thrown');
@@ -44,13 +44,13 @@ public function testCreateCallableInvalid()
 
     public function testCreateIsValidCallableValid()
     {
-        $validator = Validation::createIsValidCallable(new Email());
+        $validator = Validation::createIsValidCallable(new Email(['mode' => Email::VALIDATION_MODE_HTML5]));
         $this->assertTrue($validator('test@example.com'));
     }
 
     public function testCreateIsValidCallableInvalid()
     {
-        $validator = Validation::createIsValidCallable(new Email());
+        $validator = Validation::createIsValidCallable(new Email(['mode' => Email::VALIDATION_MODE_HTML5]));
         $this->assertFalse($validator('test', $violations));
         $this->assertCount(1, $violations);
         $this->assertEquals('This value is not a valid email address.', $violations->get(0)->getMessage());
-Original file line number
+Diff line change
@@ Expand Up / @@ -151,3 +151,8 @@ Security @@
            }
        }
        ```
+    Validator
+    ---------
+       * Deprecated email validation mode `loose`; will be removed in Symfony 6 in favor of `html5` (= new default)