diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index bf3a414640..d96705d1ff 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php @@ -217,15 +217,14 @@ class Configuration implements ConfigurationInterface ->fixXmlConfig('resource') ->children() ->arrayNode('resources') - ->addDefaultsIfNotSet() ->defaultValue(array('FrameworkBundle:Form')) + ->prototype('scalar')->end() ->validate() ->ifTrue(function($v) {return !in_array('FrameworkBundle:Form', $v); }) ->then(function($v){ return array_merge(array('FrameworkBundle:Form'), $v); }) ->end() - ->prototype('scalar')->end() ->end() ->end() ->end() @@ -235,7 +234,6 @@ class Configuration implements ConfigurationInterface ->arrayNode('assets_base_urls') ->performNoDeepMerging() ->addDefaultsIfNotSet() - ->defaultValue(array('http' => array(), 'ssl' => array())) ->beforeNormalization() ->ifTrue(function($v) { return !is_array($v); }) ->then(function($v) { return array($v); }) @@ -290,7 +288,6 @@ class Configuration implements ConfigurationInterface ->arrayNode('base_urls') ->performNoDeepMerging() ->addDefaultsIfNotSet() - ->defaultValue(array('http' => array(), 'ssl' => array())) ->beforeNormalization() ->ifTrue(function($v) { return !is_array($v); }) ->then(function($v) { return array($v); }) diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php index 74d52bdf98..4e5fe7ce6b 100644 --- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php @@ -54,8 +54,8 @@ class Configuration implements ConfigurationInterface ->fixXmlConfig('resource') ->children() ->arrayNode('resources') - ->addDefaultsIfNotSet() ->defaultValue(array('form_div_layout.html.twig')) + ->prototype('scalar')->end() ->setExample(array('MyBundle::form.html.twig')) ->validate() ->ifTrue(function($v) { return !in_array('form_div_layout.html.twig', $v); }) @@ -63,7 +63,6 @@ class Configuration implements ConfigurationInterface return array_merge(array('form_div_layout.html.twig'), $v); }) ->end() - ->prototype('scalar')->end() ->end() ->end() ->end()