form_debug.xml should be loaded only if form config is enabled

tyx · tyx · commit b668e24fa727 · 2013-09-26T15:56:56.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -30,6 +30,8 @@
  */
 class FrameworkExtension extends Extension
 {
+    private $formConfigEnabled = false;
+
     /**
      * Responds to the app.config configuration parameter.
      *
@@ -90,6 +92,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         if ($this->isConfigEnabled($container, $config['form'])) {
+            $this->formConfigEnabled = true;
             $this->registerFormConfiguration($config, $container, $loader);
             $config['validation']['enabled'] = true;
         }
@@ -218,7 +221,10 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
             return;
         }
 
-        $loader->load('form_debug.xml');
+        if (true === $this->formConfigEnabled) {
+            $loader->load('form_debug.xml');
+        }
+        
         $loader->load('profiling.xml');
         $loader->load('collectors.xml');
 

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@`
`30`	`30`	`*/`
`31`	`31`	`class FrameworkExtension extends Extension`
`32`	`32`	`{`
	`33`	`+ private $formConfigEnabled = false;`
	`34`	`+`
`33`	`35`	`/**`
`34`	`36`	`* Responds to the app.config configuration parameter.`
`35`	`37`	`*`
`@@ -90,6 +92,7 @@ public function load(array $configs, ContainerBuilder $container)`
`90`	`92`	`}`
`91`	`93`
`92`	`94`	`if ($this->isConfigEnabled($container, $config['form'])) {`
	`95`	`+ $this->formConfigEnabled = true;`
`93`	`96`	`$this->registerFormConfiguration($config, $container, $loader);`
`94`	`97`	`$config['validation']['enabled'] = true;`
`95`	`98`	`}`
`@@ -218,7 +221,10 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $`
`218`	`221`	`return;`
`219`	`222`	`}`
`220`	`223`
`221`		`- $loader->load('form_debug.xml');`
	`224`	`+ if (true === $this->formConfigEnabled) {`
	`225`	`+ $loader->load('form_debug.xml');`
	`226`	`+ }`
	`227`	`+`
`222`	`228`	`$loader->load('profiling.xml');`
`223`	`229`	`$loader->load('collectors.xml');`
`224`	`230`