From ec9673b6cf6178b0be82e362cfae97c6411c587d Mon Sep 17 00:00:00 2001
From: "Johannes M. Schmitt" <schmittjoh@gmail.com>
Date: Sat, 6 Oct 2012 14:13:41 +0200
Subject: [PATCH] adds two convenience methods for optional configuration
 sections

---
 DependencyInjection/Configuration.php | 32 +++++----------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 48bf4dd23..4ff15f16e 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -88,19 +88,11 @@ private function addFormSection(ArrayNodeDefinition $rootNode)
             ->children()
                 ->arrayNode('form')
                     ->info('form configuration')
-                    ->canBeUnset()
-                    ->treatNullLike(array('enabled' => true))
-                    ->treatTrueLike(array('enabled' => true))
-                    ->children()
-                        ->booleanNode('enabled')->defaultTrue()->end()
-                    ->end()
+                    ->canBeDisabled()
                 ->end()
                 ->arrayNode('csrf_protection')
-                    ->canBeUnset()
-                    ->treatNullLike(array('enabled' => true))
-                    ->treatTrueLike(array('enabled' => true))
+                    ->canBeDisabled()
                     ->children()
-                        ->booleanNode('enabled')->defaultTrue()->end()
                         ->scalarNode('field_name')->defaultValue('_token')->end()
                     ->end()
                 ->end()
@@ -114,12 +106,7 @@ private function addEsiSection(ArrayNodeDefinition $rootNode)
             ->children()
                 ->arrayNode('esi')
                     ->info('esi configuration')
-                    ->canBeUnset()
-                    ->treatNullLike(array('enabled' => true))
-                    ->treatTrueLike(array('enabled' => true))
-                    ->children()
-                        ->booleanNode('enabled')->defaultTrue()->end()
-                    ->end()
+                    ->canBeDisabled()
                 ->end()
             ->end()
         ;
@@ -131,11 +118,10 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode)
             ->children()
                 ->arrayNode('profiler')
                     ->info('profiler configuration')
-                    ->canBeUnset()
+                    ->canBeDisabled()
                     ->children()
                         ->booleanNode('only_exceptions')->defaultFalse()->end()
                         ->booleanNode('only_master_requests')->defaultFalse()->end()
-                        ->booleanNode('enabled')->defaultTrue()->end()
                         ->scalarNode('dsn')->defaultValue('file:%kernel.cache_dir%/profiler')->end()
                         ->scalarNode('username')->defaultValue('')->end()
                         ->scalarNode('password')->defaultValue('')->end()
@@ -363,11 +349,8 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode)
             ->children()
                 ->arrayNode('translator')
                     ->info('translator configuration')
-                    ->canBeUnset()
-                    ->treatNullLike(array('enabled' => true))
-                    ->treatTrueLike(array('enabled' => true))
+                    ->canBeDisabled()
                     ->children()
-                        ->booleanNode('enabled')->defaultTrue()->end()
                         ->scalarNode('fallback')->defaultValue('en')->end()
                     ->end()
                 ->end()
@@ -381,11 +364,8 @@ private function addValidationSection(ArrayNodeDefinition $rootNode)
             ->children()
                 ->arrayNode('validation')
                     ->info('validation configuration')
-                    ->canBeUnset()
-                    ->treatNullLike(array('enabled' => true))
-                    ->treatTrueLike(array('enabled' => true))
+                    ->canBeDisabled()
                     ->children()
-                    ->booleanNode('enabled')->defaultTrue()->end()
                         ->scalarNode('cache')->end()
                         ->booleanNode('enable_annotations')->defaultFalse()->end()
                     ->end()