diff --git a/src/EmailChecker/Constraints/NotThrowawayEmail.php b/src/EmailChecker/Constraints/NotThrowawayEmail.php index 4a554e6..78c962e 100644 --- a/src/EmailChecker/Constraints/NotThrowawayEmail.php +++ b/src/EmailChecker/Constraints/NotThrowawayEmail.php @@ -26,12 +26,20 @@ class NotThrowawayEmail extends Constraint */ public $message = 'The domain associated with this email is not valid.'; + /** + * @param array|string|null $message + */ public function __construct( - $options = null, + array|string|null $message = null, ?array $groups = null, - $payload = null, - ?string $message = null, + mixed $payload = null, ) { + $options = []; + if (\is_array($message)) { + $options = $message; + $message = $options['message'] ?? null; + } + parent::__construct($options, $groups, $payload); $this->message = $message ?? $this->message; diff --git a/src/EmailChecker/Constraints/NotThrowawayEmailValidator.php b/src/EmailChecker/Constraints/NotThrowawayEmailValidator.php index 2596b74..e03d27f 100644 --- a/src/EmailChecker/Constraints/NotThrowawayEmailValidator.php +++ b/src/EmailChecker/Constraints/NotThrowawayEmailValidator.php @@ -12,7 +12,6 @@ namespace EmailChecker\Constraints; use EmailChecker\EmailChecker; -use ReturnTypeWillChange; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\ConstraintValidator; use Symfony\Component\Validator\Exception\UnexpectedTypeException; @@ -34,11 +33,8 @@ public function __construct(?EmailChecker $emailChecker = null) /** * @param mixed $value - * - * @return void */ - #[ReturnTypeWillChange] - public function validate($value, Constraint $constraint) + public function validate($value, Constraint $constraint): void { if (!$constraint instanceof NotThrowawayEmail) { throw new UnexpectedTypeException($constraint, NotThrowawayEmail::class);