Version 0.5.2

[userbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 208bf98bf09688253504c95b5e66827285f30ae3..12088ae82bac8f9b33d67152b518cdde4e9cdba6 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -11,17 +11,17 @@
 
 namespace Rapsys\UserBundle\DependencyInjection;
 
+use Rapsys\UserBundle\RapsysUserBundle;
+
 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
- *
- * {@inheritdoc}
  */
 class Configuration implements ConfigurationInterface {
        /**
@@ -45,75 +45,79 @@ class Configuration implements ConfigurationInterface {
                                        'en_gb' => 'English'
                                ],
                                'locales' => [ 'en_gb' ],
-                               'group' => [ 'User' ]
+                               'group' => [ 'Guest' ]
                        ],
                        'route' => [
+                               'home' => [
+                                       'name' => 'rapsysuser',
+                                       'context' => []
+                               ],
                                'confirm' => [
-                                       'name' => 'rapsys_user_confirm',
+                                       'name' => 'rapsysuser_confirm',
                                        'context' => []
                                ],
                                'edit' => [
-                                       'name' => 'rapsys_user_edit',
+                                       'name' => 'rapsysuser_edit',
                                        'context' => []
                                ],
                                'index' => [
-                                       'name' => 'rapsys_user_index',
+                                       'name' => 'rapsysuser_index',
                                        'context' => []
                                ],
                                'login' => [
-                                       'name' => 'rapsys_user_login',
+                                       'name' => 'rapsysuser_login',
                                        'context' => []
                                ],
                                'recover' => [
-                                       'name' => 'rapsys_user_recover',
+                                       'name' => 'rapsysuser_recover',
                                        'context' => []
                                ],
                                'register' => [
-                                       'name' => 'rapsys_user_register',
+                                       'name' => 'rapsysuser_register',
                                        'context' => []
                                ]
                        ],
-                       'translate' => [],
+                       'translate' => [ 'site', 'title' ],
                        'contact' => [
                                'address' => 'contact@example.com',
                                'name' => 'John Doe'
                        ],
                        'context' => [],
                        'edit' => [
-                               'admin' => ['mail' => true, 'pseudonym' => true],
+                               'admin' => [ 'mail' => true ],
                                'field' => [],
-                               'route' => ['index' => 'index_url'],
+                               'route' => [ 'home' => 'home_url' ],
                                'view' => [
-                                       'name' => '@RapsysUser/form/register.html.twig',
+                                       'name' => '@RapsysUser/register.html.twig',
                                        'edit' => 'Rapsys\UserBundle\Form\EditType',
                                        'reset' => 'Rapsys\UserBundle\Form\ResetType',
-                                       'context' => []
+                                       'context' => [ 'title' => 'Edit' ]
                                ]
                        ],
                        'index' => [
-                               'route' => ['index' => 'index_url'],
+                               'route' => [ 'home' => 'home_url' ],
                                'view' => [
-                                       'name' => '@RapsysUser/form/index.html.twig',
-                                       'context' => []
+                                       'name' => '@RapsysUser/index.html.twig',
+                                       'context' => [ 'title' => 'Index' ]
                                ]
                        ],
                        'login' => [
-                               'route' => ['index' => 'index_url'],
+                               'route' => [ 'home' => 'home_url', 'recover' => 'recover_url' ],
                                'view' => [
-                                       'name' => '@RapsysUser/form/login.html.twig',
+                                       'name' => '@RapsysUser/login.html.twig',
                                        'form' => 'Rapsys\UserBundle\Form\LoginType',
-                                       'context' => []
+                                       'context' => [ 'title' => 'Login' ]
                                ]
                        ],
                        'recover' => [
-                               'route' => ['index' => 'index_url', 'recover' => 'recover_url'],
+                               'route' => [ 'home' => 'home_url', 'recover' => 'recover_url' ],
                                'view' => [
-                                       'name' => '@RapsysUser/form/recover.html.twig',
+                                       'name' => '@RapsysUser/recover.html.twig',
                                        'form' => 'Rapsys\UserBundle\Form\RecoverType',
-                                       'context' => []
+                                       'context' => [ 'title' => 'Recover' ]
                                ],
                                'mail' => [
-                                       'subject' => 'Welcome back!',
+                                       'subject' => 'Welcome back to %%site%%!',
                                        'html' => '@RapsysUser/mail/recover.html.twig',
                                        'text' => '@RapsysUser/mail/recover.text.twig',
                                        'context' => []
@@ -122,14 +126,14 @@ class Configuration implements ConfigurationInterface {
                        'register' => [
                                'admin' => [],
                                'field' => [],
-                               'route' => ['index' => 'index_url', 'confirm' => 'confirm_url'],
+                               'route' => [ 'home' => 'home_url', 'confirm' => 'confirm_url' ],
                                'view' => [
-                                       'name' => '@RapsysUser/form/register.html.twig',
+                                       'name' => '@RapsysUser/register.html.twig',
                                        'form' => 'Rapsys\UserBundle\Form\RegisterType',
-                                       'context' => []
+                                       'context' => [ 'title' => 'Register' ]
                                ],
                                'mail' => [
-                                       'subject' => 'Welcome!',
+                                       'subject' => 'Welcome to %%site%%!',
                                        'html' => '@RapsysUser/mail/register.html.twig',
                                        'text' => '@RapsysUser/mail/register.text.twig',
                                        'context' => []
@@ -144,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
                 *
-                * @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
@@ -202,24 +206,35 @@ class Configuration implements ConfigurationInterface {
                                                                        ->end()
                                                                ->end()
                                                        ->end()
-                                                       ->arrayNode('index')
+                                                       ->arrayNode('edit')
                                                                ->addDefaultsIfNotSet()
                                                                ->children()
-                                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['index']['name'])->end()
+                                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['edit']['name'])->end()
                                                                        ->arrayNode('context')
                                                                                ->treatNullLike([])
-                                                                               ->defaultValue($defaults['route']['index']['context'])
+                                                                               ->defaultValue($defaults['route']['edit']['context'])
                                                                                ->scalarPrototype()->end()
                                                                        ->end()
                                                                ->end()
                                                        ->end()
-                                                       ->arrayNode('edit')
+                                                       ->arrayNode('home')
                                                                ->addDefaultsIfNotSet()
                                                                ->children()
-                                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['edit']['name'])->end()
+                                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['route']['home']['name'])->end()
                                                                        ->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()