[Profiler][Translation] Logging false by default and desactivated when using the profiler

Amrouche Hamza · Amrouche Hamza · commit c6a53161ce34 · 2017-11-01T15:37:57.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/LoggingTranslatorPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/LoggingTranslatorPass.php
@@ -28,6 +28,9 @@ public function process(ContainerBuilder $container)
         if (!$container->hasAlias('logger') || !$container->hasAlias('translator')) {
             return;
         }
+        if ($container->has('profiler')) {
+            $container->hasParameter('translator.logging') && $container->setParameter('translator.logging', false);
+        }
 
         if ($container->hasParameter('translator.logging') && $container->getParameter('translator.logging')) {
             $translatorAlias = $container->getAlias('translator');
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -644,7 +644,7 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode)
                             ->prototype('scalar')->end()
                             ->defaultValue(array('en'))
                         ->end()
-                        ->booleanNode('logging')->defaultValue($this->debug)->end()
+                        ->booleanNode('logging')->defaultValue(false)->end()
                         ->arrayNode('paths')
                             ->prototype('scalar')->end()
                         ->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
@@ -38,7 +38,7 @@ public function testProcess()
             ->method('getDefinition')
             ->will($this->returnValue($definition));
 
-        $container->expects($this->once())
+        $container->expects($this->atLeastOnce())
             ->method('hasParameter')
             ->with('translator.logging')
             ->will($this->returnValue(true));
@@ -64,6 +64,60 @@ public function testProcess()
         $pass->process($container);
     }
 
+    public function testProcessWithProfiler()
+    {
+        $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
+        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->getMock();
+        $parameterBag = $this->getMockBuilder('Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface')->getMock();
+
+        $container->expects($this->exactly(2))
+            ->method('hasAlias')
+            ->will($this->returnValue(true));
+
+        $container->expects($this->once())
+            ->method('getParameter')
+            ->will($this->returnValue(true));
+
+        $container->expects($this->once())
+            ->method('getAlias')
+            ->will($this->returnValue('translation.default'));
+
+        $container->expects($this->exactly(3))
+            ->method('getDefinition')
+            ->will($this->returnValue($definition));
+
+        $container->expects($this->atLeastOnce())
+            ->method('hasParameter')
+            ->with('translator.logging')
+            ->will($this->returnValue(true));
+
+        $container->expects($this->atLeastOnce())
+            ->method('setParameter')
+            ->with('translator.logging')
+            ->will($this->returnValue(true));
+
+        $container->expects($this->atLeastOnce())
+            ->method('has')
+            ->with('profiler')
+            ->will($this->returnValue(true));
+
+        $parameterBag->expects($this->once())
+            ->method('resolveValue')
+            ->will($this->returnValue("Symfony\Bundle\FrameworkBundle\Translation\Translator"));
+
+        $container->expects($this->once())
+            ->method('getParameterBag')
+            ->will($this->returnValue($parameterBag));
+
+        $container->expects($this->once())
+            ->method('getReflectionClass')
+            ->with('Symfony\Bundle\FrameworkBundle\Translation\Translator')
+            ->will($this->returnValue(new \ReflectionClass('Symfony\Bundle\FrameworkBundle\Translation\Translator')));
+
+        $pass = new LoggingTranslatorPass();
+        $pass->process($container);
+    }
+
     public function testThatCompilerPassIsIgnoredIfThereIsNotLoggerDefinition()
     {
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->getMock();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -253,7 +253,7 @@ protected static function getBundleDefaultConfig()
             'translator' => array(
                 'enabled' => !class_exists(FullStack::class),
                 'fallbacks' => array('en'),
-                'logging' => true,
+                'logging' => false,
                 'paths' => array(),
             ),
             'validation' => array(

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,9 @@ public function process(ContainerBuilder $container)`
`28`	`28`	`if (!$container->hasAlias('logger') \|\| !$container->hasAlias('translator')) {`
`29`	`29`	`return;`
`30`	`30`	`}`
	`31`	`+ if ($container->has('profiler')) {`
	`32`	`+ $container->hasParameter('translator.logging') && $container->setParameter('translator.logging', false);`
	`33`	`+ }`
`31`	`34`
`32`	`35`	`if ($container->hasParameter('translator.logging') && $container->getParameter('translator.logging')) {`
`33`	`36`	`$translatorAlias = $container->getAlias('translator');`