Rename Factory/RepositoryFactory in Factory

[userbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 81ec927c74113e6c03003765d3fa3997c3109cc3..fa3306c179eb09bd465c233dfa1056f8e3d5f7ed 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -1,35 +1,57 @@
-<?php
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of the Rapsys UserBundle package.
+ *
+ * (c) Raphaël Gertz <symfony@rapsys.eu>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */

 
 namespace Rapsys\UserBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 
 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.
  *
 /**
  * This is the class that validates and merges configuration from your app/config files.
  *

- * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/configuration.html}
+ * @link http://symfony.com/doc/current/cookbook/bundles/configuration.html
+ *
+ * {@inheritdoc}

  */
 class Configuration implements ConfigurationInterface {
        /**
         * {@inheritdoc}
         */
  */
 class Configuration implements ConfigurationInterface {
        /**
         * {@inheritdoc}
         */

-       public function getConfigTreeBuilder() {
+       public function getConfigTreeBuilder(): TreeBuilder {

                //Set tree builder
                //Set tree builder

-               $treeBuilder = new TreeBuilder('rapsys_user');
+               $treeBuilder = new TreeBuilder(RapsysUserBundle::getAlias());

 
                //The bundle default values
                $defaults = [
                        'class' => [
                                'group' => 'Rapsys\\UserBundle\\Entity\\Group',
 
                //The bundle default values
                $defaults = [
                        'class' => [
                                'group' => 'Rapsys\\UserBundle\\Entity\\Group',

-                               'title' => 'Rapsys\\UserBundle\\Entity\\Title',
+                               'civility' => 'Rapsys\\UserBundle\\Entity\\Civility',

                                'user' => 'Rapsys\\UserBundle\\Entity\\User'
                        ],
                        'default' => [
                                'user' => 'Rapsys\\UserBundle\\Entity\\User'
                        ],
                        'default' => [

-                               'title' => 'Mister',
+                               'admin' => 'ROLE_ADMIN',
+                               'civility' => 'Mister',

                                'group' => [ 'User' ]
                        ],
                        'route' => [
                                'group' => [ 'User' ]
                        ],
                        'route' => [

+                               'confirm' => [
+                                       'name' => 'rapsys_user_confirm',
+                                       'context' => []
+                               ],
+                               'edit' => [
+                                       'name' => 'rapsys_user_edit',
+                                       'context' => []
+                               ],

                                'index' => [
                                        'name' => 'rapsys_user_index',
                                        'context' => []
                                'index' => [
                                        'name' => 'rapsys_user_index',
                                        'context' => []


@@ -42,23 +64,37 @@ class Configuration implements ConfigurationInterface {
                                        'name' => 'rapsys_user_recover',
                                        'context' => []
                                ],
                                        'name' => 'rapsys_user_recover',
                                        'context' => []
                                ],

-                               'recover_mail' => [
-                                       'name' => 'rapsys_user_recover_mail',
-                                       'context' => []
-                               ],

                                'register' => [
                                        'name' => 'rapsys_user_register',
                                        'context' => []
                                ]
                        ],
                        'translate' => [],
                                'register' => [
                                        'name' => 'rapsys_user_register',
                                        'context' => []
                                ]
                        ],
                        'translate' => [],

-                       'locales' => '%kernel.translator.fallbacks%',

                        'languages' => [
                        'languages' => [

-                               'en' => 'English'
+                               'en_gb' => 'English'

                        ],
                        'contact' => [
                        ],
                        'contact' => [

-                               'name' => 'John Doe',
-                               'mail' => 'contact@example.com'
+                               'address' => 'contact@example.com',
+                               'name' => 'John Doe'
+                       ],
+                       'context' => [],
+                       'edit' => [
+                               'admin' => ['mail' => true, 'pseudonym' => true],
+                               'field' => [],
+                               'route' => ['index' => 'index_url'],
+                               'view' => [
+                                       'name' => '@RapsysUser/form/register.html.twig',
+                                       'edit' => 'Rapsys\UserBundle\Form\EditType',
+                                       'reset' => 'Rapsys\UserBundle\Form\ResetType',
+                                       'context' => []
+                               ]
+                       ],
+                       'index' => [
+                               'route' => ['index' => 'index_url'],
+                               'view' => [
+                                       'name' => '@RapsysUser/form/index.html.twig',
+                                       'context' => []
+                               ]

                        ],
                        'login' => [
                                'route' => ['index' => 'index_url'],
                        ],
                        'login' => [
                                'route' => ['index' => 'index_url'],


@@ -69,7 +105,7 @@ class Configuration implements ConfigurationInterface {
                                ]
                        ],
                        'recover' => [
                                ]
                        ],
                        'recover' => [

-                               'route' => ['index' => 'index_url', 'recover_mail' => 'recover_url'],
+                               'route' => ['index' => 'index_url', 'recover' => 'recover_url'],

                                'view' => [
                                        'name' => '@RapsysUser/form/recover.html.twig',
                                        'form' => 'Rapsys\UserBundle\Form\RecoverType',
                                'view' => [
                                        'name' => '@RapsysUser/form/recover.html.twig',
                                        'form' => 'Rapsys\UserBundle\Form\RecoverType',


@@ -82,25 +118,13 @@ class Configuration implements ConfigurationInterface {
                                        'context' => []
                                ]
                        ],
                                        'context' => []
                                ]
                        ],

-                       'recover_mail' => [
-                               'route' => ['index' => 'index_url', 'recover_mail' => 'recover_url'],
-                               'view' => [
-                                       'name' => '@RapsysUser/form/recover_mail.html.twig',
-                                       'form' => 'Rapsys\UserBundle\Form\RecoverMailType',
-                                       'context' => []
-                               ],
-                               'mail' => [
-                                       'subject' => 'Welcome back!',
-                                       'html' => '@RapsysUser/mail/recover_mail.html.twig',
-                                       'text' => '@RapsysUser/mail/recover_mail.text.twig',
-                                       'context' => []
-                               ]
-                       ],

                        'register' => [
                        'register' => [

-                               'route' => ['index' => 'index_url'],
+                               'admin' => [],
+                               'field' => [],
+                               'route' => ['index' => 'index_url', 'confirm' => 'confirm_url'],

                                'view' => [
                                'view' => [

-                                       'form' => 'Rapsys\UserBundle\Form\RegisterType',

                                        'name' => '@RapsysUser/form/register.html.twig',
                                        'name' => '@RapsysUser/form/register.html.twig',

+                                       'form' => 'Rapsys\UserBundle\Form\RegisterType',

                                        'context' => []
                                ],
                                'mail' => [
                                        'context' => []
                                ],
                                'mail' => [


@@ -112,32 +136,33 @@ class Configuration implements ConfigurationInterface {
                        ]
                ];
 
                        ]
                ];
 

-               //Here we define the parameters that are allowed to configure the bundle.
-               //TODO: see https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php for default value and description
-               //TODO: see http://symfony.com/doc/current/components/config/definition.html
-               //TODO: see fosuser DependencyInjection/Configuration.php
-               //XXX: use bin/console config:dump-reference to dump class infos
-
-               //Here we define the parameters that are allowed to configure the bundle.
+               /**
+                * Defines parameters allowed to configure the bundle
+                *
+                * @link https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+                * @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
+                */

                $treeBuilder
                        //Parameters
                        ->getRootNode()
                                ->addDefaultsIfNotSet()
                                ->children()
                                        ->arrayNode('class')
                $treeBuilder
                        //Parameters
                        ->getRootNode()
                                ->addDefaultsIfNotSet()
                                ->children()
                                        ->arrayNode('class')

-                                               ->addDefaultsIfNotSet()
-                                               ->children()
-                                                       ->scalarNode('group')->cannotBeEmpty()->defaultValue($defaults['class']['group'])->end()
-                                                       ->scalarNode('title')->cannotBeEmpty()->defaultValue($defaults['class']['title'])->end()
-                                                       ->scalarNode('user')->cannotBeEmpty()->defaultValue($defaults['class']['user'])->end()
-                                               ->end()
+                                               ->treatNullLike([])
+                                               ->defaultValue($defaults['class'])
+                                               ->scalarPrototype()->end()

                                        ->end()
                                        ->arrayNode('default')
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                        ->end()
                                        ->arrayNode('default')
                                                ->addDefaultsIfNotSet()
                                                ->children()

-                                                       ->scalarNode('title')->cannotBeEmpty()->defaultValue($defaults['default']['title'])->end()
+                                                       ->scalarNode('admin')->cannotBeEmpty()->defaultValue($defaults['default']['admin'])->end()
+                                                       ->scalarNode('civility')->cannotBeEmpty()->defaultValue($defaults['default']['civility'])->end()

                                                        ->arrayNode('group')
                                                        ->arrayNode('group')

-                                                               ->treatNullLike(array())
+                                                               ->treatNullLike([])

                                                                ->defaultValue($defaults['default']['group'])
                                                                ->scalarPrototype()->end()
                                                        ->end()
                                                                ->defaultValue($defaults['default']['group'])
                                                                ->scalarPrototype()->end()
                                                        ->end()


@@ -146,46 +171,57 @@ class Configuration implements ConfigurationInterface {
                                        ->arrayNode('route')
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                        ->arrayNode('route')
                                                ->addDefaultsIfNotSet()
                                                ->children()

+                                                       ->arrayNode('confirm')
+                                                               ->addDefaultsIfNotSet()
+                                                               ->children()
+                                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['confirm']['name'])->end()
+                                                                       ->arrayNode('context')
+                                                                               ->treatNullLike([])
+                                                                               ->defaultValue($defaults['route']['confirm']['context'])
+                                                                               ->scalarPrototype()->end()
+                                                                       ->end()
+                                                               ->end()
+                                                       ->end()

                                                        ->arrayNode('index')
                                                                ->addDefaultsIfNotSet()
                                                                ->children()
                                                                        ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['index']['name'])->end()
                                                                        ->arrayNode('context')
                                                        ->arrayNode('index')
                                                                ->addDefaultsIfNotSet()
                                                                ->children()
                                                                        ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['index']['name'])->end()
                                                                        ->arrayNode('context')

-                                                                               ->treatNullLike(array())
+                                                                               ->treatNullLike([])

                                                                                ->defaultValue($defaults['route']['index']['context'])
                                                                                ->scalarPrototype()->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()
                                                                                ->defaultValue($defaults['route']['index']['context'])
                                                                                ->scalarPrototype()->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()

-                                                       ->arrayNode('login')
+                                                       ->arrayNode('edit')

                                                                ->addDefaultsIfNotSet()
                                                                ->children()
                                                                ->addDefaultsIfNotSet()
                                                                ->children()

-                                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['login']['name'])->end()
+                                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['edit']['name'])->end()

                                                                        ->arrayNode('context')
                                                                        ->arrayNode('context')

-                                                                               ->treatNullLike(array())
-                                                                               ->defaultValue($defaults['route']['login']['context'])
+                                                                               ->treatNullLike([])
+                                                                               ->defaultValue($defaults['route']['edit']['context'])

                                                                                ->scalarPrototype()->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()
                                                                                ->scalarPrototype()->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()

-                                                       ->arrayNode('recover')
+                                                       ->arrayNode('login')

                                                                ->addDefaultsIfNotSet()
                                                                ->children()
                                                                ->addDefaultsIfNotSet()
                                                                ->children()

-                                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['recover']['name'])->end()
+                                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['login']['name'])->end()

                                                                        ->arrayNode('context')
                                                                        ->arrayNode('context')

-                                                                               ->treatNullLike(array())
-                                                                               ->defaultValue($defaults['route']['recover']['context'])
+                                                                               ->treatNullLike([])
+                                                                               ->defaultValue($defaults['route']['login']['context'])

                                                                                ->scalarPrototype()->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()
                                                                                ->scalarPrototype()->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()

-                                                       ->arrayNode('recover_mail')
+                                                       ->arrayNode('recover')

                                                                ->addDefaultsIfNotSet()
                                                                ->children()
                                                                ->addDefaultsIfNotSet()
                                                                ->children()

-                                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['recover_mail']['name'])->end()
+                                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['recover']['name'])->end()

                                                                        ->arrayNode('context')
                                                                        ->arrayNode('context')

-                                                                               ->treatNullLike(array())
-                                                                               ->defaultValue($defaults['route']['recover_mail']['context'])
+                                                                               ->treatNullLike([])
+                                                                               ->defaultValue($defaults['route']['recover']['context'])

                                                                                ->scalarPrototype()->end()
                                                                        ->end()
                                                                ->end()
                                                                                ->scalarPrototype()->end()
                                                                        ->end()
                                                                ->end()


@@ -195,7 +231,7 @@ class Configuration implements ConfigurationInterface {
                                                                ->children()
                                                                        ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['register']['name'])->end()
                                                                        ->arrayNode('context')
                                                                ->children()
                                                                        ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['register']['name'])->end()
                                                                        ->arrayNode('context')

