Use a library for email validation (#26503)

laravel · Nov 14, 2018 · c071123 · martinbean · Nov 16, 2018 · c071123
1 parent 97b3f1b
commit c071123
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -21,6 +21,7 @@
         "ext-openssl": "*",
         "doctrine/inflector": "^1.1",
         "dragonmantank/cron-expression": "^2.0",
+        "egulias/email-validator": "~2.0",
         "erusev/parsedown": "^1.7",
         "league/flysystem": "^1.0.8",
         "monolog/monolog": "^1.12",

diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -16,7 +16,9 @@
 use Illuminate\Validation\Rules\Exists;
 use Illuminate\Validation\Rules\Unique;
 use Illuminate\Validation\ValidationData;
+use Egulias\EmailValidator\EmailValidator;
 use Symfony\Component\HttpFoundation\File\File;
+use Egulias\EmailValidator\Validation\RFCValidation;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 trait ValidatesAttributes
@@ -590,7 +592,7 @@ public function validateDistinct($attribute, $value, $parameters)
      */
     public function validateEmail($attribute, $value)
     {
-        return filter_var($value, FILTER_VALIDATE_EMAIL) !== false;
+        return (new EmailValidator)->isValid($value, new RFCValidation);
     }
 
     /**

diff --git a/src/Illuminate/Validation/composer.json b/src/Illuminate/Validation/composer.json
@@ -16,6 +16,7 @@
     "require": {
         "php": "^7.1.3",
         "ext-json": "*",
+        "egulias/email-validator": "~2.0",
         "illuminate/container": "5.8.*",
         "illuminate/contracts": "5.8.*",
         "illuminate/support": "5.8.*",

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -386,10 +386,10 @@ public function testInputIsReplaced()
     {
         $trans = $this->getIlluminateArrayTranslator();
         $trans->addLines(['validation.email' => ':input is not a valid email'], 'en');
-        $v = new Validator($trans, ['email' => 'a@s'], ['email' => 'email']);
+        $v = new Validator($trans, ['email' => 'a@@s'], ['email' => 'email']);
         $this->assertFalse($v->passes());
         $v->messages()->setFormat(':message');
-        $this->assertEquals('a@s is not a valid email', $v->messages()->first('email'));
+        $this->assertEquals('a@@s is not a valid email', $v->messages()->first('email'));
 
         $trans = $this->getIlluminateArrayTranslator();
         $trans->addLines(['validation.email' => ':input is not a valid email'], 'en');
@@ -1969,6 +1969,12 @@ public function testValidateEmail()
         $this->assertTrue($v->passes());
     }
 
+    public function testValidateEmailWithInternationalCharacters()
+    {
+        $v = new Validator($this->getIlluminateArrayTranslator(), ['x' => 'foo@gmäil.com'], ['x' => 'email']);
+        $this->assertTrue($v->passes());
+    }
+
     /**
      * @dataProvider validUrls
      */