X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/5af30fedd3a4d3107f3bbd049a2148e0d8aa80b1..f5c04dfc8fcb2f05199dafdf016cbd08d91d3bb3:/DependencyInjection/Configuration.php?ds=sidebyside

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index fa3306c..208bf98 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -34,13 +34,17 @@ class Configuration implements ConfigurationInterface {
 		//The bundle default values
 		$defaults = [
 			'class' => [
-				'group' => 'Rapsys\\UserBundle\\Entity\\Group',
 				'civility' => 'Rapsys\\UserBundle\\Entity\\Civility',
+				'group' => 'Rapsys\\UserBundle\\Entity\\Group',
 				'user' => 'Rapsys\\UserBundle\\Entity\\User'
 			],
 			'default' => [
 				'admin' => 'ROLE_ADMIN',
 				'civility' => 'Mister',
+				'languages' => [
+					'en_gb' => 'English'
+				],
+				'locales' => [ 'en_gb' ],
 				'group' => [ 'User' ]
 			],
 			'route' => [
@@ -70,9 +74,6 @@ class Configuration implements ConfigurationInterface {
 				]
 			],
 			'translate' => [],
-			'languages' => [
-				'en_gb' => 'English'
-			],
 			'contact' => [
 				'address' => 'contact@example.com',
 				'name' => 'John Doe'
@@ -152,15 +153,34 @@ class Configuration implements ConfigurationInterface {
 				->addDefaultsIfNotSet()
 				->children()
 					->arrayNode('class')
-						->treatNullLike([])
-						->defaultValue($defaults['class'])
-						->scalarPrototype()->end()
+						->addDefaultsIfNotSet()
+						#XXX: ignoreExtraKeys(bool $remove = true)
+						->ignoreExtraKeys(false)
+						->children()
+							->scalarNode('civility')->cannotBeEmpty()->defaultValue($defaults['class']['civility'])->end()
+							->scalarNode('group')->cannotBeEmpty()->defaultValue($defaults['class']['group'])->end()
+							->scalarNode('user')->cannotBeEmpty()->defaultValue($defaults['class']['user'])->end()
+						->end()
 					->end()
 					->arrayNode('default')
 						->addDefaultsIfNotSet()
+						#XXX: ignoreExtraKeys(bool $remove = true)
+						->ignoreExtraKeys(false)
 						->children()
 							->scalarNode('admin')->cannotBeEmpty()->defaultValue($defaults['default']['admin'])->end()
 							->scalarNode('civility')->cannotBeEmpty()->defaultValue($defaults['default']['civility'])->end()
+							#TODO: see if we can't prevent key normalisation with ->normalizeKeys(false)
+							->arrayNode('languages')
+								->treatNullLike([])
+								->defaultValue($defaults['default']['languages'])
+								->scalarPrototype()->end()
+							->end()
+							#TODO: see if we can't prevent key normalisation with ->normalizeKeys(false)
+							->arrayNode('locales')
+								->treatNullLike([])
+								->defaultValue($defaults['default']['locales'])
+								->scalarPrototype()->end()
+							->end()
 							->arrayNode('group')
 								->treatNullLike([])
 								->defaultValue($defaults['default']['group'])
@@ -244,12 +264,6 @@ class Configuration implements ConfigurationInterface {
 						->defaultValue($defaults['translate'])
 						->scalarPrototype()->end()
 					->end()
-					#TODO: see if we can't prevent key normalisation with ->normalizeKeys(false)
-					->arrayNode('languages')
-						->treatNullLike([])
-						->defaultValue($defaults['languages'])
-						->scalarPrototype()->end()
-					->end()
 					->arrayNode('contact')
 						->addDefaultsIfNotSet()
 						->children()