Readd languages and locale in default key

[userbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 1dc51669a73fef32915335b81eb57f6977e06e31..208bf98bf09688253504c95b5e66827285f30ae3 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -34,12 +34,17 @@ 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' => 'ROLE_ADMIN',
                                'civility' => 'Mister',
+                               'languages' => [
+                                       'en_gb' => 'English'
+                               ],
+                               'locales' => [ 'en_gb' ],
                                'group' => [ 'User' ]
                        ],
                        'route' => [
@@ -69,22 +74,26 @@ 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' => [
+                               'admin' => ['mail' => true, 'pseudonym' => true],
                                'field' => [],
                                'route' => ['index' => 'index_url'],
                                'view' => [
                                        'name' => '@RapsysUser/form/register.html.twig',
-                                       'edit' => 'Rapsys\UserBundle\Form\RegisterType',
-                                       'reset' => 'Rapsys\UserBundle\Form\LoginType',
+                                       'edit' => 'Rapsys\UserBundle\Form\EditType',
+                                       'reset' => 'Rapsys\UserBundle\Form\ResetType',
+                                       'context' => []
+                               ]
+                       ],
+                       'index' => [
+                               'route' => ['index' => 'index_url'],
+                               'view' => [
+                                       'name' => '@RapsysUser/form/index.html.twig',
                                        'context' => []
                                ]
                        ],
@@ -100,7 +109,7 @@ class Configuration implements ConfigurationInterface {
                                'route' => ['index' => 'index_url', 'recover' => 'recover_url'],
                                'view' => [
                                        'name' => '@RapsysUser/form/recover.html.twig',
-                                       'form' => 'Rapsys\UserBundle\Form\LoginType',
+                                       'form' => 'Rapsys\UserBundle\Form\RecoverType',
                                        'context' => []
                                ],
                                'mail' => [
@@ -111,6 +120,7 @@ class Configuration implements ConfigurationInterface {
                                ]
                        ],
                        'register' => [
+                               'admin' => [],
                                'field' => [],
                                'route' => ['index' => 'index_url', 'confirm' => 'confirm_url'],
                                'view' => [
@@ -143,14 +153,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()
@@ -228,19 +264,11 @@ class Configuration implements ConfigurationInterface {
                                                ->defaultValue($defaults['translate'])
                                                ->scalarPrototype()->end()
                                        ->end()
-                                       #TODO: see if we can't prevent key normalisation with ->normalizeKeys(false)
-                                       ->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'])
-                                               ->scalarPrototype()->end()
-                                       ->end()
                                        ->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')
@@ -251,6 +279,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'])
@@ -276,6 +309,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()
@@ -336,6 +390,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'])