Fix civility to have default value and not forced value

[userbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index b22d973cfb6d1fdd227c10b8d1f1fc0ff3f0d182..4d2d3bf2c1a3f7c9e160a2b9edd87d6c5414aa49 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -138,12 +138,9 @@ class Configuration implements ConfigurationInterface {
                                ->addDefaultsIfNotSet()
                                ->children()
                                        ->arrayNode('class')
-                                               ->addDefaultsIfNotSet()
-                                               ->children()
-                                                       ->scalarNode('group')->cannotBeEmpty()->defaultValue($defaults['class']['group'])->end()
-                                                       ->scalarNode('civility')->cannotBeEmpty()->defaultValue($defaults['class']['civility'])->end()
-                                                       ->scalarNode('user')->cannotBeEmpty()->defaultValue($defaults['class']['user'])->end()
-                                               ->end()
+                                               ->treatNullLike([])
+                                               ->defaultValue($defaults['class'])
+                                               ->scalarPrototype()->end()
                                        ->end()
                                        ->arrayNode('default')
                                                ->addDefaultsIfNotSet()