X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/4d179d12db7cad65f5dc866becda2c0c18bdc0a9..4f9e7ff026a604ff0cbec161b9bddb0f07c4fe99:/DependencyInjection/Configuration.php?ds=sidebyside

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 22c34f0..4a5d2c8 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -11,17 +11,17 @@
 
 namespace Rapsys\UserBundle\DependencyInjection;
 
+use Rapsys\UserBundle\RapsysUserBundle;
+
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
-use Rapsys\UserBundle\RapsysUserBundle;
-
 /**
+ * {@inheritdoc}
+ *
  * This is the class that validates and merges configuration from your app/config files.
  *
  * @link http://symfony.com/doc/current/cookbook/bundles/configuration.html
- *
- * {@inheritdoc}
  */
 class Configuration implements ConfigurationInterface {
 	/**
@@ -34,91 +34,106 @@ 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' => 'Admin',
 				'civility' => 'Mister',
-				'group' => [ 'User' ]
+				'languages' => [
+					'en_gb' => 'English'
+				],
+				'locales' => [ 'en_gb' ],
+				'group' => [ 'Guest' ]
 			],
 			'route' => [
+				'home' => [
+					'name' => 'rapsysuser',
+					'context' => []
+				],
 				'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' => []
 				]
 			],
-			'translate' => [],
-			'languages' => [
-				'en_gb' => 'English'
-			],
+			'translate' => [ 'site', 'title' ],
 			'contact' => [
 				'address' => 'contact@example.com',
 				'name' => 'John Doe'
 			],
 			'context' => [],
 			'edit' => [
+				'admin' => [ 'mail' => true ],
 				'field' => [],
-				'route' => ['index' => 'index_url'],
+				'route' => [ 'home' => 'home_url' ],
 				'view' => [
-					'name' => '@RapsysUser/form/register.html.twig',
-					'edit' => 'Rapsys\UserBundle\Form\RegisterType',
-					'reset' => 'Rapsys\UserBundle\Form\LoginType',
-					'context' => []
+					'name' => '@RapsysUser/register.html.twig',
+					'edit' => 'Rapsys\UserBundle\Form\EditType',
+					'reset' => 'Rapsys\UserBundle\Form\ResetType',
+					'context' => [ 'title' => 'Edit' ]
+				]
+			],
+			'index' => [
+				'route' => [ 'home' => 'home_url' ],
+				'view' => [
+					'name' => '@RapsysUser/index.html.twig',
+					'context' => [ 'title' => 'Users' ]
 				]
 			],
 			'login' => [
-				'route' => ['index' => 'index_url'],
+				'route' => [ 'home' => 'home_url', 'recover' => 'recover_url' ],
 				'view' => [
-					'name' => '@RapsysUser/form/login.html.twig',
+					'name' => '@RapsysUser/login.html.twig',
 					'form' => 'Rapsys\UserBundle\Form\LoginType',
-					'context' => []
+					'context' => [ 'title' => 'Login' ]
 				]
 			],
 			'recover' => [
-				'route' => ['index' => 'index_url', 'recover' => 'recover_url'],
+				'route' => [ 'home' => 'home_url', 'recover' => 'recover_url' ],
 				'view' => [
-					'name' => '@RapsysUser/form/recover.html.twig',
-					'form' => 'Rapsys\UserBundle\Form\LoginType',
-					'context' => []
+					'name' => '@RapsysUser/recover.html.twig',
+					'form' => 'Rapsys\UserBundle\Form\RecoverType',
+					'context' => [ 'title' => 'Recover' ]
 				],
 				'mail' => [
-					'subject' => 'Welcome back!',
+					'subject' => 'Welcome back to %%site%%!',
 					'html' => '@RapsysUser/mail/recover.html.twig',
 					'text' => '@RapsysUser/mail/recover.text.twig',
 					'context' => []
 				]
 			],
 			'register' => [
+				'admin' => [],
 				'field' => [],
-				'route' => ['index' => 'index_url', 'confirm' => 'confirm_url'],
+				'route' => [ 'home' => 'home_url', 'confirm' => 'confirm_url' ],
 				'view' => [
-					'name' => '@RapsysUser/form/register.html.twig',
+					'name' => '@RapsysUser/register.html.twig',
 					'form' => 'Rapsys\UserBundle\Form\RegisterType',
-					'context' => []
+					'context' => [ 'title' => 'Register' ]
 				],
 				'mail' => [
-					'subject' => 'Welcome!',
+					'subject' => 'Welcome to %%site%%!',
 					'html' => '@RapsysUser/mail/register.html.twig',
 					'text' => '@RapsysUser/mail/register.text.twig',
 					'context' => []
@@ -133,8 +148,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
@@ -142,14 +157,40 @@ 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')
-						->treatNullLike([])
-						->defaultValue($defaults['default'])
-						->variablePrototype()->end()
+						->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'])
+								->scalarPrototype()->end()
+							->end()
+						->end()
 					->end()
 					->arrayNode('route')
 						->addDefaultsIfNotSet()
@@ -165,24 +206,35 @@ class Configuration implements ConfigurationInterface {
 									->end()
 								->end()
 							->end()
-							->arrayNode('index')
+							->arrayNode('edit')
 								->addDefaultsIfNotSet()
 								->children()
-									->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['index']['name'])->end()
+									->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['edit']['name'])->end()
 									->arrayNode('context')
 										->treatNullLike([])
-										->defaultValue($defaults['route']['index']['context'])
+										->defaultValue($defaults['route']['edit']['context'])
 										->scalarPrototype()->end()
 									->end()
 								->end()
 							->end()
-							->arrayNode('edit')
+							->arrayNode('home')
 								->addDefaultsIfNotSet()
 								->children()
-									->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['edit']['name'])->end()
+									->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['home']['name'])->end()
 									->arrayNode('context')
 										->treatNullLike([])
-										->defaultValue($defaults['route']['edit']['context'])
+										->defaultValue($defaults['route']['home']['context'])
+										->scalarPrototype()->end()
+									->end()
+								->end()
+							->end()
+							->arrayNode('index')
+								->addDefaultsIfNotSet()
+								->children()
+									->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['index']['name'])->end()
+									->arrayNode('context')
+										->treatNullLike([])
+										->defaultValue($defaults['route']['index']['context'])
 										->scalarPrototype()->end()
 									->end()
 								->end()
@@ -227,12 +279,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()
@@ -248,6 +294,11 @@ class Configuration implements ConfigurationInterface {
 					->arrayNode('edit')
 						->addDefaultsIfNotSet()
 						->children()
+							->arrayNode('admin')
+								->treatNullLike([])
+								->defaultValue($defaults['edit']['admin'])
+								->variablePrototype()->end()
+							->end()
 							->arrayNode('field')
 								->treatNullLike([])
 								->defaultValue($defaults['edit']['field'])
@@ -273,6 +324,27 @@ class Configuration implements ConfigurationInterface {
 							->end()
 						->end()
 					->end()
+					->arrayNode('index')
+						->addDefaultsIfNotSet()
+						->children()
+							->arrayNode('route')
+								->treatNullLike([])
+								->defaultValue($defaults['index']['route'])
+								->scalarPrototype()->end()
+							->end()
+							->arrayNode('view')
+								->addDefaultsIfNotSet()
+								->children()
+									->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['index']['view']['name'])->end()
+									->arrayNode('context')
+										->treatNullLike([])
+										->defaultValue($defaults['index']['view']['context'])
+										->variablePrototype()->end()
+									->end()
+								->end()
+							->end()
+						->end()
+					->end()
 					->arrayNode('login')
 						->addDefaultsIfNotSet()
 						->children()
@@ -333,6 +405,11 @@ class Configuration implements ConfigurationInterface {
 					->arrayNode('register')
 						->addDefaultsIfNotSet()
 						->children()
+							->arrayNode('admin')
+								->treatNullLike([])
+								->defaultValue($defaults['edit']['admin'])
+								->variablePrototype()->end()
+							->end()
 							->arrayNode('field')
 								->treatNullLike([])
 								->defaultValue($defaults['register']['field'])