Browse Source

[FrameworkBundle] fixed cache_warmer configuration

Fabien Potencier 14 years ago
parent
commit
20245da86d

+ 2 - 2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

@@ -116,7 +116,7 @@ class Configuration
                 ->arrayNode('router')
                     ->canBeUnset()
                     ->children()
-                        ->scalarNode('cache_warmer')->end()
+                        ->scalarNode('cache_warmer')->defaultFalse()->end()
                         ->scalarNode('resource')->isRequired()->end()
                         ->scalarNode('type')->end()
                     ->end()
@@ -191,7 +191,7 @@ class Configuration
                             ->end()
                         ->end()
                         ->scalarNode('cache')->end()
-                        ->scalarNode('cache_warmer')->end()
+                        ->scalarNode('cache_warmer')->defaultFalse()->end()
                     ->end()
                     ->fixXmlConfig('engine')
                     ->children()

+ 2 - 2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -259,7 +259,7 @@ class FrameworkExtension extends Extension
             $container->setParameter('router.options.resource_type', $config['type']);
         }
 
-        if (!empty($config['cache_warmer'])) {
+        if ($config['cache_warmer']) {
             $container->getDefinition('router.cache_warmer')->addTag('kernel.cache_warmer');
             $container->setAlias('router', 'router.cached');
         }
@@ -368,7 +368,7 @@ class FrameworkExtension extends Extension
             $container->setParameter('templating.loader.cache.path', null);
         }
 
-        if (isset($config['cache_warmer'])) {
+        if ($config['cache_warmer']) {
             $container->getDefinition('templating.cache_warmer.template_paths')->addTag('kernel.cache_warmer');
             $container->setAlias('templating.locator', 'templating.locator.cached');
         }