From: Raphaël Gertz <git@rapsys.eu>
Date: Thu, 14 Nov 2019 22:29:27 +0000 (+0100)
Subject: Update configuration tree
X-Git-Tag: 0.1.0~2
X-Git-Url: https://git.rapsys.eu/userbundle/commitdiff_plain/962ae5008946764ac7a4e6663607bd5099b12773?ds=sidebyside

Update configuration tree
---

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index f261fc0..6bf675b 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -25,52 +25,80 @@ class Configuration implements ConfigurationInterface {
 				'title' => 'Rapsys\\UserBundle\\Entity\\Title',
 				'user' => 'Rapsys\\UserBundle\\Entity\\User'
 			],
+			'route' => [
+				'homepage' => [
+					'name' => 'rapsys_user_homepage',
+					'context' => []
+				],
+				'login' => [
+					'name' => 'rapsys_user_login',
+					'context' => []
+				],
+				'recover' => [
+					'name' => 'rapsys_user_recover',
+					'context' => []
+				],
+				'recover_mail' => [
+					'name' => 'rapsys_user_recover_mail',
+					'context' => []
+				],
+				'register' => [
+					'name' => 'rapsys_user_register',
+					'context' => []
+				]
+			],
 			'contact' => [
 				'name' => 'John Doe',
-				'mail' => 'contact@example.com',
-				'home_name' => 'rapsys_user_homepage',
-				'home_args' => []
+				'mail' => 'contact@example.com'
 			],
 			'login' => [
-				'template' => '@@RapsysUser/security/login.html.twig',
-				'context' => []
-			],
-			'register' => [
-				'mail_template' => '@@RapsysUser/mail/register.html.twig',
-				'mail_context' => [
-					'title' => 'Title',
-					'subtitle' => 'Hi, %%name%%',
-					'subject' => 'Welcome to %%title%%',
-					'message' => 'Thanks so much for joining us, from now on, you are part of %%title%%.'
-				],
-				'template' => '@@RapsysUser/security/register.html.twig',
-				'context' => []
+				'view' => [
+					'name' => '@RapsysUser/form/login.html.twig',
+					'form' => 'Rapsys\UserBundle\Form\LoginType',
+					'context' => []
+				]
 			],
 			'recover' => [
-				'mail_template' => '@@RapsysUser/mail/recover.html.twig',
-				'mail_context' => [
-					'title' => 'Title',
-					'subtitle' => 'Hi, %%name%%',
-					'subject' => 'Recover account on %%title%%',
-					'raw' => 'Thanks so much for joining us, to recover your account you can follow this link: <a href="%%url%%">%%url%%</a>'
+				'view' => [
+					'name' => '@RapsysUser/form/recover.html.twig',
+					'form' => 'Rapsys\UserBundle\Form\RecoverType',
+					'context' => []
 				],
-				'url_name' => 'rapsys_user_recover_mail',
-				'url_args' => [],
-				'template' => '@@RapsysUser/security/recover.html.twig',
-				'context' => []
+				'mail' => [
+					'subject' => 'Welcome back!',
+					'html' => '@RapsysUser/mail/recover.html.twig',
+					'text' => '@RapsysUser/mail/recover.text.twig',
+					'route' => ['homepage' => 'homepage_url', 'recover_mail' => 'recover_url'],
+					'context' => []
+				]
 			],
 			'recover_mail' => [
-				'mail_template' => '@@RapsysUser/mail/recover.html.twig',
-				'mail_context' => [
-					'title' => 'Title',
-					'subtitle' => 'Hi, %%name%%',
-					'subject' => 'Account recovered on %%title%%',
-					'raw' => 'Your account password has been changed, to recover your account you can follow this link: <a href="%%url%%">%%url%%</a>'
+				'view' => [
+					'name' => '@RapsysUser/form/recover_mail.html.twig',
+					'form' => 'Rapsys\UserBundle\Form\RecoverMailType',
+					'context' => []
 				],
-				'url_name' => 'rapsys_user_recover_mail',
-				'url_args' => [],
-				'template' => '@@RapsysUser/security/recover_mail.html.twig',
-				'context' => []
+				'mail' => [
+					'subject' => 'Welcome back!',
+					'html' => '@RapsysUser/mail/recover_mail.html.twig',
+					'text' => '@RapsysUser/mail/recover_mail.text.twig',
+					'route' => ['homepage' => 'homepage_url'],
+					'context' => []
+				]
+			],
+			'register' => [
+				'view' => [
+					'form' => 'Rapsys\UserBundle\Form\RegisterType',
+					'name' => '@RapsysUser/form/register.html.twig',
+					'context' => []
+				],
+				'mail' => [
+					'subject' => 'Welcome!',
+					'html' => '@RapsysUser/mail/register.html.twig',
+					'text' => '@RapsysUser/mail/register.text.twig',
+					'route' => ['homepage' => 'homepage_url'],
+					'context' => []
+				]
 			]
 		];
 
@@ -94,93 +122,192 @@ class Configuration implements ConfigurationInterface {
 							->scalarNode('user')->cannotBeEmpty()->defaultValue($defaults['class']['user'])->end()
 						->end()
 					->end()
+					->arrayNode('route')
+						->addDefaultsIfNotSet()
+						->children()
+							->arrayNode('homepage')
+								->addDefaultsIfNotSet()
+								->children()
+									->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['homepage']['name'])->end()
+									->arrayNode('context')
+										->treatNullLike(array())
+										->defaultValue($defaults['route']['homepage']['context'])
+										->scalarPrototype()->end()
+									->end()
+								->end()
+							->end()
+							->arrayNode('login')
+								->addDefaultsIfNotSet()
+								->children()
+									->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['login']['name'])->end()
+									->arrayNode('context')
+										->treatNullLike(array())
+										->defaultValue($defaults['route']['login']['context'])
+										->scalarPrototype()->end()
+									->end()
+								->end()
+							->end()
+							->arrayNode('recover')
+								->addDefaultsIfNotSet()
+								->children()
+									->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['recover']['name'])->end()
+									->arrayNode('context')
+										->treatNullLike(array())
+										->defaultValue($defaults['route']['recover']['context'])
+										->scalarPrototype()->end()
+									->end()
+								->end()
+							->end()
+							->arrayNode('recover_mail')
+								->addDefaultsIfNotSet()
+								->children()
+									->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['recover_mail']['name'])->end()
+									->arrayNode('context')
+										->treatNullLike(array())
+										->defaultValue($defaults['route']['recover_mail']['context'])
+										->scalarPrototype()->end()
+									->end()
+								->end()
+							->end()
+							->arrayNode('register')
+								->addDefaultsIfNotSet()
+								->children()
+									->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['register']['name'])->end()
+									->arrayNode('context')
+										->treatNullLike(array())
+										->defaultValue($defaults['route']['register']['context'])
+										->scalarPrototype()->end()
+									->end()
+								->end()
+							->end()
+						->end()
+					->end()
 					->arrayNode('contact')
 						->addDefaultsIfNotSet()
 						->children()
 							->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['contact']['name'])->end()
 							->scalarNode('mail')->cannotBeEmpty()->defaultValue($defaults['contact']['mail'])->end()