-                                                                               ->treatNullLike(array())
+                                                                               ->treatNullLike([])

                                                                                ->defaultValue($defaults['route']['register']['context'])
                                                                                ->scalarPrototype()->end()
                                                                        ->end()
                                                                                ->defaultValue($defaults['route']['register']['context'])
                                                                                ->scalarPrototype()->end()
                                                                        ->end()


@@ -204,11 +240,11 @@ class Configuration implements ConfigurationInterface {
                                                ->end()
                                        ->end()
                                        ->arrayNode('translate')
                                                ->end()
                                        ->end()
                                        ->arrayNode('translate')

-                                               ->treatNullLike(array())
+                                               ->treatNullLike([])

                                                ->defaultValue($defaults['translate'])
                                                ->scalarPrototype()->end()
                                        ->end()
                                                ->defaultValue($defaults['translate'])
                                                ->scalarPrototype()->end()
                                        ->end()

-                                       ->scalarNode('locales')->cannotBeEmpty()->defaultValue($defaults['locales'])->end()
+                                       #TODO: see if we can't prevent key normalisation with ->normalizeKeys(false)

                                        ->arrayNode('languages')
                                                ->treatNullLike([])
                                                ->defaultValue($defaults['languages'])
                                        ->arrayNode('languages')
                                                ->treatNullLike([])
                                                ->defaultValue($defaults['languages'])


@@ -217,83 +253,107 @@ class Configuration implements ConfigurationInterface {
                                        ->arrayNode('contact')
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                        ->arrayNode('contact')
                                                ->addDefaultsIfNotSet()
                                                ->children()

+                                                       ->scalarNode('address')->cannotBeEmpty()->defaultValue($defaults['contact']['address'])->end()

                                                        ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['contact']['name'])->end()
                                                        ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['contact']['name'])->end()

