Add note about doctrine orm factory double definition

[userbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index ffe1d146aad5e97c32f2c5adfeb1c98407fb057a..208bf98bf09688253504c95b5e66827285f30ae3 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -41,6 +41,10 @@ class Configuration implements ConfigurationInterface {
                        'default' => [
                                'admin' => 'ROLE_ADMIN',
                                'civility' => 'Mister',
                        'default' => [
                                'admin' => 'ROLE_ADMIN',
                                'civility' => 'Mister',

+                               'languages' => [
+                                       'en_gb' => 'English'
+                               ],
+                               'locales' => [ 'en_gb' ],

                                'group' => [ 'User' ]
                        ],
                        'route' => [
                                'group' => [ 'User' ]
                        ],
                        'route' => [


@@ -150,7 +154,8 @@ class Configuration implements ConfigurationInterface {
                                ->children()
                                        ->arrayNode('class')
                                                ->addDefaultsIfNotSet()
                                ->children()
                                        ->arrayNode('class')
                                                ->addDefaultsIfNotSet()

-                                               ->ignoreExtraKeys()
+                                               #XXX: ignoreExtraKeys(bool $remove = true)
+                                               ->ignoreExtraKeys(false)

                                                ->children()
                                                        ->scalarNode('civility')->cannotBeEmpty()->defaultValue($defaults['class']['civility'])->end()
                                                        ->scalarNode('group')->cannotBeEmpty()->defaultValue($defaults['class']['group'])->end()
                                                ->children()
                                                        ->scalarNode('civility')->cannotBeEmpty()->defaultValue($defaults['class']['civility'])->end()
                                                        ->scalarNode('group')->cannotBeEmpty()->defaultValue($defaults['class']['group'])->end()


@@ -159,10 +164,23 @@ class Configuration implements ConfigurationInterface {
                                        ->end()
                                        ->arrayNode('default')
                                                ->addDefaultsIfNotSet()
                                        ->end()
                                        ->arrayNode('default')
                                                ->addDefaultsIfNotSet()

-                                               ->ignoreExtraKeys()
+                                               #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'])