-							->scalarNode('home_name')->cannotBeEmpty()->defaultValue($defaults['contact']['home_name'])->end()
-							->arrayNode('home_args')
-								->treatNullLike($defaults['contact']['home_args'])
-								->defaultValue($defaults['contact']['home_args'])
-								->scalarPrototype()->end()
-							->end()
 						->end()
 					->end()
 					->arrayNode('login')
 						->addDefaultsIfNotSet()
 						->children()
-							->scalarNode('template')->cannotBeEmpty()->defaultValue($defaults['login']['template'])->end()
-							->arrayNode('context')
-								->treatNullLike(array())
-								->defaultValue($defaults['login']['context'])
-								->scalarPrototype()->end()
+							->arrayNode('view')
+								->addDefaultsIfNotSet()
+								->children()
+									->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['login']['view']['name'])->end()
+									->scalarNode('form')->cannotBeEmpty()->defaultValue($defaults['login']['view']['form'])->end()
+									->arrayNode('context')
+										->treatNullLike(array())
+										->defaultValue($defaults['login']['view']['context'])
+										->scalarPrototype()->end()
+									->end()
+								->end()
 							->end()
 						->end()
 					->end()
-					->arrayNode('register')
+					->arrayNode('recover')
 						->addDefaultsIfNotSet()
 						->children()
-							->scalarNode('mail_template')->cannotBeEmpty()->defaultValue($defaults['register']['mail_template'])->end()
-							->arrayNode('mail_context')
-								->cannotBeEmpty()
-								->treatNullLike($defaults['register']['mail_context'])
-								->defaultValue($defaults['register']['mail_context'])
-								->scalarPrototype()->end()
+							->arrayNode('view')
+								->addDefaultsIfNotSet()
+								->children()
+									->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['recover']['view']['name'])->end()
+									->scalarNode('form')->cannotBeEmpty()->defaultValue($defaults['recover']['view']['form'])->end()
+									->arrayNode('context')
+										->treatNullLike(array())
+										->defaultValue($defaults['recover']['view']['context'])
+										->scalarPrototype()->end()
+									->end()
+								->end()
 							->end()
-							->scalarNode('template')->cannotBeEmpty()->defaultValue($defaults['register']['template'])->end()
-							->arrayNode('context')
-								->treatNullLike($defaults['register']['context'])
-								->defaultValue($defaults['register']['context'])
-								->scalarPrototype()->end()
+							->arrayNode('mail')
+								->addDefaultsIfNotSet()
+								->children()
+									->scalarNode('subject')->cannotBeEmpty()->defaultValue($defaults['recover']['mail']['subject'])->end()
+									->scalarNode('html')->cannotBeEmpty()->defaultValue($defaults['recover']['mail']['html'])->end()
+									->scalarNode('text')->cannotBeEmpty()->defaultValue($defaults['recover']['mail']['text'])->end()
+									->arrayNode('route')
+										->treatNullLike(array())
+										->defaultValue($defaults['recover']['mail']['route'])
+										->scalarPrototype()->end()
+									->end()
+									->arrayNode('context')
+										->treatNullLike(array())
+										->defaultValue($defaults['recover']['mail']['context'])
+										->scalarPrototype()->end()
+									->end()
+								->end()
 							->end()
 						->end()
 					->end()
