X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/76b2ea7078f3a5dac1c2669d48dfe7551ebacaa2..3d287311c2d5479cf672925ac9247ec7fab7313b:/DependencyInjection/Configuration.php?ds=sidebyside

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index ade173f..719e952 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -69,7 +69,6 @@ class Configuration implements ConfigurationInterface {
 				]
 			],
 			'translate' => [],
-			'locales' => '%kernel.translator.fallbacks%',
 			'languages' => [
 				'en_gb' => 'English'
 			],
@@ -148,15 +147,9 @@ class Configuration implements ConfigurationInterface {
 						->scalarPrototype()->end()
 					->end()
 					->arrayNode('default')
-						->addDefaultsIfNotSet()
-						->children()
-							->scalarNode('civility')->cannotBeEmpty()->defaultValue($defaults['default']['civility'])->end()
-							->arrayNode('group')
-								->treatNullLike([])
-								->defaultValue($defaults['default']['group'])
-								->scalarPrototype()->end()
-							->end()
-						->end()
+						->treatNullLike([])
+						->defaultValue($defaults['default'])
+						->variablePrototype()->end()
 					->end()
 					->arrayNode('route')
 						->addDefaultsIfNotSet()
@@ -234,7 +227,7 @@ class Configuration implements ConfigurationInterface {
 						->defaultValue($defaults['translate'])
 						->scalarPrototype()->end()
 					->end()
-					->scalarNode('locales')->cannotBeEmpty()->defaultValue($defaults['locales'])->end()
+					#TODO: see if we can't prevent key normalisation with ->normalizeKeys(false)
 					->arrayNode('languages')
 						->treatNullLike([])
 						->defaultValue($defaults['languages'])