Skip to content

[9.x] Update to EmailValidator v3 #36525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 9, 2021
Merged

[9.x] Update to EmailValidator v3 #36525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
337b59d
Update to EmailValidator v3
driesvints Mar 9, 2021
30d13f4
Return null
driesvints Mar 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Mail/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
11 changes: 6 additions & 5 deletions src/Illuminate/Validation/Concerns/FilterEmailValidation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -52,19 +53,19 @@ 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
{
//
return null;
}

/**
* Returns the validation warnings.
*
* @return \Egulias\EmailValidator\Warning\Warning[]
*/
public function getWarnings()
public function getWarnings(): array
{
return [];
}
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Validation/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down