[FrameworkBundle] fix LoggingTranslatorPass

lyrixx · lyrixx · commit fd3105e42fd6 · 2014-09-24T19:20:03.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/LoggingTranslatorPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/LoggingTranslatorPass.php
@@ -25,15 +25,21 @@ public function process(ContainerBuilder $container)
             return;
         }
 
-        if ($container->getParameter('translator.logging')) {
-            $translatorAlias = $container->getAlias('translator');
-            $definition = $container->getDefinition((string) $translatorAlias);
-            $class = $container->getParameterBag()->resolveValue($definition->getClass());
-
-            $refClass = new \ReflectionClass($class);
-            if ($refClass->implementsInterface('Symfony\Component\Translation\TranslatorInterface') && $refClass->implementsInterface('Symfony\Component\Translation\TranslatorBagInterface')) {
-                $container->getDefinition('translator.logging')->setDecoratedService('translator');
-            }
+        if (!$container->hasParameter('translator.logging')) {
+            return;
+        }
+
+        if (!$container->getParameter('translator.logging')) {
+            return;
+        }
+
+        $translatorAlias = $container->getAlias('translator');
+        $definition = $container->getDefinition((string) $translatorAlias);
+        $class = $container->getParameterBag()->resolveValue($definition->getClass());
+
+        $refClass = new \ReflectionClass($class);
+        if ($refClass->implementsInterface('Symfony\Component\Translation\TranslatorInterface') && $refClass->implementsInterface('Symfony\Component\Translation\TranslatorBagInterface')) {
+            $container->getDefinition('translator.logging')->setDecoratedService('translator');
         }
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
@@ -27,6 +27,10 @@ public function testProcess()
             ->method('hasAlias')
             ->will($this->returnValue(true));
 
+        $container->expects($this->once())
+            ->method('hasParameter')
+            ->will($this->returnValue(true));
+
         $container->expects($this->once())
             ->method('getParameter')
             ->will($this->returnValue(true));
