diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index a2f555a..6f400d6 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -91,7 +91,11 @@ private function addFlashMessageListenerSection(ArrayNodeDefinition $rootNode) ->children() ->arrayNode('flash_message_listener') ->canBeUnset() + ->treatFalseLike(array('enabled' => false)) + ->treatTrueLike(array('enabled' => true)) + ->treatNullLike(array('enabled' => true)) ->children() + ->scalarNode('enabled')->defaultTrue()->end() ->scalarNode('name')->defaultValue('flashes')->end() ->scalarNode('path')->defaultValue('/')->end() ->scalarNode('domain')->defaultNull()->end() diff --git a/DependencyInjection/LiipCacheControlExtension.php b/DependencyInjection/LiipCacheControlExtension.php index 86c2594..336310b 100644 --- a/DependencyInjection/LiipCacheControlExtension.php +++ b/DependencyInjection/LiipCacheControlExtension.php @@ -63,7 +63,7 @@ public function load(array $configs, ContainerBuilder $container) $loader->load('authorization_request_listener.xml'); } - if (!empty($config['flash_message_listener'])) { + if (!empty($config['flash_message_listener']) && $config['flash_message_listener']['enabled']) { $loader->load('flash_message_listener.xml'); $container->setParameter($this->getAlias().'.flash_message_listener.options', $config['flash_message_listener']);