Skip to content

Commit b4d75cf

Browse files
authored
[9.x] Patch - use match expression for Email Validation drivers (#44168)
* Use match express for email validation drivers * better checks
1 parent 7d17e41 commit b4d75cf

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

src/Illuminate/Validation/Concerns/ValidatesAttributes.php

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -749,22 +749,14 @@ public function validateEmail($attribute, $value, $parameters)
749749

750750
$validations = collect($parameters)
751751
->unique()
752-
->map(function ($validation) {
753-
if ($validation === 'rfc') {
754-
return new RFCValidation;
755-
} elseif ($validation === 'strict') {
756-
return new NoRFCWarningsValidation;
757-
} elseif ($validation === 'dns') {
758-
return new DNSCheckValidation;
759-
} elseif ($validation === 'spoof') {
760-
return new SpoofCheckValidation;
761-
} elseif ($validation === 'filter') {
762-
return new FilterEmailValidation;
763-
} elseif ($validation === 'filter_unicode') {
764-
return FilterEmailValidation::unicode();
765-
} elseif (is_string($validation) && class_exists($validation)) {
766-
return $this->container->make($validation);
767-
}
752+
->map(fn ($validation) => match (true) {
753+
$validation === 'strict' => new NoRFCWarningsValidation(),
754+
$validation === 'dns' => new DNSCheckValidation(),
755+
$validation === 'spoof' => new SpoofCheckValidation(),
756+
$validation === 'filter' => new FilterEmailValidation(),
757+
$validation === 'filter_unicode' => FilterEmailValidation::unicode(),
758+
is_string($validation) && class_exists($validation) => $this->container->make($validation),
759+
default => new RFCValidation(),
768760
})
769761
->values()
770762
->all() ?: [new RFCValidation];

0 commit comments

Comments
 (0)