-                                                       ->scalarNode('mail')->cannotBeEmpty()->defaultValue($defaults['contact']['mail'])->end()

                                                ->end()
                                        ->end()
                                                ->end()
                                        ->end()

-                                       ->arrayNode('login')
+                                       ->arrayNode('context')
+                                               ->treatNullLike([])
+                                               ->defaultValue($defaults['context'])
+                                               ->variablePrototype()->end()
+                                       ->end()
+                                       ->arrayNode('edit')

                                                ->addDefaultsIfNotSet()
                                                ->children()
                                                ->addDefaultsIfNotSet()
                                                ->children()

+                                                       ->arrayNode('admin')
+                                                               ->treatNullLike([])
+                                                               ->defaultValue($defaults['edit']['admin'])
+                                                               ->variablePrototype()->end()
+                                                       ->end()
+                                                       ->arrayNode('field')
+                                                               ->treatNullLike([])
+                                                               ->defaultValue($defaults['edit']['field'])
+                                                               ->variablePrototype()->end()
+                                                       ->end()

                                                        ->arrayNode('route')
                                                        ->arrayNode('route')

-                                                               ->treatNullLike(array())
-                                                               ->defaultValue($defaults['login']['route'])
+                                                               ->treatNullLike([])
+                                                               ->defaultValue($defaults['edit']['route'])

                                                                ->scalarPrototype()->end()
                                                        ->end()
                                                        ->arrayNode('view')
                                                                ->addDefaultsIfNotSet()
                                                                ->children()
                                                                ->scalarPrototype()->end()
                                                        ->end()
                                                        ->arrayNode('view')
                                                                ->addDefaultsIfNotSet()
                                                                ->children()

