Add default title and group

[userbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 6bf675b5780600a64bde94cb8a4a736aa24b821c..63ba75f5c9cc4966bf6dce917c211b781b2a3028 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -20,14 +20,18 @@ class Configuration implements ConfigurationInterface {
 
                //The bundle default values
                $defaults = [
 
                //The bundle default values
                $defaults = [

-                       'class' => [
+                       'class' => [

                                'group' => 'Rapsys\\UserBundle\\Entity\\Group',
                                'title' => 'Rapsys\\UserBundle\\Entity\\Title',
                                'user' => 'Rapsys\\UserBundle\\Entity\\User'
                        ],
                                'group' => 'Rapsys\\UserBundle\\Entity\\Group',
                                'title' => 'Rapsys\\UserBundle\\Entity\\Title',
                                'user' => 'Rapsys\\UserBundle\\Entity\\User'
                        ],

+                       'default' => [
+                               'title' => 'Mister',
+                               'group' => [ 'User' ]
+                       ],

                        'route' => [
                        'route' => [

-                               'homepage' => [
-                                       'name' => 'rapsys_user_homepage',
+                               'index' => [
+                                       'name' => 'rapsys_user_index',

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


@@ -52,6 +56,7 @@ class Configuration implements ConfigurationInterface {
                                'mail' => 'contact@example.com'
                        ],
                        'login' => [
                                'mail' => 'contact@example.com'
                        ],
                        'login' => [

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

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


@@ -59,6 +64,7 @@ class Configuration implements ConfigurationInterface {
                                ]
                        ],
                        'recover' => [
                                ]
                        ],
                        'recover' => [

+                               'route' => ['index' => 'index_url', 'recover_mail' => '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',


@@ -68,11 +74,11 @@ class Configuration implements ConfigurationInterface {
                                        'subject' => 'Welcome back!',
                                        'html' => '@RapsysUser/mail/recover.html.twig',
                                        'text' => '@RapsysUser/mail/recover.text.twig',
                                        'subject' => 'Welcome back!',
                                        'html' => '@RapsysUser/mail/recover.html.twig',
                                        'text' => '@RapsysUser/mail/recover.text.twig',

-                                       'route' => ['homepage' => 'homepage_url', 'recover_mail' => 'recover_url'],

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

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

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


@@ -82,11 +88,11 @@ class Configuration implements ConfigurationInterface {
                                        'subject' => 'Welcome back!',
                                        'html' => '@RapsysUser/mail/recover_mail.html.twig',
                                        'text' => '@RapsysUser/mail/recover_mail.text.twig',
                                        'subject' => 'Welcome back!',
                                        'html' => '@RapsysUser/mail/recover_mail.html.twig',
                                        'text' => '@RapsysUser/mail/recover_mail.text.twig',

-                                       'route' => ['homepage' => 'homepage_url'],

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

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

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


@@ -96,7 +102,6 @@ class Configuration implements ConfigurationInterface {
                                        'subject' => 'Welcome!',
                                        'html' => '@RapsysUser/mail/register.html.twig',
                                        'text' => '@RapsysUser/mail/register.text.twig',
                                        'subject' => 'Welcome!',
                                        'html' => '@RapsysUser/mail/register.html.twig',
                                        'text' => '@RapsysUser/mail/register.text.twig',

-                                       'route' => ['homepage' => 'homepage_url'],

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


@@ -122,16 +127,27 @@ class Configuration implements ConfigurationInterface {
                                                        ->scalarNode('user')->cannotBeEmpty()->defaultValue($defaults['class']['user'])->end()
                                                ->end()
                                        ->end()
                                                        ->scalarNode('user')->cannotBeEmpty()->defaultValue($defaults['class']['user'])->end()
                                                ->end()
                                        ->end()

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

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

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

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

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

                                                                        ->arrayNode('context')
                                                                                ->treatNullLike(array())
                                                                        ->arrayNode('context')
                                                                                ->treatNullLike(array())

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

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


@@ -192,6 +208,11 @@ class Configuration implements ConfigurationInterface {
                                        ->arrayNode('login')
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                        ->arrayNode('login')
                                                ->addDefaultsIfNotSet()
                                                ->children()

+                                                       ->arrayNode('route')
+                                                               ->treatNullLike(array())
+                                                               ->defaultValue($defaults['login']['route'])
+                                                               ->scalarPrototype()->end()
+                                                       ->end()

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


@@ -200,7 +221,7 @@ class Configuration implements ConfigurationInterface {
                                                                        ->arrayNode('context')
                                                                                ->treatNullLike(array())
                                                                                ->defaultValue($defaults['login']['view']['context'])
                                                                        ->arrayNode('context')
                                                                                ->treatNullLike(array())
                                                                                ->defaultValue($defaults['login']['view']['context'])

-                                                                               ->scalarPrototype()->end()
+                                                                               ->variablePrototype()->end()

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


@@ -209,6 +230,11 @@ class Configuration implements ConfigurationInterface {
                                        ->arrayNode('recover')
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                        ->arrayNode('recover')
                                                ->addDefaultsIfNotSet()
                                                ->children()

+                                                       ->arrayNode('route')
+                                                               ->treatNullLike(array())
+                                                               ->defaultValue($defaults['recover']['route'])
+                                                               ->scalarPrototype()->end()
+                                                       ->end()

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


@@ -217,7 +243,7 @@ class Configuration implements ConfigurationInterface {
                                                                        ->arrayNode('context')
                                                                                ->treatNullLike(array())
                                                                                ->defaultValue($defaults['recover']['view']['context'])
                                                                        ->arrayNode('context')
                                                                                ->treatNullLike(array())
                                                                                ->defaultValue($defaults['recover']['view']['context'])

-                                                                               ->scalarPrototype()->end()
+                                                                               ->variablePrototype()->end()

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


@@ -227,15 +253,10 @@ class Configuration implements ConfigurationInterface {
                                                                        ->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('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('route')
-                                                                               ->treatNullLike(array())
-                                                                               ->defaultValue($defaults['recover']['mail']['route'])
-                                                                               ->scalarPrototype()->end()
-                                                                       ->end()

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

-                                                                               ->scalarPrototype()->end()
+                                                                               ->variablePrototype()->end()

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


@@ -244,6 +265,11 @@ class Configuration implements ConfigurationInterface {
                                        ->arrayNode('recover_mail')
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                        ->arrayNode('recover_mail')
                                                ->addDefaultsIfNotSet()
                                                ->children()

+                                                       ->arrayNode('route')
+                                                               ->treatNullLike(array())
+                                                               ->defaultValue($defaults['recover_mail']['route'])
+                                                               ->scalarPrototype()->end()
+                                                       ->end()

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


@@ -252,7 +278,7 @@ class Configuration implements ConfigurationInterface {
                                                                        ->arrayNode('context')
                                                                                ->treatNullLike(array())
                                                                                ->defaultValue($defaults['recover_mail']['view']['context'])
                                                                        ->arrayNode('context')
                                                                                ->treatNullLike(array())
                                                                                ->defaultValue($defaults['recover_mail']['view']['context'])

-                                                                               ->scalarPrototype()->end()
+                                                                               ->variablePrototype()->end()

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


@@ -262,15 +288,10 @@ class Configuration implements ConfigurationInterface {
                                                                        ->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']['mail']['subject'])->end()
                                                                        ->scalarNode('html')->cannotBeEmpty()->defaultValue($defaults['recover_mail']['mail']['html'])->end()
                                                                        ->scalarNode('text')->cannotBeEmpty()->defaultValue($defaults['recover_mail']['mail']['text'])->end()

-                                                                       ->arrayNode('route')
-                                                                               ->treatNullLike(array())
-                                                                               ->defaultValue($defaults['recover_mail']['mail']['route'])
-                                                                               ->scalarPrototype()->end()
-                                                                       ->end()

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

-                                                                               ->scalarPrototype()->end()
+                                                                               ->variablePrototype()->end()

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


@@ -279,6 +300,11 @@ class Configuration implements ConfigurationInterface {
                                        ->arrayNode('register')
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                        ->arrayNode('register')
                                                ->addDefaultsIfNotSet()
                                                ->children()

+                                                       ->arrayNode('route')
+                                                               ->treatNullLike(array())
+                                                               ->defaultValue($defaults['register']['route'])
+                                                               ->scalarPrototype()->end()
+                                                       ->end()

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


@@ -287,7 +313,7 @@ class Configuration implements ConfigurationInterface {
                                                                        ->arrayNode('context')
                                                                                ->treatNullLike(array())
                                                                                ->defaultValue($defaults['register']['view']['context'])
                                                                        ->arrayNode('context')
                                                                                ->treatNullLike(array())
                                                                                ->defaultValue($defaults['register']['view']['context'])

-                                                                               ->scalarPrototype()->end()
+                                                                               ->variablePrototype()->end()

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


@@ -297,15 +323,10 @@ class Configuration implements ConfigurationInterface {
                                                                        ->scalarNode('subject')->cannotBeEmpty()->defaultValue($defaults['register']['mail']['subject'])->end()
                                                                        ->scalarNode('html')->cannotBeEmpty()->defaultValue($defaults['register']['mail']['html'])->end()
                                                                        ->scalarNode('text')->cannotBeEmpty()->defaultValue($defaults['register']['mail']['text'])->end()
                                                                        ->scalarNode('subject')->cannotBeEmpty()->defaultValue($defaults['register']['mail']['subject'])->end()
                                                                        ->scalarNode('html')->cannotBeEmpty()->defaultValue($defaults['register']['mail']['html'])->end()
                                                                        ->scalarNode('text')->cannotBeEmpty()->defaultValue($defaults['register']['mail']['text'])->end()

-                                                                       ->arrayNode('route')
-                                                                               ->treatNullLike(array())
-                                                                               ->defaultValue($defaults['register']['mail']['route'])
-                                                                               ->scalarPrototype()->end()
-                                                                       ->end()

                                                                        ->arrayNode('context')
                                                                                ->treatNullLike(array())
                                                                                ->defaultValue($defaults['register']['mail']['context'])
                                                                        ->arrayNode('context')
                                                                                ->treatNullLike(array())
                                                                                ->defaultValue($defaults['register']['mail']['context'])

-                                                                               ->scalarPrototype()->end()
+                                                                               ->variablePrototype()->end()

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