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

This commit is contained in:
Timothée Barray 2013-09-26 15:56:56 +02:00
parent 803d434839
commit b668e24fa7

View File

@ -30,6 +30,8 @@ use Symfony\Component\Config\FileLocator;
*/ */
class FrameworkExtension extends Extension class FrameworkExtension extends Extension
{ {
private $formConfigEnabled = false;
/** /**
* Responds to the app.config configuration parameter. * Responds to the app.config configuration parameter.
* *
@ -90,6 +92,7 @@ class FrameworkExtension extends Extension
} }
if ($this->isConfigEnabled($container, $config['form'])) { if ($this->isConfigEnabled($container, $config['form'])) {
$this->formConfigEnabled = true;
$this->registerFormConfiguration($config, $container, $loader); $this->registerFormConfiguration($config, $container, $loader);
$config['validation']['enabled'] = true; $config['validation']['enabled'] = true;
} }
@ -218,7 +221,10 @@ class FrameworkExtension extends Extension
return; return;
} }
$loader->load('form_debug.xml'); if (true === $this->formConfigEnabled) {
$loader->load('form_debug.xml');
}
$loader->load('profiling.xml'); $loader->load('profiling.xml');
$loader->load('collectors.xml'); $loader->load('collectors.xml');