[Translator] Deprecated transChoice and moved it away from contracts

Author: Nyholm

Util/LegacyTranslatorProxy.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Validator\Util;
 
+use Symfony\Component\Translation\LegacyTranslatorTrait;
 use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -19,6 +20,9 @@
  */
 class LegacyTranslatorProxy implements LegacyTranslatorInterface
 {
+    use LegacyTranslatorTrait {
+        transChoice as private doTransChoice;
+    }
     private $translator;
 
     public function __construct(TranslatorInterface $translator)
@@ -60,6 +64,10 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
      */
     public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
     {
-        return $this->translator->transChoice($id, $number, $parameters, $domain, $locale);
+        if ($this->translator instanceof LegacyTranslatorInterface) {
+            return $this->translator->transChoice($id, $number, $parameters, $domain, $locale);
+        }
+
+        $this->doTransChoice($id, $number, $parameters, $domain, $locale);
     }
 }

Violation/ConstraintViolationBuilder.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Validator\Violation;
 
+use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationList;
@@ -141,7 +142,7 @@ public function setCause($cause)
      */
     public function addViolation()
     {
-        if (null === $this->plural) {
+        if (null === $this->plural || !$this->translator instanceof LegacyTranslatorInterface) {
             $translatedMessage = $this->translator->trans(
                 $this->message,
                 $this->parameters,