FWB - Legacy translator check

symfony · snebes · Apr 18, 2019 · Apr 18, 2019 · Apr 18, 2019 · Apr 18, 2019
commit 331a885d32b2b2233fe38ebff75f3f150867e449
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1108,12 +1108,6 @@ 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);
-        }
-
        $container->setParameter('validator.translation_domain', $config['translation_domain']);

        $files = ['xml' => [], 'yml' => []];

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -819,11 +819,7 @@ public function testValidation()
        $this->assertSame('setConstraintValidatorFactory', $calls[0][0]);
        $this->assertEquals([new Reference('validator.validator_factory')], $calls[0][1]);
        $this->assertSame('setTranslator', $calls[1][0]);
-        if (class_exists(LegacyTranslatorProxy::class)) {
-            $this->assertEquals([new Definition(LegacyTranslatorProxy::class, [new Reference('translator')])], $calls[1][1]);
-        } else {
-            $this->assertEquals([new Reference('translator')], $calls[1][1]);
-        }
+        $this->assertEquals([new Reference('translator')], $calls[1][1]);
        $this->assertSame('setTranslationDomain', $calls[2][0]);
        $this->assertSame(['%validator.translation_domain%'], $calls[2][1]);
        $this->assertSame('addXmlMappings', $calls[3][0]);

diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -28,8 +28,7 @@
        "symfony/polyfill-mbstring": "~1.0",
        "symfony/filesystem": "~3.4|~4.0",
        "symfony/finder": "~3.4|~4.0",
-        "symfony/routing": "^4.1",
-        "symfony/translation": "^4.2"
+        "symfony/routing": "^4.1"
    },
    "require-dev": {
        "doctrine/cache": "~1.0",
@@ -49,6 +48,7 @@
        "symfony/security-csrf": "~3.4|~4.0",
        "symfony/serializer": "^4.2",
        "symfony/stopwatch": "~3.4|~4.0",
+        "symfony/translation": "~4.2",
        "symfony/templating": "~3.4|~4.0",
        "symfony/validator": "^4.1",
        "symfony/var-dumper": "~3.4|~4.0",

diff --git a/src/Symfony/Component/Validator/DependencyInjection/AddValidatorInitializersPass.php b/src/Symfony/Component/Validator/DependencyInjection/AddValidatorInitializersPass.php
@@ -65,7 +65,7 @@ public function process(ContainerBuilder $container)
                    $translator = $translator->getParent();
                }

-                if (!is_subclass_of($class, LegacyTranslatorInterface::class)) {
+                if (class_exists(LegacyTranslatorProxy::class)) {
                    $arguments[0] = (new Definition(LegacyTranslatorProxy::class))->addArgument($arguments[0]);
                }
            }

diff --git a/src/Symfony/Component/Validator/ValidatorBuilder.php b/src/Symfony/Component/Validator/ValidatorBuilder.php
@@ -258,11 +258,7 @@ public function setConstraintValidatorFactory(ConstraintValidatorFactoryInterfac
     */
    public function setTranslator(LegacyTranslatorInterface $translator)
    {
-        $this->translator = $translator;
-
-        while ($this->translator instanceof LegacyTranslatorProxy) {
-            $this->translator = $this->translator->getTranslator();
-        }
+        $this->translator = $translator instanceof LegacyTranslatorProxy ? $translator->getTranslator() : $translator;

        return $this;
    }

diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
@@ -19,7 +19,8 @@
        "php": "^7.1.3",
        "symfony/contracts": "^1.0.2",
        "symfony/polyfill-ctype": "~1.8",
-        "symfony/polyfill-mbstring": "~1.0"
+        "symfony/polyfill-mbstring": "~1.0",
+        "symfony/translation": "~4.2"
    },
    "require-dev": {
        "symfony/http-foundation": "~4.1",
@@ -32,7 +33,6 @@
        "symfony/expression-language": "~3.4|~4.0",
        "symfony/cache": "~3.4|~4.0",
        "symfony/property-access": "~3.4|~4.0",
-        "symfony/translation": "~4.2",
        "doctrine/annotations": "~1.0",
        "doctrine/cache": "~1.0",
        "egulias/email-validator": "^1.2.8|~2.0"