Merge branch '4.3' into 4.4

* 4.3: [Validator] fix deprecation layer of ValidatorBuilder [HttpKernel] Fix missing use for request and response classes bumped Symfony version to 4.3.2 updated VERSION for 4.3.1 updated CHANGELOG for 4.3.1
symfony · Jun 6, 2019 · 89e0db1 · 89e0db1
2 parents 3c62a65 + e12a774
commit 89e0db1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,7 +32,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/ValidatorBuilder.php b/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)
     {