-                                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['login']['view']['name'])->end()
-                                                                       ->scalarNode('form')->cannotBeEmpty()->defaultValue($defaults['login']['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')
                                                                        ->arrayNode('context')

-                                                                               ->treatNullLike(array())
-                                                                               ->defaultValue($defaults['login']['view']['context'])
+                                                                               ->treatNullLike([])
+                                                                               ->defaultValue($defaults['edit']['view']['context'])

                                                                                ->variablePrototype()->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()
                                                ->end()
                                        ->end()
                                                                                ->variablePrototype()->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()
                                                ->end()
                                        ->end()

-                                       ->arrayNode('recover')
+                                       ->arrayNode('index')

                                                ->addDefaultsIfNotSet()
                                                ->children()
                                                        ->arrayNode('route')
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                                        ->arrayNode('route')

-                                                               ->treatNullLike(array())
-                                                               ->defaultValue($defaults['recover']['route'])
+                                                               ->treatNullLike([])
+                                                               ->defaultValue($defaults['index']['route'])

                                                                ->scalarPrototype()->end()
                                                        ->end()
                                                        ->arrayNode('view')
                                                                ->addDefaultsIfNotSet()
                                                                ->children()
                                                                ->scalarPrototype()->end()
                                                        ->end()
                                                        ->arrayNode('view')
                                                                ->addDefaultsIfNotSet()
                                                                ->children()

-                                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['recover']['view']['name'])->end()
-                                                                       ->scalarNode('form')->cannotBeEmpty()->defaultValue($defaults['recover']['view']['form'])->end()
+                                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['index']['view']['name'])->end()

                                                                        ->arrayNode('context')
                                                                        ->arrayNode('context')

