From 272959dc3d71950951b173d7b9de629df2a4a31d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 24 Feb 2010 16:19:42 +0100 Subject: [PATCH] [WebBundle] made registration of templating debugging automatic without the use of the web.debug element --- src/Symfony/Framework/WebBundle/Bundle.php | 11 +++++++++++ .../WebBundle/DependencyInjection/WebExtension.php | 4 +--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Framework/WebBundle/Bundle.php b/src/Symfony/Framework/WebBundle/Bundle.php index 34896ee2df..f0725b6828 100644 --- a/src/Symfony/Framework/WebBundle/Bundle.php +++ b/src/Symfony/Framework/WebBundle/Bundle.php @@ -5,6 +5,8 @@ namespace Symfony\Framework\WebBundle; use Symfony\Foundation\Bundle\Bundle as BaseBundle; use Symfony\Components\DependencyInjection\ContainerInterface; use Symfony\Components\DependencyInjection\Loader\Loader; +use Symfony\Components\DependencyInjection\Loader\XmlFileLoader; +use Symfony\Components\DependencyInjection\BuilderConfiguration; use Symfony\Framework\WebBundle\DependencyInjection\WebExtension; /* @@ -34,5 +36,14 @@ class Bundle extends BaseBundle $dirs[] = $dir.'/%%bundle%%/Resources/views/%%controller%%/%%name%%%%format%%.php'; } $container->setParameter('templating.loader.filesystem.path', $dirs); + + $configuration = new BuilderConfiguration(); + if ($container->getParameter('kernel.debug')) + { + $loader = new XmlFileLoader(__DIR__.'/Resources/config'); + $configuration->merge($loader->load('debug.xml')); + } + + return $configuration; } } diff --git a/src/Symfony/Framework/WebBundle/DependencyInjection/WebExtension.php b/src/Symfony/Framework/WebBundle/DependencyInjection/WebExtension.php index 7b8f048c67..cfa694283c 100644 --- a/src/Symfony/Framework/WebBundle/DependencyInjection/WebExtension.php +++ b/src/Symfony/Framework/WebBundle/DependencyInjection/WebExtension.php @@ -151,11 +151,9 @@ class WebExtension extends LoaderExtension { $configuration = new BuilderConfiguration(); - $loader = new XmlFileLoader(__DIR__.'/../Resources/config'); - $configuration->merge($loader->load($this->resources['debug'])); - if (isset($config['toolbar']) && $config['toolbar']) { + $loader = new XmlFileLoader(__DIR__.'/../Resources/config'); $configuration->merge($loader->load('debug_data_collector.xml')); $configuration->merge($loader->load('debug_web_debug_toolbar.xml')); }