diff --git a/composer.json b/composer.json index a6bfc72af0ce..011f9c47d68f 100644 --- a/composer.json +++ b/composer.json @@ -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", @@ -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", diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json index 28882e965432..75cecef57ff4 100755 --- a/src/Illuminate/Mail/composer.json +++ b/src/Illuminate/Mail/composer.json @@ -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": { diff --git a/src/Illuminate/Validation/Concerns/FilterEmailValidation.php b/src/Illuminate/Validation/Concerns/FilterEmailValidation.php index 2d21b6c5b27d..84ed212f2755 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 @@ 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 @@ -52,11 +53,11 @@ 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; } /** @@ -64,7 +65,7 @@ public function getError() * * @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 54926da15ed7..af707b3f0c28 100755 --- a/src/Illuminate/Validation/composer.json +++ b/src/Illuminate/Validation/composer.json @@ -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",