FWB - Legacy translator check

symfony · snebes · Apr 18, 2019 · Apr 18, 2019 · Apr 18, 2019 · Apr 18, 2019
commit 7c3df251d5680bb3eeb9a4d8296999af8cc1edb4
diff --git a/src/Symfony/Bundle/Framewo 8000 rkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/Framewo 8000 rkBundle/DependencyInjection/FrameworkExtension.php
@@ -106,6 +106,7 @@
 use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Service\ResetInterface;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * FrameworkExtension.
@@ -1109,9 +1110,14 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
         $validatorBuilder = $container->getDefinition('validator.builder');
 
         if (class_exists(LegacyTranslatorProxy::class)) {
-            $calls = $validatorBuilder->getMethodCalls();
-            $calls[1] = ['setTranslator', [new Definition(LegacyTranslatorProxy::class, [new Reference('translator')])]];
-            $validatorBuilder->setMethodCalls($calls);
+            $translatorClass = $container->getDefinition('translator')->getClass();
+            $translatorInterfaces = class_implements($translatorClass);
+
+            if (!in_array(TranslatorInterface::class, $translatorInterfaces)) {
+                $calls = $validatorBuilder->getMethodCalls();
+                $calls[1] = ['setTranslator', [new Definition(LegacyTranslatorProxy::class, [new Reference('translator')])]];
+                $validatorBuilder->setMethodCalls($calls);
+            }
         }
 
         $container->setParameter('validator.translation_domain', $config['translation_domain']);