Add user bundle templates

[userbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index fa3306c179eb09bd465c233dfa1056f8e3d5f7ed..41c6df886736701497061edfcdd9b370716da253 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -11,17 +11,17 @@
 
 namespace Rapsys\UserBundle\DependencyInjection;
 
 
 namespace Rapsys\UserBundle\DependencyInjection;
 

+use Rapsys\UserBundle\RapsysUserBundle;
+

 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 

-use Rapsys\UserBundle\RapsysUserBundle;
-

 /**
 /**

+ * {@inheritdoc}
+ *

  * This is the class that validates and merges configuration from your app/config files.
  *
  * @link http://symfony.com/doc/current/cookbook/bundles/configuration.html
  * This is the class that validates and merges configuration from your app/config files.
  *
  * @link http://symfony.com/doc/current/cookbook/bundles/configuration.html

- *
- * {@inheritdoc}

  */
 class Configuration implements ConfigurationInterface {
        /**
  */
 class Configuration implements ConfigurationInterface {
        /**


@@ -34,82 +34,87 @@ class Configuration implements ConfigurationInterface {
                //The bundle default values
                $defaults = [
                        'class' => [
                //The bundle default values
                $defaults = [
                        'class' => [

-                               'group' => 'Rapsys\\UserBundle\\Entity\\Group',

                                'civility' => 'Rapsys\\UserBundle\\Entity\\Civility',
                                'civility' => 'Rapsys\\UserBundle\\Entity\\Civility',

+                               'group' => 'Rapsys\\UserBundle\\Entity\\Group',

                                'user' => 'Rapsys\\UserBundle\\Entity\\User'
                        ],
                        'default' => [
                                'admin' => 'ROLE_ADMIN',
                                'civility' => 'Mister',
                                'user' => 'Rapsys\\UserBundle\\Entity\\User'
                        ],
                        'default' => [
                                'admin' => 'ROLE_ADMIN',
                                'civility' => 'Mister',

-                               'group' => [ 'User' ]
+                               'languages' => [
+                                       'en_gb' => 'English'
+                               ],
+                               'locales' => [ 'en_gb' ],
+                               'group' => [ 'Guest' ]

                        ],
                        'route' => [
                        ],
                        'route' => [

+                               'home' => [
+                                       'name' => 'rapsysuser',
+                                       'context' => []
+                               ],

                                'confirm' => [
                                'confirm' => [

-                                       'name' => 'rapsys_user_confirm',
+                                       'name' => 'rapsysuser_confirm',

                                        'context' => []
                                ],
                                'edit' => [
                                        'context' => []
                                ],
                                'edit' => [

-                                       'name' => 'rapsys_user_edit',
+                                       'name' => 'rapsysuser_edit',

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

-                                       'name' => 'rapsys_user_index',
+                                       'name' => 'rapsysuser_index',

                                        'context' => []
                                ],
                                'login' => [
                                        'context' => []
                                ],
                                'login' => [

-                                       'name' => 'rapsys_user_login',
+                                       'name' => 'rapsysuser_login',

                                        'context' => []
                                ],
                                'recover' => [
                                        'context' => []
                                ],
                                'recover' => [

-                                       'name' => 'rapsys_user_recover',
+                                       'name' => 'rapsysuser_recover',

                                        'context' => []
                                ],
                                'register' => [
                                        'context' => []
                                ],
                                'register' => [

-                                       'name' => 'rapsys_user_register',
+                                       'name' => 'rapsysuser_register',

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

-                       'translate' => [],
-                       'languages' => [
-                               'en_gb' => 'English'
-                       ],
+                       'translate' => [ 'title' ],

                        'contact' => [
                                'address' => 'contact@example.com',
                                'name' => 'John Doe'
                        ],
                        'context' => [],
                        'edit' => [
                        'contact' => [
                                'address' => 'contact@example.com',
                                'name' => 'John Doe'
                        ],
                        'context' => [],
                        'edit' => [

-                               'admin' => ['mail' => true, 'pseudonym' => true],
+                               'admin' => [ 'mail' => true ],

                                'field' => [],
                                'field' => [],

-                               'route' => ['index' => 'index_url'],
+                               'route' => [ 'home' => 'home_url' ],

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

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

                                        'edit' => 'Rapsys\UserBundle\Form\EditType',
                                        'reset' => 'Rapsys\UserBundle\Form\ResetType',
                                        'edit' => 'Rapsys\UserBundle\Form\EditType',
                                        'reset' => 'Rapsys\UserBundle\Form\ResetType',

-                                       'context' => []
+                                       'context' => [ 'title' => 'Edit' ]

                                ]
                        ],
                        'index' => [
                                ]
                        ],
                        'index' => [

-                               'route' => ['index' => 'index_url'],
+                               'route' => [ 'home' => 'home_url' ],

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

-                                       'name' => '@RapsysUser/form/index.html.twig',
-                                       'context' => []
+                                       'name' => '@RapsysUser/index.html.twig',
+                                       'context' => [ 'title' => 'Index' ]

                                ]
                        ],
                        'login' => [
                                ]
                        ],
                        'login' => [

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

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

-                                       'name' => '@RapsysUser/form/login.html.twig',
+                                       'name' => '@RapsysUser/login.html.twig',

                                        'form' => 'Rapsys\UserBundle\Form\LoginType',
                                        'form' => 'Rapsys\UserBundle\Form\LoginType',

-                                       'context' => []
+                                       'context' => [ 'title' => 'Login' ]

                                ]
                        ],
                        'recover' => [
                                ]
                        ],
                        'recover' => [

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

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

-                                       'name' => '@RapsysUser/form/recover.html.twig',
+                                       'name' => '@RapsysUser/recover.html.twig',

                                        'form' => 'Rapsys\UserBundle\Form\RecoverType',
                                        'form' => 'Rapsys\UserBundle\Form\RecoverType',

-                                       'context' => []
+                                       'context' => [ 'title' => 'Recover' ]

                                ],
                                'mail' => [
                                        'subject' => 'Welcome back!',
                                ],
                                'mail' => [
                                        'subject' => 'Welcome back!',


@@ -121,11 +126,11 @@ class Configuration implements ConfigurationInterface {
                        'register' => [
                                'admin' => [],
                                'field' => [],
                        'register' => [
                                'admin' => [],
                                'field' => [],

-                               'route' => ['index' => 'index_url', 'confirm' => 'confirm_url'],
+                               'route' => [ 'home' => 'home_url', 'confirm' => 'confirm_url' ],

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

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

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

-                                       'context' => []
+                                       'context' => [ 'title' => 'Register' ]

                                ],
                                'mail' => [
                                        'subject' => 'Welcome!',
                                ],
                                'mail' => [
                                        'subject' => 'Welcome!',


@@ -143,8 +148,8 @@ class Configuration implements ConfigurationInterface {
                 * @link http://symfony.com/doc/current/components/config/definition.html
                 * @link https://github.com/symfony/assetic-bundle/blob/master/DependencyInjection/Configuration.php#L63
                 *
                 * @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
+                * @see php bin/console config:dump-reference rapsysuser to dump default config
+                * @see php bin/console debug:config rapsysuser to dump config

                 */
                $treeBuilder
                        //Parameters
                 */
                $treeBuilder
                        //Parameters


@@ -152,15 +157,34 @@ class Configuration implements ConfigurationInterface {
                                ->addDefaultsIfNotSet()
                                ->children()
                                        ->arrayNode('class')
                                ->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')
                                                ->addDefaultsIfNotSet()
                                        ->end()
                                        ->arrayNode('default')
                                                ->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()
                                                ->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'])
                                                        ->arrayNode('group')
                                                                ->treatNullLike([])
                                                                ->defaultValue($defaults['default']['group'])


@@ -182,24 +206,35 @@ class Configuration implements ConfigurationInterface {
                                                                        ->end()
                                                                ->end()
                                                        ->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()

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

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

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

                                                                        ->arrayNode('context')
                                                                                ->treatNullLike([])
                                                                        ->arrayNode('context')
                                                                                ->treatNullLike([])

-                                                                               ->defaultValue($defaults['route']['index']['context'])
+                                                                               ->defaultValue($defaults['route']['edit']['context'])

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

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

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

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

                                                                        ->arrayNode('context')
                                                                                ->treatNullLike([])
                                                                        ->arrayNode('context')
                                                                                ->treatNullLike([])

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

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


@@ -244,12 +279,6 @@ class Configuration implements ConfigurationInterface {
                                                ->defaultValue($defaults['translate'])
                                                ->scalarPrototype()->end()
                                        ->end()
                                                ->defaultValue($defaults['translate'])
                                                ->scalarPrototype()->end()
                                        ->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()
                                        ->arrayNode('contact')
                                                ->addDefaultsIfNotSet()
                                                ->children()