瀏覽代碼

Merge pull request #3031 from Soullivaneuh/config-improve

Improve true/false/null default values on configuration
Thomas 10 年之前
父節點
當前提交
dccac1c600
共有 1 個文件被更改,包括 23 次插入23 次删除
  1. 23 23
      DependencyInjection/Configuration.php

+ 23 - 23
DependencyInjection/Configuration.php

@@ -66,7 +66,7 @@ class Configuration implements ConfigurationInterface
                             ->defaultValue(array('VIEW', 'EDIT', 'DELETE', 'UNDELETE', 'OPERATOR', 'MASTER', 'OWNER'))
                             ->prototype('scalar')->end()
                         ->end()
-                        ->scalarNode('acl_user_manager')->defaultValue(null)->end()
+                        ->scalarNode('acl_user_manager')->defaultNull()->end()
                     ->end()
                 ->end()
 
@@ -75,12 +75,12 @@ class Configuration implements ConfigurationInterface
                 ->arrayNode('options')
                     ->addDefaultsIfNotSet()
                     ->children()
-                        ->booleanNode('html5_validate')->defaultValue(true)->end()
-                        ->booleanNode('confirm_exit')->defaultValue(true)->end()
-                        ->booleanNode('use_select2')->defaultValue(true)->end()
-                        ->booleanNode('use_icheck')->defaultValue(true)->end()
-                        ->booleanNode('use_bootlint')->defaultValue(false)->end()
-                        ->integerNode('pager_links')->defaultValue(null)->end()
+                        ->booleanNode('html5_validate')->defaultTrue()->end()
+                        ->booleanNode('confirm_exit')->defaultTrue()->end()
+                        ->booleanNode('use_select2')->defaultTrue()->end()
+                        ->booleanNode('use_icheck')->defaultTrue()->end()
+                        ->booleanNode('use_bootlint')->defaultFalse()->end()
+                        ->integerNode('pager_links')->defaultNull()->end()
                         ->scalarNode('form_type')->defaultValue('standard')->end()
                         ->integerNode('dropdown_number_groups_per_colums')->defaultValue(2)->end()
                         ->enumNode('title_mode')
@@ -197,21 +197,21 @@ class Configuration implements ConfigurationInterface
                 ->arrayNode('admin_services')
                     ->prototype('array')
                         ->children()
-                            ->scalarNode('model_manager')->defaultValue(null)->end()
-                            ->scalarNode('form_contractor')->defaultValue(null)->end()
-                            ->scalarNode('show_builder')->defaultValue(null)->end()
-                            ->scalarNode('list_builder')->defaultValue(null)->end()
-                            ->scalarNode('datagrid_builder')->defaultValue(null)->end()
-                            ->scalarNode('translator')->defaultValue(null)->end()
-                            ->scalarNode('configuration_pool')->defaultValue(null)->end()
-                            ->scalarNode('route_generator')->defaultValue(null)->end()
-                            ->scalarNode('validator')->defaultValue(null)->end()
-                            ->scalarNode('security_handler')->defaultValue(null)->end()
-                            ->scalarNode('label')->defaultValue(null)->end()
-                            ->scalarNode('menu_factory')->defaultValue(null)->end()
-                            ->scalarNode('route_builder')->defaultValue(null)->end()
-                            ->scalarNode('label_translator_strategy')->defaultValue(null)->end()
-                            ->scalarNode('pager_type')->defaultValue(null)->end()
+                            ->scalarNode('model_manager')->defaultNull()->end()
+                            ->scalarNode('form_contractor')->defaultNull()->end()
+                            ->scalarNode('show_builder')->defaultNull()->end()
+                            ->scalarNode('list_builder')->defaultNull()->end()
+                            ->scalarNode('datagrid_builder')->defaultNull()->end()
+                            ->scalarNode('translator')->defaultNull()->end()
+                            ->scalarNode('configuration_pool')->defaultNull()->end()
+                            ->scalarNode('route_generator')->defaultNull()->end()
+                            ->scalarNode('validator')->defaultNull()->end()
+                            ->scalarNode('security_handler')->defaultNull()->end()
+                            ->scalarNode('label')->defaultNull()->end()
+                            ->scalarNode('menu_factory')->defaultNull()->end()
+                            ->scalarNode('route_builder')->defaultNull()->end()
+                            ->scalarNode('label_translator_strategy')->defaultNull()->end()
+                            ->scalarNode('pager_type')->defaultNull()->end()
                             ->arrayNode('templates')
                                 ->addDefaultsIfNotSet()
                                 ->children()
@@ -367,7 +367,7 @@ class Configuration implements ConfigurationInterface
                     ->end()
                 ->end()
 
-                ->scalarNode('persist_filters')->defaultValue(false)->end()
+                ->scalarNode('persist_filters')->defaultFalse()->end()
 
             ->end()
         ->end();