From 074693e135d91383fe41af2b85d9105e0d7c75db Mon Sep 17 00:00:00 2001
From: urg <patrick@peerj.com>
Date: Fri, 19 Oct 2012 11:31:42 +0100
Subject: [PATCH 1/2] Disable FlashMessageListener

---
 DependencyInjection/Configuration.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 736b950..70dadcd 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -34,7 +34,9 @@ public function getConfigTreeBuilder()
 
         $this->addRulesSection($rootNode);
         $this->addVarnishSection($rootNode);
-        $this->addFlashMessageListenerSection($rootNode);
+        // PM 2012 Oct 19 - Remove flash listener
+        // TODO: Move to enable config setting
+        // $this->addFlashMessageListenerSection($rootNode);
 
         return $treeBuilder;
     }

From e31b0d2dbcd0feb2b81ae04035e74b711c6d7d2d Mon Sep 17 00:00:00 2001
From: Patrick McAndrew <patrick@peerj.com>
Date: Mon, 7 Jan 2013 10:59:20 +0000
Subject: [PATCH 2/2] Added enable to FlashMessageListener configuration - by
 default is true, but allows for disabling

---
 DependencyInjection/Configuration.php             | 8 +++++---
 DependencyInjection/LiipCacheControlExtension.php | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 70dadcd..ae22232 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -34,9 +34,7 @@ public function getConfigTreeBuilder()
 
         $this->addRulesSection($rootNode);
         $this->addVarnishSection($rootNode);
-        // PM 2012 Oct 19 - Remove flash listener
-        // TODO: Move to enable config setting
-        // $this->addFlashMessageListenerSection($rootNode);
+        $this->addFlashMessageListenerSection($rootNode);
 
         return $treeBuilder;
     }
@@ -93,7 +91,11 @@ private function addFlashMessageListenerSection(ArrayNodeDefinition $rootNode)
                 ->arrayNode('flash_message_listener')
                     ->addDefaultsIfNotSet()
                     ->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 a047f36..f1c0848 100644
--- a/DependencyInjection/LiipCacheControlExtension.php
+++ b/DependencyInjection/LiipCacheControlExtension.php
@@ -56,7 +56,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']);