-                                                                               ->treatNullLike(array())
-                                                                               ->defaultValue($defaults['recover']['view']['context'])
+                                                                               ->treatNullLike([])
+                                                                               ->defaultValue($defaults['index']['view']['context'])

                                                                                ->variablePrototype()->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()
                                                                                ->variablePrototype()->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()

-                                                       ->arrayNode('mail')
+                                               ->end()
+                                       ->end()
+                                       ->arrayNode('login')
+                                               ->addDefaultsIfNotSet()
+                                               ->children()
+                                                       ->arrayNode('route')
+                                                               ->treatNullLike([])
+                                                               ->defaultValue($defaults['login']['route'])
+                                                               ->scalarPrototype()->end()
+                                                       ->end()
+                                                       ->arrayNode('view')

                                                                ->addDefaultsIfNotSet()
                                                                ->children()
                                                                ->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()
+                                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['login']['view']['name'])->end()
+                                                                       ->scalarNode('form')->cannotBeEmpty()->defaultValue($defaults['login']['view']['form'])->end()

                                                                        ->arrayNode('context')
                                                                        ->arrayNode('context')

-                                                                               ->treatNullLike(array())
-                                                                               ->defaultValue($defaults['recover']['mail']['context'])
+                                                                               ->treatNullLike([])
+                                                                               ->defaultValue($defaults['login']['view']['context'])

                                                                                ->variablePrototype()->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()
                                                ->end()
                                        ->end()
                                                                                ->variablePrototype()->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()
                                                ->end()
                                        ->end()

-                                       ->arrayNode('recover_mail')
+                                       ->arrayNode('recover')

                                                ->addDefaultsIfNotSet()
                                                ->children()
                                                        ->arrayNode('route')
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                                        ->arrayNode('route')

-                                                               ->treatNullLike(array())
-                                                               ->defaultValue($defaults['recover_mail']['route'])
+                                                               ->treatNullLike([])
+                                                               ->defaultValue($defaults['recover']['route'])

                                                                ->scalarPrototype()->end()
                                                        ->end()
                                                        ->arrayNode('view')
                                                                ->addDefaultsIfNotSet()
                                                                ->children()
                                                                ->scalarPrototype()->end()
                                                        ->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()
+                                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['recover']['view']['name'])->end()
+                                                                       ->scalarNode('form')->cannotBeEmpty()->defaultValue($defaults['recover']['view']['form'])->end()

                                                                        ->arrayNode('context')
                                                                        ->arrayNode('context')

