From 8189ba5fa81fd93b806bac3eeb4640b4cce1859c Mon Sep 17 00:00:00 2001 From: Orkhan Ahmadov Date: Wed, 8 Nov 2023 08:58:27 +0100 Subject: [PATCH 1/2] Update ValidatesAttributes.php --- 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 9b131c01dd5e..ec93bd8a09b3 100644 --- a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php +++ b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php @@ -840,7 +840,7 @@ public function validateEmail($attribute, $value, $parameters) ->values() ->all() ?: [new RFCValidation]; - return (new EmailValidator)->isValid($value, new MultipleValidationWithAnd($validations)); + return $this->container->make(EmailValidator::class)->isValid($value, new MultipleValidationWithAnd($validations)); } /** From 2abf2cf8c9f72d6a7ac9618ae0da183462e76f9e Mon Sep 17 00:00:00 2001 From: Orkhan Ahmadov Date: Wed, 8 Nov 2023 09:05:21 +0100 Subject: [PATCH 2/2] Use container to resolve EmailValidator --- src/Illuminate/Validation/Concerns/ValidatesAttributes.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php index ec93bd8a09b3..091681c34cb6 100644 --- a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php +++ b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php @@ -15,6 +15,7 @@ use Egulias\EmailValidator\Validation\NoRFCWarningsValidation; use Egulias\EmailValidator\Validation\RFCValidation; use Exception; +use Illuminate\Container\Container; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Arr; use Illuminate\Support\Exceptions\MathException; @@ -840,7 +841,9 @@ public function validateEmail($attribute, $value, $parameters) ->values() ->all() ?: [new RFCValidation]; - return $this->container->make(EmailValidator::class)->isValid($value, new MultipleValidationWithAnd($validations)); + $emailValidator = Container::getInstance()->make(EmailValidator::class); + + return $emailValidator->isValid($value, new MultipleValidationWithAnd($validations)); } /**