Remove cannotBeEmpty() requirement on empty keys

[userbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index b02524c48424c4de44d61c17f3925dd513b434e9..f261fc0a5a8893cd00227ed89e66ca0d3f892881 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -101,7 +101,6 @@ class Configuration implements ConfigurationInterface {
                                                        ->scalarNode('mail')->cannotBeEmpty()->defaultValue($defaults['contact']['mail'])->end()
                                                        ->scalarNode('home_name')->cannotBeEmpty()->defaultValue($defaults['contact']['home_name'])->end()
                                                        ->arrayNode('home_args')
                                                        ->scalarNode('mail')->cannotBeEmpty()->defaultValue($defaults['contact']['mail'])->end()
                                                        ->scalarNode('home_name')->cannotBeEmpty()->defaultValue($defaults['contact']['home_name'])->end()
                                                        ->arrayNode('home_args')

-                                                               ->cannotBeEmpty()

                                                                ->treatNullLike($defaults['contact']['home_args'])
                                                                ->defaultValue($defaults['contact']['home_args'])
                                                                ->scalarPrototype()->end()
                                                                ->treatNullLike($defaults['contact']['home_args'])
                                                                ->defaultValue($defaults['contact']['home_args'])
                                                                ->scalarPrototype()->end()


@@ -113,7 +112,6 @@ class Configuration implements ConfigurationInterface {
                                                ->children()
                                                        ->scalarNode('template')->cannotBeEmpty()->defaultValue($defaults['login']['template'])->end()
                                                        ->arrayNode('context')
                                                ->children()
                                                        ->scalarNode('template')->cannotBeEmpty()->defaultValue($defaults['login']['template'])->end()
                                                        ->arrayNode('context')

-                                                               ->cannotBeEmpty()

                                                                ->treatNullLike(array())
                                                                ->defaultValue($defaults['login']['context'])
                                                                ->scalarPrototype()->end()
                                                                ->treatNullLike(array())
                                                                ->defaultValue($defaults['login']['context'])
                                                                ->scalarPrototype()->end()


@@ -132,7 +130,6 @@ class Configuration implements ConfigurationInterface {
                                                        ->end()
                                                        ->scalarNode('template')->cannotBeEmpty()->defaultValue($defaults['register']['template'])->end()
                                                        ->arrayNode('context')
                                                        ->end()
                                                        ->scalarNode('template')->cannotBeEmpty()->defaultValue($defaults['register']['template'])->end()
                                                        ->arrayNode('context')

-                                                               ->cannotBeEmpty()

                                                                ->treatNullLike($defaults['register']['context'])
                                                                ->defaultValue($defaults['register']['context'])
                                                                ->scalarPrototype()->end()
                                                                ->treatNullLike($defaults['register']['context'])
                                                                ->defaultValue($defaults['register']['context'])
                                                                ->scalarPrototype()->end()


@@ -151,14 +148,12 @@ class Configuration implements ConfigurationInterface {
                                                        ->end()
                                                        ->scalarNode('url_name')->cannotBeEmpty()->defaultValue($defaults['recover']['url_name'])->end()
                                                        ->arrayNode('url_args')
                                                        ->end()
                                                        ->scalarNode('url_name')->cannotBeEmpty()->defaultValue($defaults['recover']['url_name'])->end()
                                                        ->arrayNode('url_args')

-                                                               ->cannotBeEmpty()

                                                                ->treatNullLike($defaults['recover']['url_args'])
                                                                ->defaultValue($defaults['recover']['url_args'])
                                                                ->scalarPrototype()->end()
                                                        ->end()
                                                        ->scalarNode('template')->cannotBeEmpty()->defaultValue($defaults['recover']['template'])->end()
                                                        ->arrayNode('context')
                                                                ->treatNullLike($defaults['recover']['url_args'])
                                                                ->defaultValue($defaults['recover']['url_args'])
                                                                ->scalarPrototype()->end()
                                                        ->end()
                                                        ->scalarNode('template')->cannotBeEmpty()->defaultValue($defaults['recover']['template'])->end()
                                                        ->arrayNode('context')

-                                                               ->cannotBeEmpty()

                                                                ->treatNullLike(array())
                                                                ->defaultValue($defaults['recover']['context'])
                                                                ->scalarPrototype()->end()
                                                                ->treatNullLike(array())
                                                                ->defaultValue($defaults['recover']['context'])
                                                                ->scalarPrototype()->end()


@@ -177,14 +172,12 @@ class Configuration implements ConfigurationInterface {
                                                        ->end()
                                                        ->scalarNode('url_name')->cannotBeEmpty()->defaultValue($defaults['recover']['url_name'])->end()
                                                        ->arrayNode('url_args')
                                                        ->end()
                                                        ->scalarNode('url_name')->cannotBeEmpty()->defaultValue($defaults['recover']['url_name'])->end()
                                                        ->arrayNode('url_args')

-                                                               ->cannotBeEmpty()

                                                                ->treatNullLike($defaults['recover']['url_args'])
                                                                ->defaultValue($defaults['recover']['url_args'])
                                                                ->scalarPrototype()->end()
                                                        ->end()
                                                        ->scalarNode('template')->cannotBeEmpty()->defaultValue($defaults['recover']['template'])->end()
                                                        ->arrayNode('context')
                                                                ->treatNullLike($defaults['recover']['url_args'])
                                                                ->defaultValue($defaults['recover']['url_args'])
                                                                ->scalarPrototype()->end()
                                                        ->end()
                                                        ->scalarNode('template')->cannotBeEmpty()->defaultValue($defaults['recover']['template'])->end()
                                                        ->arrayNode('context')

-                                                               ->cannotBeEmpty()

                                                                ->treatNullLike(array())
                                                                ->defaultValue($defaults['recover']['context'])
                                                                ->scalarPrototype()->end()
                                                                ->treatNullLike(array())
                                                                ->defaultValue($defaults['recover']['context'])
                                                                ->scalarPrototype()->end()