From 337b59d2bd3ccd0be567838c9ed44e97aa237878 Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Tue, 9 Mar 2021 15:31:21 +0100
Subject: [PATCH 1/2] Update to EmailValidator v3

---
 composer.json                                            | 4 ++--
 src/Illuminate/Mail/composer.json                        | 2 +-
 .../Validation/Concerns/FilterEmailValidation.php        | 9 +++++----
 src/Illuminate/Validation/composer.json                  | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index a6bfc72af0ce..011f9c47d68f 100644
--- 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
index 28882e965432..75cecef57ff4 100755
--- 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
index 2d21b6c5b27d..9c5dc75d79ce 100644
--- 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,9 +53,9 @@ 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
     {
         //
     }
@@ -64,7 +65,7 @@ public function getError()
      *
      * @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
index 54926da15ed7..af707b3f0c28 100755
--- 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",

From 30d13f46856b1b2f985eeedcd518d0f1ca937d9c Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Tue, 9 Mar 2021 15:42:35 +0100
Subject: [PATCH 2/2] Return null

---
 src/Illuminate/Validation/Concerns/FilterEmailValidation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Illuminate/Validation/Concerns/FilterEmailValidation.php b/src/Illuminate/Validation/Concerns/FilterEmailValidation.php
index 9c5dc75d79ce..84ed212f2755 100644
--- a/src/Illuminate/Validation/Concerns/FilterEmailValidation.php
+++ b/src/Illuminate/Validation/Concerns/FilterEmailValidation.php
@@ -43,7 +43,7 @@ public static function unicode()
      * @param  \Egulias\EmailValidator\EmailLexer  $emailLexer
      * @return bool
      */
-    public function isValid(string $email, EmailLexer $emailLexer) : bool
+    public function isValid(string $email, EmailLexer $emailLexer): bool
     {
         return is_null($this->flags)
                     ? filter_var($email, FILTER_VALIDATE_EMAIL) !== false
@@ -57,7 +57,7 @@ public function isValid(string $email, EmailLexer $emailLexer) : bool
      */
     public function getError(): ?InvalidEmail
     {
-        //
+        return null;
     }
 
     /**