X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/a870c61c5c4f93e315fd8508ad76dc01e74ceb1f..37b9ab0e1599ae13e17ecf0bfd9ae4d9ebb2d815:/DependencyInjection/Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index b22d973..ade173f 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * This file is part of the Rapsys PackBundle package.
+ * This file is part of the Rapsys UserBundle package.
  *
  * (c) Raphaël Gertz <symfony@rapsys.eu>
  *
@@ -14,10 +14,12 @@ namespace Rapsys\UserBundle\DependencyInjection;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
+use Rapsys\UserBundle\RapsysUserBundle;
+
 /**
  * This is the class that validates and merges configuration from your app/config files.
  *
- * @link http://symfony.com/doc/current/cookbook/bundles/configuration.html}
+ * @link http://symfony.com/doc/current/cookbook/bundles/configuration.html
  *
  * {@inheritdoc}
  */
@@ -27,7 +29,7 @@ class Configuration implements ConfigurationInterface {
 	 */
 	public function getConfigTreeBuilder(): TreeBuilder {
 		//Set tree builder
-		$treeBuilder = new TreeBuilder('rapsys_user');
+		$treeBuilder = new TreeBuilder(RapsysUserBundle::getAlias());
 
 		//The bundle default values
 		$defaults = [
@@ -77,10 +79,12 @@ class Configuration implements ConfigurationInterface {
 			],
 			'context' => [],
 			'edit' => [
+				'field' => [],
 				'route' => ['index' => 'index_url'],
 				'view' => [
-					'form' => 'Rapsys\UserBundle\Form\RegisterType',
 					'name' => '@RapsysUser/form/register.html.twig',
+					'edit' => 'Rapsys\UserBundle\Form\RegisterType',
+					'reset' => 'Rapsys\UserBundle\Form\LoginType',
 					'context' => []
 				]
 			],
@@ -96,7 +100,7 @@ class Configuration implements ConfigurationInterface {
 				'route' => ['index' => 'index_url', 'recover' => 'recover_url'],
 				'view' => [
 					'name' => '@RapsysUser/form/recover.html.twig',
-					'form' => 'Rapsys\UserBundle\Form\RecoverType',
+					'form' => 'Rapsys\UserBundle\Form\LoginType',
 					'context' => []
 				],
 				'mail' => [
@@ -107,10 +111,11 @@ class Configuration implements ConfigurationInterface {
 				]
 			],
 			'register' => [
+				'field' => [],
 				'route' => ['index' => 'index_url', 'confirm' => 'confirm_url'],
 				'view' => [
-					'form' => 'Rapsys\UserBundle\Form\RegisterType',
 					'name' => '@RapsysUser/form/register.html.twig',
+					'form' => 'Rapsys\UserBundle\Form\RegisterType',
 					'context' => []
 				],
 				'mail' => [
@@ -138,12 +143,9 @@ class Configuration implements ConfigurationInterface {
 				->addDefaultsIfNotSet()
 				->children()
 					->arrayNode('class')
-						->addDefaultsIfNotSet()
-						->children()
-							->scalarNode('group')->cannotBeEmpty()->defaultValue($defaults['class']['group'])->end()
-							->scalarNode('civility')->cannotBeEmpty()->defaultValue($defaults['class']['civility'])->end()
-							->scalarNode('user')->cannotBeEmpty()->defaultValue($defaults['class']['user'])->end()
-						->end()
+						->treatNullLike([])
+						->defaultValue($defaults['class'])
+						->scalarPrototype()->end()
 					->end()
 					->arrayNode('default')
 						->addDefaultsIfNotSet()
@@ -253,6 +255,11 @@ class Configuration implements ConfigurationInterface {
 					->arrayNode('edit')
 						->addDefaultsIfNotSet()
 						->children()
+							->arrayNode('field')
+								->treatNullLike([])
+								->defaultValue($defaults['edit']['field'])
+								->variablePrototype()->end()
+							->end()
 							->arrayNode('route')
 								->treatNullLike([])
 								->defaultValue($defaults['edit']['route'])
@@ -261,7 +268,8 @@ class Configuration implements ConfigurationInterface {
 							->arrayNode('view')
 								->addDefaultsIfNotSet()
 								->children()
-									->scalarNode('form')->cannotBeEmpty()->defaultValue($defaults['edit']['view']['form'])->end()
+									->scalarNode('edit')->cannotBeEmpty()->defaultValue($defaults['edit']['view']['edit'])->end()
+									->scalarNode('reset')->cannotBeEmpty()->defaultValue($defaults['edit']['view']['reset'])->end()
 									->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['edit']['view']['name'])->end()
 									->arrayNode('context')
 										->treatNullLike([])
@@ -332,6 +340,11 @@ class Configuration implements ConfigurationInterface {
 					->arrayNode('register')
 						->addDefaultsIfNotSet()
 						->children()
+							->arrayNode('field')
+								->treatNullLike([])
+								->defaultValue($defaults['register']['field'])
+								->variablePrototype()->end()
+							->end()
 							->arrayNode('route')
 								->treatNullLike([])
 								->defaultValue($defaults['register']['route'])