Merge pull request #15 from nymo/improve-email-regexp

Improve email validation for domain part
naucon · Sep 4, 2023 · 1bcf9c2 · 1bcf9c2
2 parents 8a09cdd + a4cc450
commit 1bcf9c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Validator/Constraints/IsEmailValidator.php b/src/Validator/Constraints/IsEmailValidator.php
@@ -22,7 +22,7 @@
  */
 class IsEmailValidator extends ConstraintValidator
 {
-    const REGEXP = '/^(?![.-])([a-zA-Z0-9_\-\+]+(?:\.[a-zA-Z0-9_\-\+]+)*\@([a-zA-Z0-9\-\+]+\.?)+[a-zA-Z0-9]{0,10},?)+$/D';
+    const REGEXP = '/^(?![.-])([a-zA-Z0-9_\-\+]+(\.[a-zA-Z0-9_\-\+]+)*)@([a-zA-Z0-9]+([\-\.]{1}[a-zA-Z0-9]+)*)\.([a-zA-Z0-9]{2,10})$/D';
 
     /**
      * {@inheritdoc}

diff --git a/tests/Validator/Constraints/IsEmailValidatorTest.php b/tests/Validator/Constraints/IsEmailValidatorTest.php
@@ -36,7 +36,7 @@ public function valueProvider()
             ['[email protected]', true],
             ['[email protected]', true],
             ['[email protected]', true],
-            ['admin@mailserver1', true],
+            ['admin@mailserver1', false], //invalid domain name
             ['[email protected]', true],
             ['[email protected]', true],
             ['[[email protected]]', false],
@@ -65,6 +65,11 @@ public function valueProvider()
             ['abc', false],
             ['', false],
             [null, true],
+            ['[email protected]', false],
+            ['[email protected]', false],
+            ['olaf@t-onlinde', false],
+            ['[email protected]', false],
+            ['olav@gmail', false],
         ];
     }