Remove guestid and guestgroup in favour of more reliable defaultgroup

[userbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 80a35526834a682611176b9eb1bd0dfa55c965e0..41c6df886736701497061edfcdd9b370716da253 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -11,11 +11,11 @@
 
 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}
  *
@@ -45,9 +45,13 @@ class Configuration implements ConfigurationInterface {
                                        'en_gb' => 'English'
                                ],
                                'locales' => [ 'en_gb' ],
-                               'group' => [ 'User' ]
+                               'group' => [ 'Guest' ]
                        ],
                        'route' => [
+                               'home' => [
+                                       'name' => 'rapsysuser',
+                                       'context' => []
+                               ],
                                'confirm' => [
                                        'name' => 'rapsysuser_confirm',
                                        'context' => []
@@ -73,44 +77,44 @@ class Configuration implements ConfigurationInterface {
                                        'context' => []
                                ]
                        ],
-                       'translate' => [],
+                       'translate' => [ '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!',
@@ -122,11 +126,11 @@ 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!',
@@ -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()