Cleanup

[userbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index fa3306c179eb09bd465c233dfa1056f8e3d5f7ed..28f6fc2e86ca780d564373ccd1ff42910fd47de1 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 {
        /**
@@ -34,45 +34,46 @@ 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' => [
                                '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' => [],
-                       'languages' => [
-                               'en_gb' => 'English'
-                       ],
                        'contact' => [
                                'address' => 'contact@example.com',
                                'name' => 'John Doe'
@@ -143,8 +144,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
@@ -152,15 +153,34 @@ 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')
                                                ->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'])
@@ -244,12 +264,6 @@ class Configuration implements ConfigurationInterface {
                                                ->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()