From 1fb7878c182c0a78a86f277ba7c777706de52ddc Mon Sep 17 00:00:00 2001
From: Steve Nebes <snebes@gmail.com>
Date: Mon, 8 Apr 2019 15:47:44 -0500
Subject: [PATCH 1/3] [Validator] Removed legacy interfaces

---
 .../Component/Validator/Tests/ValidatorBuilderTest.php      | 5 ++---
 src/Symfony/Component/Validator/ValidatorBuilder.php        | 5 ++++-
 .../Component/Validator/ValidatorBuilderInterface.php       | 6 ++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php b/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
index a76a363547564..7c63e029744dd 100644
--- a/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
+++ b/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
@@ -14,12 +14,11 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Util\LegacyTranslatorProxy;
 use Symfony\Component\Validator\ValidatorBuilder;
-use Symfony\Component\Validator\ValidatorBuilderInterface;
 
 class ValidatorBuilderTest extends TestCase
 {
     /**
-     * @var ValidatorBuilderInterface
+     * @var ValidatorBuilder
      */
     protected $builder;
 
@@ -102,7 +101,7 @@ public function testSetConstraintValidatorFactory()
     public function testSetTranslator()
     {
         $this->assertSame($this->builder, $this->builder->setTranslator(
-            $this->getMockBuilder('Symfony\Component\Translation\TranslatorInterface')->getMock())
+            $this->getMockBuilder('Symfony\Contracts\Translation\TranslatorInterface')->getMock())
         );
     }
 
diff --git a/src/Symfony/Component/Validator/ValidatorBuilder.php b/src/Symfony/Component/Validator/ValidatorBuilder.php
index fb643327125d5..5c7722c15ff2e 100644
--- a/src/Symfony/Component/Validator/ValidatorBuilder.php
+++ b/src/Symfony/Component/Validator/ValidatorBuilder.php
@@ -256,8 +256,11 @@ public function setConstraintValidatorFactory(ConstraintValidatorFactoryInterfac
     /**
      * {@inheritdoc}
      */
-    public function setTranslator(LegacyTranslatorInterface $translator)
+    public function setTranslator($translator)
     {
+        if (!$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
+            throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator)));
+        }
         $this->translator = $translator instanceof LegacyTranslatorProxy ? $translator->getTranslator() : $translator;
 
         return $this;
diff --git a/src/Symfony/Component/Validator/ValidatorBuilderInterface.php b/src/Symfony/Component/Validator/ValidatorBuilderInterface.php
index 1c764d17963d0..70ccf2fe30fc9 100644
--- a/src/Symfony/Component/Validator/ValidatorBuilderInterface.php
+++ b/src/Symfony/Component/Validator/ValidatorBuilderInterface.php
@@ -12,10 +12,11 @@
 namespace Symfony\Component\Validator;
 
 use Doctrine\Common\Annotations\Reader;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
 use Symfony\Component\Validator\Mapping\Cache\CacheInterface;
 use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * A configurable builder for ValidatorInterface objects.
@@ -134,9 +135,10 @@ public function setConstraintValidatorFactory(ConstraintValidatorFactoryInterfac
     /**
      * Sets the translator used for translating violation messages.
      *
+     * @param TranslatorInterface|LegacyTranslatorInterface $translator
      * @return $this
      */
-    public function setTranslator(TranslatorInterface $translator);
+    public function setTranslator($translator);
 
     /**
      * Sets the default translation domain of violation messages.

From 92f9efa2b8e2e75ff15f276c61915e4ea0b0660c Mon Sep 17 00:00:00 2001
From: Steve Nebes <snebes@gmail.com>
Date: Mon, 8 Apr 2019 15:50:35 -0500
Subject: [PATCH 2/3] [Validator] Removed legacy interfaces

---
 src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php b/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
index 7c63e029744dd..c1fbc785aecdc 100644
--- a/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
+++ b/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
@@ -14,11 +14,12 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Util\LegacyTranslatorProxy;
 use Symfony\Component\Validator\ValidatorBuilder;
+use Symfony\Component\Validator\ValidatorBuilderInterface;
 
 class ValidatorBuilderTest extends TestCase
 {
     /**
-     * @var ValidatorBuilder
+     * @var ValidatorBuilderInterface
      */
     protected $builder;
 

From 4301a56cb249e7f01b6d6b54d723f5265e2518c1 Mon Sep 17 00:00:00 2001
From: Steve Nebes <snebes@gmail.com>
Date: Mon, 8 Apr 2019 15:57:12 -0500
Subject: [PATCH 3/3] updated coding standards

---
 src/Symfony/Component/Validator/ValidatorBuilderInterface.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Symfony/Component/Validator/ValidatorBuilderInterface.php b/src/Symfony/Component/Validator/ValidatorBuilderInterface.php
index 70ccf2fe30fc9..463bcb5f97971 100644
--- a/src/Symfony/Component/Validator/ValidatorBuilderInterface.php
+++ b/src/Symfony/Component/Validator/ValidatorBuilderInterface.php
@@ -136,6 +136,7 @@ public function setConstraintValidatorFactory(ConstraintValidatorFactoryInterfac
      * Sets the translator used for translating violation messages.
      *
      * @param TranslatorInterface|LegacyTranslatorInterface $translator
+     *
      * @return $this
      */
     public function setTranslator($translator);