From 2316c90ec29f1a3c5f227d27e5a3fe2f9cfabc54 Mon Sep 17 00:00:00 2001 From: Johannes Schmitt Date: Sun, 6 Feb 2011 13:33:54 +0100 Subject: [PATCH] [Security] fixes a regression --- .../Bundle/SecurityBundle/DependencyInjection/Configuration.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Configuration.php index 5f48157cb3..2bb11266c2 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Configuration.php @@ -69,6 +69,7 @@ class Configuration ->arrayNode('role_hierarchy') ->containsNameValuePairsWithKeyAttribute('id') ->prototype('array') + ->performNoDeepMerging() ->beforeNormalization()->ifString()->then(function($v) { return array('value' => $v); })->end() ->beforeNormalization() ->ifTrue(function($v) { return is_array($v) && isset($v['value']); })