Replace disabled with enable

[userbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 1dc51669a73fef32915335b81eb57f6977e06e31..22c34f09a2ac3e0aca591eb4dc6143ed714fedc6 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -69,13 +69,12 @@ class Configuration implements ConfigurationInterface {
                                ]
                        ],
                        'translate' => [],
-                       'locales' => '%kernel.translator.fallbacks%',
                        'languages' => [
                                'en_gb' => 'English'
                        ],
                        'contact' => [
-                               'title' => 'John Doe',
-                               'mail' => 'contact@example.com'
+                               'address' => 'contact@example.com',
+                               'name' => 'John Doe'
                        ],
                        'context' => [],
                        'edit' => [
@@ -229,8 +228,6 @@ class Configuration implements ConfigurationInterface {
                                                ->scalarPrototype()->end()
                                        ->end()
                                        #TODO: see if we can't prevent key normalisation with ->normalizeKeys(false)
-                                       ->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'])
@@ -239,8 +236,8 @@ class Configuration implements ConfigurationInterface {
                                        ->arrayNode('contact')
                                                ->addDefaultsIfNotSet()
                                                ->children()
-                                                       ->scalarNode('title')->cannotBeEmpty()->defaultValue($defaults['contact']['title'])->end()
-                                                       ->scalarNode('mail')->cannotBeEmpty()->defaultValue($defaults['contact']['mail'])->end()
+                                                       ->scalarNode('address')->cannotBeEmpty()->defaultValue($defaults['contact']['address'])->end()
+                                                       ->scalarNode('name')->cannotBeEmpty()->defaultValue($defaults['contact']['name'])->end()
                                                ->end()
                                        ->end()
                                        ->arrayNode('context')