Skip to content
Snippets Groups Projects
Commit 9bfabb88 authored by Robin Gustafsson's avatar Robin Gustafsson
Browse files

Patch egulias/email-validator v3 compatibility

parent 876f9ce0
No related branches found
No related tags found
No related merge requests found
From: Dries Vints <dries@vints.io>
Date: Tue, 9 Mar 2021 15:50:09 +0100
Subject: [9.x] Update to EmailValidator v3 (#36525)
* Update to EmailValidator v3
* Return null
Origin: https://github.com/laravel/framework/pull/36525
---
composer.json | 2 +-
src/Illuminate/Validation/Concerns/FilterEmailValidation.php | 11 ++++++-----
src/Illuminate/Validation/composer.json | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/composer.json b/composer.json
index ea01401..22a1314 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
"ext-openssl": "*",
"doctrine/inflector": "^1.4|^2.0",
"dragonmantank/cron-expression": "^3.0.2",
- "egulias/email-validator": "^2.1.10",
+ "egulias/email-validator": "^3.1",
"laravel/serializable-closure": "^1.0",
"league/commonmark": "^1.3|^2.0.2",
"league/flysystem": "^1.1",
diff --git a/src/Illuminate/Validation/Concerns/FilterEmailValidation.php b/src/Illuminate/Validation/Concerns/FilterEmailValidation.php
index 2d21b6c..84ed212 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 @@ class FilterEmailValidation implements EmailValidation
* @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,11 +53,11 @@ class FilterEmailValidation implements EmailValidation
/**
* 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;
}
/**
@@ -64,7 +65,7 @@ class FilterEmailValidation implements EmailValidation
*
* @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 f4a0bab..a02065c 100755
--- a/src/Illuminate/Validation/composer.json
+++ b/src/Illuminate/Validation/composer.json
@@ -16,7 +16,7 @@
"require": {
"php": "^7.3|^8.0",
"ext-json": "*",
- "egulias/email-validator": "^2.1.10",
+ "egulias/email-validator": "^3.1",
"illuminate/collections": "^8.0",
"illuminate/container": "^8.0",
"illuminate/contracts": "^8.0",
From: Eduardo <eduardor2k@gmail.com>
Date: Thu, 10 Feb 2022 15:48:35 +0100
Subject: [9.x] Fix SpoofCheckValidation namespace change (#40923)
* fix SpoofCheckValidation namespace change
It seems in Egulias/EmailValidator version 3.x the SpoofCheckValidation dependy has moved to the Extra folder
* Update ValidatesAttributes.php
Co-authored-by: Dries Vints <dries@vints.io>
Origin: https://github.com/laravel/framework/pull/40923
---
src/Illuminate/Validation/Concerns/ValidatesAttributes.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
index 2974174..0526027 100644
--- a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
+++ b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -7,10 +7,10 @@ use DateTime;
use DateTimeInterface;
use Egulias\EmailValidator\EmailValidator;
use Egulias\EmailValidator\Validation\DNSCheckValidation;
+use Egulias\EmailValidator\Validation\Extra\SpoofCheckValidation;
use Egulias\EmailValidator\Validation\MultipleValidationWithAnd;
use Egulias\EmailValidator\Validation\NoRFCWarningsValidation;
use Egulias\EmailValidator\Validation\RFCValidation;
-use Egulias\EmailValidator\Validation\SpoofCheckValidation;
use Exception;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Arr;
0001-9.x-Update-to-EmailValidator-v3-36525.patch
0002-9.x-Fix-SpoofCheckValidation-namespace-change-40923.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment