Add twig service to default controller constructor

[userbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 3ceb22ff5dc46648e9f9ce98c4dbea92d8bc8725..719e95274b37220bf97834d32201f2fed0a34024 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -69,7 +69,6 @@ class Configuration implements ConfigurationInterface {
                                ]
                        ],
                        'translate' => [],
                                ]
                        ],
                        'translate' => [],

-                       'locales' => '%kernel.translator.fallbacks%',

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


@@ -228,7 +227,7 @@ class Configuration implements ConfigurationInterface {
                                                ->defaultValue($defaults['translate'])
                                                ->scalarPrototype()->end()
                                        ->end()
                                                ->defaultValue($defaults['translate'])
                                                ->scalarPrototype()->end()
                                        ->end()

-                                       ->scalarNode('locales')->cannotBeEmpty()->defaultValue($defaults['locales'])->end()
+                                       #TODO: see if we can't prevent key normalisation with ->normalizeKeys(false)

                                        ->arrayNode('languages')
                                                ->treatNullLike([])
                                                ->defaultValue($defaults['languages'])
                                        ->arrayNode('languages')
                                                ->treatNullLike([])
                                                ->defaultValue($defaults['languages'])