[9.x] Update to EmailValidator v3 (#36525)

driesvints · web-flow · commit f6a42172c386 · 2021-03-09T08:50:09.000-06:00
* Update to EmailValidator v3

* Return null
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "ext-openssl": "*",
         "doctrine/inflector": "^2.0",
         "dragonmantank/cron-expression": "^3.1",
-        "egulias/email-validator": "^2.1.10",
+        "egulias/email-validator": "^3.1",
         "league/commonmark": "^1.3",
         "league/flysystem": "^2.0",
         "monolog/monolog": "^2.0",
@@ -30,7 +30,7 @@
         "psr/container": "^1.0",
         "psr/simple-cache": "^1.0",
         "ramsey/uuid": "^4.0",
-        "swiftmailer/swiftmailer": "^6.0",
+        "swiftmailer/swiftmailer": "^6.2.7",
         "symfony/console": "^5.2",
         "symfony/error-handler": "^5.2",
         "symfony/finder": "^5.2",
diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json
@@ -23,7 +23,7 @@
         "illuminate/support": "^9.0",
         "league/commonmark": "^1.3",
         "psr/log": "^1.0",
-        "swiftmailer/swiftmailer": "^6.0",
+        "swiftmailer/swiftmailer": "^6.2.7",
         "tijsverkoyen/css-to-inline-styles": "^2.2.2"
     },
     "autoload": {
diff --git a/src/Illuminate/Validation/Concerns/FilterEmailValidation.php b/src/Illuminate/Validation/Concerns/FilterEmailValidation.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Validation\Concerns;
 
 use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\Result\InvalidEmail;
 use Egulias\EmailValidator\Validation\EmailValidation;
 
 class FilterEmailValidation implements EmailValidation
@@ -42,7 +43,7 @@ public static function unicode()
      * @param  \Egulias\EmailValidator\EmailLexer  $emailLexer
      * @return bool
      */
-    public function isValid($email, EmailLexer $emailLexer)
+    public function isValid(string $email, EmailLexer $emailLexer): bool
     {
         return is_null($this->flags)
                     ? filter_var($email, FILTER_VALIDATE_EMAIL) !== false
@@ -52,19 +53,19 @@ public function isValid($email, EmailLexer $emailLexer)
     /**
      * Returns the validation error.
      *
-     * @return \Egulias\EmailValidator\Exception\InvalidEmail|null
+     * @return \Egulias\EmailValidator\Result\InvalidEmail|null
      */
-    public function getError()
+    public function getError(): ?InvalidEmail
     {
-        //
+        return null;
     }
 
     /**
      * Returns the validation warnings.
      *
      * @return \Egulias\EmailValidator\Warning\Warning[]
      */
-    public function getWarnings()
+    public function getWarnings(): array
     {
         return [];
     }
diff --git a/src/Illuminate/Validation/composer.json b/src/Illuminate/Validation/composer.json
@@ -16,7 +16,7 @@
     "require": {
         "php": "^7.4|^8.0",
         "ext-json": "*",
-        "egulias/email-validator": "^2.1.10",
+        "egulias/email-validator": "^3.1",
         "illuminate/collections": "^9.0",
         "illuminate/container": "^9.0",
         "illuminate/contracts": "^9.0",

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`namespace Illuminate\Validation\Concerns;`
`4`	`4`
`5`	`5`	`use Egulias\EmailValidator\EmailLexer;`
	`6`	`+use Egulias\EmailValidator\Result\InvalidEmail;`
`6`	`7`	`use Egulias\EmailValidator\Validation\EmailValidation;`
`7`	`8`
`8`	`9`	`class FilterEmailValidation implements EmailValidation`
`@@ -42,7 +43,7 @@ public static function unicode()`
`42`	`43`	`* @param \Egulias\EmailValidator\EmailLexer $emailLexer`
`43`	`44`	`* @return bool`
`44`	`45`	`*/`
`45`		`- public function isValid($email, EmailLexer $emailLexer)`
	`46`	`+ public function isValid(string $email, EmailLexer $emailLexer): bool`
`46`	`47`	`{`
`47`	`48`	`return is_null($this->flags)`
`48`	`49`	`? filter_var($email, FILTER_VALIDATE_EMAIL) !== false`
`@@ -52,19 +53,19 @@ public function isValid($email, EmailLexer $emailLexer)`
`52`	`53`	`/**`
`53`	`54`	`* Returns the validation error.`
`54`	`55`	`*`
`55`		`- * @return \Egulias\EmailValidator\Exception\InvalidEmail\|null`
	`56`	`+ * @return \Egulias\EmailValidator\Result\InvalidEmail\|null`
`56`	`57`	`*/`
`57`		`- public function getError()`
	`58`	`+ public function getError(): ?InvalidEmail`
`58`	`59`	`{`
`59`		`- //`
	`60`	`+ return null;`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`/**`
`63`	`64`	`* Returns the validation warnings.`
`64`	`65`	`*`
`65`	`66`	`* @return \Egulias\EmailValidator\Warning\Warning[]`
`66`	`67`	`*/`
`67`		`- public function getWarnings()`
	`68`	`+ public function getWarnings(): array`
`68`	`69`	`{`
`69`	`70`	`return [];`
`70`	`71`	`}`