-                                                                               ->treatNullLike(array())
-                                                                               ->defaultValue($defaults['recover_mail']['view']['context'])
+                                                                               ->treatNullLike([])
+                                                                               ->defaultValue($defaults['recover']['view']['context'])

                                                                                ->variablePrototype()->end()
                                                                        ->end()
                                                                ->end()
                                                                                ->variablePrototype()->end()
                                                                        ->end()
                                                                ->end()


@@ -301,12 +361,12 @@ class Configuration implements ConfigurationInterface {
                                                        ->arrayNode('mail')
                                                                ->addDefaultsIfNotSet()
                                                                ->children()
                                                        ->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()
+                                                                       ->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('context')
                                                                        ->arrayNode('context')

-                                                                               ->treatNullLike(array())
-                                                                               ->defaultValue($defaults['recover_mail']['mail']['context'])
+                                                                               ->treatNullLike([])
+                                                                               ->defaultValue($defaults['recover']['mail']['context'])

                                                                                ->variablePrototype()->end()
                                                                        ->end()
                                                                ->end()
                                                                                ->variablePrototype()->end()
                                                                        ->end()
                                                                ->end()


@@ -316,8 +376,18 @@ class Configuration implements ConfigurationInterface {
                                        ->arrayNode('register')
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                        ->arrayNode('register')
                                                ->addDefaultsIfNotSet()
                                                ->children()

+                                                       ->arrayNode('admin')
+                                                               ->treatNullLike([])
+                                                               ->defaultValue($defaults['edit']['admin'])
+                                                               ->variablePrototype()->end()
+                                                       ->end()
+                                                       ->arrayNode('field')
+                                                               ->treatNullLike([])
+                                                               ->defaultValue($defaults['register']['field'])
+                                                               ->variablePrototype()->end()
+                                                       ->end()

                                                        ->arrayNode('route')
                                                        ->arrayNode('route')

-                                                               ->treatNullLike(array())
+                                                               ->treatNullLike([])

                                                                ->defaultValue($defaults['register']['route'])
                                                                ->scalarPrototype()->end()
                                                        ->end()
                                                                ->defaultValue($defaults['register']['route'])
                                                                ->scalarPrototype()->end()
                                                        ->end()


@@ -327,7 +397,7 @@ class Configuration implements ConfigurationInterface {
                                                                        ->scalarNode('form')->cannotBeEmpty()->defaultValue($defaults['register']['view']['form'])->end()
                                                                        ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['register']['view']['name'])->end()
                                                                        ->arrayNode('context')
                                                                        ->scalarNode('form')->cannotBeEmpty()->defaultValue($defaults['register']['view']['form'])->end()
                                                                        ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['register']['view']['name'])->end()
                                                                        ->arrayNode('context')

-                                                                               ->treatNullLike(array())
+                                                                               ->treatNullLike([])

                                                                                ->defaultValue($defaults['register']['view']['context'])
                                                                                ->variablePrototype()->end()
                                                                        ->end()
                                                                                ->defaultValue($defaults['register']['view']['context'])
                                                                                ->variablePrototype()->end()
                                                                        ->end()


@@ -340,7 +410,7 @@ class Configuration implements ConfigurationInterface {
                                                                        ->scalarNode('html')->cannotBeEmpty()->defaultValue($defaults['register']['mail']['html'])->end()
                                                                        ->scalarNode('text')->cannotBeEmpty()->defaultValue($defaults['register']['mail']['text'])->end()
                                                                        ->arrayNode('context')
                                                                        ->scalarNode('html')->cannotBeEmpty()->defaultValue($defaults['register']['mail']['html'])->end()
                                                                        ->scalarNode('text')->cannotBeEmpty()->defaultValue($defaults['register']['mail']['text'])->end()
                                                                        ->arrayNode('context')

-                                                                               ->treatNullLike(array())
+                                                                               ->treatNullLike([])

                                                                                ->defaultValue($defaults['register']['mail']['context'])
                                                                                ->variablePrototype()->end()
                                                                        ->end()
                                                                                ->defaultValue($defaults['register']['mail']['context'])
                                                                                ->variablePrototype()->end()
                                                                        ->end()