From a0b226b9be88a5cdd76202362fd0cc642f045aec Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 21 Feb 2023 17:15:44 +0100 Subject: [PATCH] Fix merge --- Constraints/EmailValidator.php | 2 +- Tests/Constraints/EmailValidatorTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Constraints/EmailValidator.php b/Constraints/EmailValidator.php index df5cd1408..08210ce65 100644 --- a/Constraints/EmailValidator.php +++ b/Constraints/EmailValidator.php @@ -44,7 +44,7 @@ public function __construct(string $defaultMode = Email::VALIDATION_MODE_LOOSE) } if (Email::VALIDATION_MODE_LOOSE === $defaultMode) { - trigger_deprecation('symfony/validator', '6.2', 'The "%s" mode is deprecated. The default mode will be changed to "%s" in 7.0.', Email::VALIDATION_MODE_LOOSE, Email::VALIDATION_MODE_HTML5); + trigger_deprecation('symfony/validator', '6.2', 'The "%s" mode is deprecated. It will be removed in 7.0 and the default mode will be changed to "%s".', Email::VALIDATION_MODE_LOOSE, Email::VALIDATION_MODE_HTML5); } $this->defaultMode = $defaultMode; diff --git a/Tests/Constraints/EmailValidatorTest.php b/Tests/Constraints/EmailValidatorTest.php index cdf2bafc6..6bf8fec6c 100644 --- a/Tests/Constraints/EmailValidatorTest.php +++ b/Tests/Constraints/EmailValidatorTest.php @@ -298,7 +298,7 @@ public function testModeHtml5AllowNoTld() */ public function testModeLoose() { - $this->expectDeprecation('Since symfony/validator 6.2: The "loose" mode is deprecated. The default mode will be changed to "html5" in 7.0.'); + $this->expectDeprecation('Since symfony/validator 6.2: The "loose" mode is deprecated. It will be removed in 7.0 and the default mode will be changed to "html5".'); $constraint = new Email(['mode' => Email::VALIDATION_MODE_LOOSE]);