Fix FrameworkBundle tests

yceruto · yceruto · commit 6bc3d5c8525e · 2019-07-18T21:56:04.000-04:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/LoggingTranslatorPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/LoggingTranslatorPass.php
@@ -24,31 +24,31 @@ class LoggingTranslatorPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasAlias('logger') || !$container->hasAlias('translator')) {
+        if (!$container->hasAlias('logger') || !$container->hasAlias('translator') || !$container->hasParameter('translator.logging') || !$container->getParameter('translator.logging')) {
+            $container->removeDefinition('translator.logging');
+
             return;
         }
 
-        if ($container->hasParameter('translator.logging') && $container->getParameter('translator.logging')) {
-            $translatorAlias = $container->getAlias('translator');
-            $definition = $container->getDefinition((string) $translatorAlias);
-            $class = $container->getParameterBag()->resolveValue($definition->getClass());
+        $translatorAlias = $container->getAlias('translator');
+        $definition = $container->getDefinition((string) $translatorAlias);
+        $class = $container->getParameterBag()->resolveValue($definition->getClass());
 
-            if (!$r = $container->getReflectionClass($class)) {
-                throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $translatorAlias));
-            }
-            if ($r->isSubclassOf(TranslatorInterface::class) && $r->isSubclassOf(TranslatorBagInterface::class)) {
-                $container->getDefinition('translator.logging')->setDecoratedService('translator');
-                $warmer = $container->getDefinition('translation.warmer');
-                $subscriberAttributes = $warmer->getTag('container.service_subscriber');
-                $warmer->clearTag('container.service_subscriber');
-
-                foreach ($subscriberAttributes as $k => $v) {
-                    if ((!isset($v['id']) || 'translator' !== $v['id']) && (!isset($v['key']) || 'translator' !== $v['key'])) {
-                        $warmer->addTag('container.service_subscriber', $v);
-                    }
+        if (!$r = $container->getReflectionClass($class)) {
+            throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $translatorAlias));
+        }
+        if ($r->isSubclassOf(TranslatorInterface::class) && $r->isSubclassOf(TranslatorBagInterface::class)) {
+            $container->getDefinition('translator.logging')->setDecoratedService('translator');
+            $warmer = $container->getDefinition('translation.warmer');
+            $subscriberAttributes = $warmer->getTag('container.service_subscriber');
+            $warmer->clearTag('container.service_subscriber');
+
+            foreach ($subscriberAttributes as $k => $v) {
+                if ((!isset($v['id']) || 'translator' !== $v['id']) && (!isset($v['key']) || 'translator' !== $v['key'])) {
+                    $warmer->addTag('container.service_subscriber', $v);
                 }
-                $warmer->addTag('container.service_subscriber', ['key' => 'translator', 'id' => 'translator.logging.inner']);
             }
+            $warmer->addTag('container.service_subscriber', ['key' => 'translator', 'id' => 'translator.logging.inner']);
         }
     }
 }
