From 154ce81519446261900e167e65cf3c587ee17dea Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 6 Jun 2019 19:00:17 +0200 Subject: [PATCH] [Validator] fix deprecation layer of ValidatorBuilder --- UPGRADE-4.2.md | 2 +- UPGRADE-5.0.md | 2 +- src/Symfony/Component/Validator/CHANGELOG.md | 2 +- src/Symfony/Component/Validator/ValidatorBuilder.php | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/UPGRADE-4.2.md b/UPGRADE-4.2.md index 90cd04d01e..3b1f238fa6 100644 --- a/UPGRADE-4.2.md +++ b/UPGRADE-4.2.md @@ -385,7 +385,7 @@ Validator * The `symfony/translation` dependency has been removed - run `composer require symfony/translation` if you need the component * The `checkMX` and `checkHost` options of the `Email` constraint are deprecated * The component is now decoupled from `symfony/translation` and uses `Symfony\Contracts\Translation\TranslatorInterface` instead - * The `ValidatorBuilderInterface` has been deprecated and `ValidatorBuilder` made final + * The `ValidatorBuilderInterface` has been deprecated and `ValidatorBuilder::setTranslator()` has been made final * Deprecated validating instances of `\DateTimeInterface` in `DateTimeValidator`, `DateValidator` and `TimeValidator`. Use `Type` instead or remove the constraint if the underlying model is type hinted to `\DateTimeInterface` already. * Using the `Bic`, `Country`, `Currency`, `Language` and `Locale` constraints without `symfony/intl` is deprecated * Using the `Email` constraint in strict mode without `egulias/email-validator` is deprecated diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md index 4ec9e24f4f..a8e7d0aec3 100644 --- a/UPGRADE-5.0.md +++ b/UPGRADE-5.0.md @@ -259,7 +259,7 @@ Validator * Calling `EmailValidator::__construct()` method with a boolean parameter has been removed, use `EmailValidator("strict")` instead. * Removed the `checkDNS` and `dnsMessage` options from the `Url` constraint. * The component is now decoupled from `symfony/translation` and uses `Symfony\Contracts\Translation\TranslatorInterface` instead - * The `ValidatorBuilderInterface` has been removed and `ValidatorBuilder` is now final + * The `ValidatorBuilderInterface` has been removed * Removed support for validating instances of `\DateTimeInterface` in `DateTimeValidator`, `DateValidator` and `TimeValidator`. Use `Type` instead or remove the constraint if the underlying model is type hinted to `\DateTimeInterface` already. * The `symfony/intl` component is now required for using the `Bic`, `Country`, `Currency`, `Language` and `Locale` constraints * The `egulias/email-validator` component is now required for using the `Email` constraint in strict mode diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md index 3863b5717a..2d24f7c69c 100644 --- a/src/Symfony/Component/Validator/CHANGELOG.md +++ b/src/Symfony/Component/Validator/CHANGELOG.md @@ -9,7 +9,7 @@ CHANGELOG * added `DivisibleBy` constraint * decoupled from `symfony/translation` by using `Symfony\Contracts\Translation\TranslatorInterface` * deprecated `ValidatorBuilderInterface` - * made `ValidatorBuilder` final + * made `ValidatorBuilder::setTranslator()` final * marked `format` the default option in `DateTime` constraint * deprecated validating instances of `\DateTimeInterface` in `DateTimeValidator`, `DateValidator` and `TimeValidator`. * deprecated using the `Bic`, `Country`, `Currency`, `Language` and `Locale` constraints without `symfony/intl` diff --git a/src/Symfony/Component/Validator/ValidatorBuilder.php b/src/Symfony/Component/Validator/ValidatorBuilder.php index 0766a2e9f3..a65cca4c3d 100644 --- a/src/Symfony/Component/Validator/ValidatorBuilder.php +++ b/src/Symfony/Component/Validator/ValidatorBuilder.php @@ -38,8 +38,6 @@ use Symfony\Contracts\Translation\TranslatorTrait; * The default implementation of {@link ValidatorBuilderInterface}. * * @author Bernhard Schussek - * - * @final since Symfony 4.2 */ class ValidatorBuilder implements ValidatorBuilderInterface { @@ -255,6 +253,8 @@ class ValidatorBuilder implements ValidatorBuilderInterface /** * {@inheritdoc} + * + * @final since Symfony 4.2 */ public function setTranslator(LegacyTranslatorInterface $translator) {