merged branch jfsimon/issue-8130 (PR #8615)

fabpot · fabpot · commit f6786523f8de · 2013-08-02T14:56:33.000+02:00
This PR was merged into the master branch. Discussion ---------- [WebProfilerBundle] make toolbar listener instantiation conditional In the `WebProfilerBundle`, if `intercept_redirects` and `toolbar` options are both `false`, the `toolbar.xml` config file should not be loaded as the listener becomes useless. | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #8130 Commits ------- 17cbfc8 [WebProfilerBundle] made toolbar listener instantiation conditional
diff --git a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
@@ -44,18 +44,13 @@ public function load(array $configs, ContainerBuilder $container)
 
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('profiler.xml');
-        $loader->load('toolbar.xml');
-
-        $container->setParameter('web_profiler.debug_toolbar.intercept_redirects', $config['intercept_redirects']);
+        $container->setParameter('web_profiler.debug_toolbar.position', $config['position']);
 
-        if (!$config['toolbar']) {
-            $mode = WebDebugToolbarListener::DISABLED;
-        } else {
-            $mode = WebDebugToolbarListener::ENABLED;
+        if ($config['toolbar'] || $config['intercept_redirects']) {
+            $loader->load('toolbar.xml');
+            $container->setParameter('web_profiler.debug_toolbar.intercept_redirects', $config['intercept_redirects']);
+            $container->setParameter('web_profiler.debug_toolbar.mode', $config['toolbar'] ? WebDebugToolbarListener::ENABLED : WebDebugToolbarListener::DISABLED);
         }
-
-        $container->setParameter('web_profiler.debug_toolbar.mode', $mode);
-        $container->setParameter('web_profiler.debug_toolbar.position', $config['position']);
     }
 
     /**
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
@@ -86,29 +86,35 @@ public function testDefaultConfig($debug)
         $extension = new WebProfilerExtension();
         $extension->load(array(array()), $this->container);
 
-        $this->assertFalse($this->container->get('web_profiler.debug_toolbar')->isEnabled());
+        $this->assertFalse($this->container->has('web_profiler.debug_toolbar'));
 
         $this->assertSaneContainer($this->getDumpedContainer());
     }
 
     /**
      * @dataProvider getDebugModes
      */
-    public function testToolbarConfig($enabled)
+    public function testToolbarConfig($toolbarEnabled, $interceptRedirects, $listenerInjected, $listenerEnabled)
     {
         $extension = new WebProfilerExtension();
-        $extension->load(array(array('toolbar' => $enabled)), $this->container);
+        $extension->load(array(array('toolbar' => $toolbarEnabled, 'intercept_redirects' => $interceptRedirects)), $this->container);
 
-        $this->assertSame($enabled, $this->container->get('web_profiler.debug_toolbar')->isEnabled());
+        $this->assertSame($listenerInjected, $this->container->has('web_profiler.debug_toolbar'));
+
+        if ($listenerInjected) {
+            $this->assertSame($listenerEnabled, $this->container->get('web_profiler.debug_toolbar')->isEnabled());
+        }
 
         $this->assertSaneContainer($this->getDumpedContainer());
     }
 
     public function getDebugModes()
     {
         return array(
-            array(true),
-            array(false),
+            array(false, false, false, false),
+            array(true,  false, true,  true),
+            array(false, true,  true,  false),
+            array(true,  true,  true,  true),
         );
     }
 
