Add ROLE_ related note

[userbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 4d2d3bf2c1a3f7c9e160a2b9edd87d6c5414aa49..22c34f09a2ac3e0aca591eb4dc6143ed714fedc6 100644 (file)
--- 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 = [
@@ -67,20 +69,21 @@ class Configuration implements ConfigurationInterface {
                                ]
                        ],
                        'translate' => [],
-                       'locales' => '%kernel.translator.fallbacks%',
                        'languages' => [
                                'en_gb' => 'English'
                        ],
                        'contact' => [
-                               'title' => 'John Doe',
-                               'mail' => 'contact@example.com'
+                               'address' => 'contact@example.com',
+                               'name' => 'John Doe'
                        ],
                        '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 +99,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 +110,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' => [
@@ -143,15 +147,9 @@ class Configuration implements ConfigurationInterface {
                                                ->scalarPrototype()->end()
                                        ->end()
                                        ->arrayNode('default')
-                                               ->addDefaultsIfNotSet()
-                                               ->children()
-                                                       ->scalarNode('civility')->cannotBeEmpty()->defaultValue($defaults['default']['civility'])->end()
-                                                       ->arrayNode('group')
-                                                               ->treatNullLike([])
-                                                               ->defaultValue($defaults['default']['group'])
-                                                               ->scalarPrototype()->end()
-                                                       ->end()
-                                               ->end()
+                                               ->treatNullLike([])
+                                               ->defaultValue($defaults['default'])
+                                               ->variablePrototype()->end()
                                        ->end()
                                        ->arrayNode('route')
                                                ->addDefaultsIfNotSet()
@@ -229,7 +227,7 @@ class Configuration implements ConfigurationInterface {
                                                ->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'])
@@ -238,8 +236,8 @@ class Configuration implements ConfigurationInterface {
                                        ->arrayNode('contact')
                                                ->addDefaultsIfNotSet()
                                                ->children()
-                                                       ->scalarNode('title')->cannotBeEmpty()->defaultValue($defaults['contact']['title'])->end()
-                                                       ->scalarNode('mail')->cannotBeEmpty()->defaultValue($defaults['contact']['mail'])->end()
+                                                       ->scalarNode('address')->cannotBeEmpty()->defaultValue($defaults['contact']['address'])->end()
+                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['contact']['name'])->end()
                                                ->end()
                                        ->end()
                                        ->arrayNode('context')
@@ -250,6 +248,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'])
@@ -258,7 +261,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([])
@@ -329,6 +333,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'])