[11.x] Improve Email validation rule custom translation messages

src/Illuminate/Validation/Rules/Email.php

@@ -2,22 +2,13 @@
 
 namespace Illuminate\Validation\Rules;
 
-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 Illuminate\Container\Container;
 use Illuminate\Contracts\Validation\DataAwareRule;
 use Illuminate\Contracts\Validation\Rule;
 use Illuminate\Contracts\Validation\ValidatorAwareRule;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Traits\Conditionable;
 use Illuminate\Support\Traits\Macroable;
-use Illuminate\Validation\Concerns\FilterEmailValidation;
 use InvalidArgumentException;
 
 class Email implements Rule, DataAwareRule, ValidatorAwareRule
@@ -199,29 +190,19 @@ public function passes($attribute, $value)
             return false;
         }
 
-        $emailValidator = Container::getInstance()->make(EmailValidator::class);
+        $validator = Validator::make(
+            $this->data,
+            [$attribute => $this->buildValidationRules()],
+            $this->validator->customMessages,
+            $this->validator->customAttributes
+        );
 
-        $passes = $emailValidator->isValid((string) $value, new MultipleValidationWithAnd($this->buildValidationRules()));
-
-        if (! $passes) {
-            $this->messages = [trans('validation.email', ['attribute' => $attribute])];
+        if ($validator->fails()) {
+            $this->messages = array_merge($this->messages, $validator->messages()->all());
 
             return false;
         }
 
-        if ($this->customRules) {
-            $validator = Validator::make(
-                $this->data,
-                [$attribute => $this->customRules],
-                $this->validator->customMessages,
-                $this->validator->customAttributes
-            );
-
-            if ($validator->fails()) {
-                return $this->fail($validator->messages()->all());
-            }
-        }
-
         return true;
     }
 
@@ -235,51 +216,36 @@ protected function buildValidationRules()
         $rules = [];
 
         if ($this->rfcCompliant) {
-            $rules[] = new RFCValidation;
+            $rules[] = 'rfc';
         }
 
         if ($this->strictRfcCompliant) {
-            $rules[] = new NoRFCWarningsValidation;
+            $rules[] = 'strict';
         }
 
         if ($this->validateMxRecord) {
-            $rules[] = new DNSCheckValidation;
+            $rules[] = 'dns';
         }
 
         if ($this->preventSpoofing) {
-            $rules[] = new SpoofCheckValidation;
+            $rules[] = 'spoof';
         }
 
         if ($this->nativeValidation) {
-            $rules[] = new FilterEmailValidation;
+            $rules[] = 'filter';
         }
 
         if ($this->nativeValidationWithUnicodeAllowed) {
-            $rules[] = FilterEmailValidation::unicode();
+            $rules[] = 'filter_unicode';
         }
 
         if ($rules) {
-            return $rules;
+            $rules = ['email:'.implode(',', $rules)];
+        } else {
+            $rules = ['email'];
         }
 
-        return [new RFCValidation];
-    }
-
-    /**
-     * Adds the given failures, and return false.
-     *
-     * @param  array|string  $messages
-     * @return bool
-     */
-    protected function fail($messages)
-    {
-        $messages = Collection::wrap($messages)
-            ->map(fn ($message) => $this->validator->getTranslator()->get($message))
-            ->all();
-
-        $this->messages = array_merge($this->messages, $messages);
-
-        return false;
+        return array_merge(array_filter($rules), $this->customRules);
     }
 
     /**