-					->arrayNode('recover')
+					->arrayNode('recover_mail')
 						->addDefaultsIfNotSet()
 						->children()
-							->scalarNode('mail_template')->cannotBeEmpty()->defaultValue($defaults['recover']['mail_template'])->end()
-							->arrayNode('mail_context')
-								->cannotBeEmpty()
-								->treatNullLike($defaults['recover']['mail_context'])
-								->defaultValue($defaults['recover']['mail_context'])
-								->scalarPrototype()->end()
-							->end()
-							->scalarNode('url_name')->cannotBeEmpty()->defaultValue($defaults['recover']['url_name'])->end()
-							->arrayNode('url_args')
-								->treatNullLike($defaults['recover']['url_args'])
-								->defaultValue($defaults['recover']['url_args'])
-								->scalarPrototype()->end()
+							->arrayNode('view')
+								->addDefaultsIfNotSet()
+								->children()
+									->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['recover_mail']['view']['name'])->end()
+									->scalarNode('form')->cannotBeEmpty()->defaultValue($defaults['recover_mail']['view']['form'])->end()
+									->arrayNode('context')
+										->treatNullLike(array())
+										->defaultValue($defaults['recover_mail']['view']['context'])
+										->scalarPrototype()->end()
+									->end()
+								->end()
 							->end()
-							->scalarNode('template')->cannotBeEmpty()->defaultValue($defaults['recover']['template'])->end()
-							->arrayNode('context')
-								->treatNullLike(array())
-								->defaultValue($defaults['recover']['context'])
-								->scalarPrototype()->end()
+							->arrayNode('mail')
+								->addDefaultsIfNotSet()
+								->children()
+									->scalarNode('subject')->cannotBeEmpty()->defaultValue($defaults['recover_mail']['mail']['subject'])->end()
+									->scalarNode('html')->cannotBeEmpty()->defaultValue($defaults['recover_mail']['mail']['html'])->end()
+									->scalarNode('text')->cannotBeEmpty()->defaultValue($defaults['recover_mail']['mail']['text'])->end()
+									->arrayNode('route')
+										->treatNullLike(array())
+										->defaultValue($defaults['recover_mail']['mail']['route'])
+										->scalarPrototype()->end()
+									->end()
+									->arrayNode('context')
+										->treatNullLike(array())
+										->defaultValue($defaults['recover_mail']['mail']['context'])
+										->scalarPrototype()->end()
+									->end()
+								->end()
 							->end()
 						->end()
 					->end()
-					->arrayNode('recover_mail')
+					->arrayNode('register')
 						->addDefaultsIfNotSet()
 						->children()
-							->scalarNode('mail_template')->cannotBeEmpty()->defaultValue($defaults['recover']['mail_template'])->end()
-							->arrayNode('mail_context')
-								->cannotBeEmpty()
-								->treatNullLike($defaults['recover']['mail_context'])
-								->defaultValue($defaults['recover']['mail_context'])
-								->scalarPrototype()->end()
-							->end()
-							->scalarNode('url_name')->cannotBeEmpty()->defaultValue($defaults['recover']['url_name'])->end()
-							->arrayNode('url_args')
-								->treatNullLike($defaults['recover']['url_args'])
-								->defaultValue($defaults['recover']['url_args'])
-								->scalarPrototype()->end()
+							->arrayNode('view')
+								->addDefaultsIfNotSet()
+								->children()
+									->scalarNode('form')->cannotBeEmpty()->defaultValue($defaults['register']['view']['form'])->end()
+									->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['register']['view']['name'])->end()
+									->arrayNode('context')
+										->treatNullLike(array())
+										->defaultValue($defaults['register']['view']['context'])
+										->scalarPrototype()->end()
+									->end()
+								->end()
 							->end()
-							->scalarNode('template')->cannotBeEmpty()->defaultValue($defaults['recover']['template'])->end()
-							->arrayNode('context')
-								->treatNullLike(array())
-								->defaultValue($defaults['recover']['context'])
-								->scalarPrototype()->end()
+							->arrayNode('mail')
+								->addDefaultsIfNotSet()
+								->children()
+									->scalarNode('subject')->cannotBeEmpty()->defaultValue($defaults['register']['mail']['subject'])->end()
+									->scalarNode('html')->cannotBeEmpty()->defaultValue($defaults['register']['mail']['html'])->end()
+									->scalarNode('text')->cannotBeEmpty()->defaultValue($defaults['register']['mail']['text'])->end()
+									->arrayNode('route')
+										->treatNullLike(array())
+										->defaultValue($defaults['register']['mail']['route'])
+										->scalarPrototype()->end()
+									->end()
+									->arrayNode('context')
+										->treatNullLike(array())
+										->defaultValue($defaults['register']['mail']['context'])
+										->scalarPrototype()->end()
+									->end()
+								->end()
 							->end()
 						->end()
 					->end()