X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/1675b4362da8161d1e9f8ab67da2027ed0f51389..6b39dbea01bfc1c2143ef276dc17829339afe7ee:/DependencyInjection/Configuration.php?ds=inline

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index ffe1d14..7c053c9 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -41,31 +41,35 @@ class Configuration implements ConfigurationInterface {
 			'default' => [
 				'admin' => 'ROLE_ADMIN',
 				'civility' => 'Mister',
+				'languages' => [
+					'en_gb' => 'English'
+				],
+				'locales' => [ 'en_gb' ],
 				'group' => [ 'User' ]
 			],
 			'route' => [
 				'confirm' => [
-					'name' => 'rapsys_user_confirm',
+					'name' => 'rapsysuser_confirm',
 					'context' => []
 				],
 				'edit' => [
-					'name' => 'rapsys_user_edit',
+					'name' => 'rapsysuser_edit',
 					'context' => []
 				],
 				'index' => [
-					'name' => 'rapsys_user_index',
+					'name' => 'rapsysuser_index',
 					'context' => []
 				],
 				'login' => [
-					'name' => 'rapsys_user_login',
+					'name' => 'rapsysuser_login',
 					'context' => []
 				],
 				'recover' => [
-					'name' => 'rapsys_user_recover',
+					'name' => 'rapsysuser_recover',
 					'context' => []
 				],
 				'register' => [
-					'name' => 'rapsys_user_register',
+					'name' => 'rapsysuser_register',
 					'context' => []
 				]
 			],
@@ -140,8 +144,8 @@ class Configuration implements ConfigurationInterface {
 		 * @link http://symfony.com/doc/current/components/config/definition.html
 		 * @link https://github.com/symfony/assetic-bundle/blob/master/DependencyInjection/Configuration.php#L63
 		 *
-		 * @see php bin/console config:dump-reference rapsys_user to dump default config
-		 * @see php bin/console debug:config rapsys_user to dump config
+		 * @see php bin/console config:dump-reference rapsysuser to dump default config
+		 * @see php bin/console debug:config rapsysuser to dump config
 		 */
 		$treeBuilder
 			//Parameters
@@ -150,7 +154,8 @@ class Configuration implements ConfigurationInterface {
 				->children()
 					->arrayNode('class')
 						->addDefaultsIfNotSet()
-						->ignoreExtraKeys()
+						#XXX: ignoreExtraKeys(bool $remove = true)
+						->ignoreExtraKeys(false)
 						->children()
 							->scalarNode('civility')->cannotBeEmpty()->defaultValue($defaults['class']['civility'])->end()
 							->scalarNode('group')->cannotBeEmpty()->defaultValue($defaults['class']['group'])->end()
@@ -159,10 +164,23 @@ class Configuration implements ConfigurationInterface {
 					->end()
 					->arrayNode('default')
 						->addDefaultsIfNotSet()
-						->ignoreExtraKeys()
+						#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'])