Merge branch '4.2' into 4.3

nicolas-grekas · nicolas-grekas · commit 5c7b4a0fef5a · 2019-06-06T20:29:58.000+02:00
* 4.2:
  [Validator] fix deprecation layer of ValidatorBuilder
diff --git 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
@@ -401,7 +401,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
@@ -25,7 +25,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
@@ -38,8 +38,6 @@
  * The default implementation of {@link ValidatorBuilderInterface}.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @final since Symfony 4.2
  */
 class ValidatorBuilder implements ValidatorBuilderInterface
 {
@@ -255,6 +253,8 @@ public function setConstraintValidatorFactory(ConstraintValidatorFactoryInterfac
 
     /**
      * {@inheritdoc}
+     *
+     * @final since Symfony 4.2
      */
     public function setTranslator(LegacyTranslatorInterface $translator)
     {

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,6 @@`
`38`	`38`	`* The default implementation of {@link ValidatorBuilderInterface}.`
`39`	`39`	`*`
`40`	`40`	`* @author Bernhard Schussek <bschussek@gmail.com>`
`41`		`- *`
`42`		`- * @final since Symfony 4.2`
`43`	`41`	`*/`
`44`	`42`	`class ValidatorBuilder implements ValidatorBuilderInterface`
`45`	`43`	`{`
`@@ -255,6 +253,8 @@ public function setConstraintValidatorFactory(ConstraintValidatorFactoryInterfac`
`255`	`253`
`256`	`254`	`/**`
`257`	`255`	`* {@inheritdoc}`
	`256`	`+ *`
	`257`	`+ * @final since Symfony 4.2`
`258`	`258`	`*/`
`259`	`259`	`public function setTranslator(LegacyTranslatorInterface $translator)`
`260`	`260`	`{`