瀏覽代碼

[Security] fixes a regression

Johannes Schmitt 14 年之前
父節點
當前提交
2316c90ec2
共有 1 個文件被更改,包括 1 次插入0 次删除
  1. 1 0
      src/Symfony/Bundle/SecurityBundle/DependencyInjection/Configuration.php

+ 1 - 0
src/Symfony/Bundle/SecurityBundle/DependencyInjection/Configuration.php

@@ -69,6 +69,7 @@ class Configuration
             ->arrayNode('role_hierarchy')
             ->arrayNode('role_hierarchy')
                 ->containsNameValuePairsWithKeyAttribute('id')
                 ->containsNameValuePairsWithKeyAttribute('id')
                 ->prototype('array')
                 ->prototype('array')
+                    ->performNoDeepMerging()
                     ->beforeNormalization()->ifString()->then(function($v) { return array('value' => $v); })->end()
                     ->beforeNormalization()->ifString()->then(function($v) { return array('value' => $v); })->end()
                     ->beforeNormalization()
                     ->beforeNormalization()
                         ->ifTrue(function($v) { return is_array($v) && isset($v['value']); })
                         ->ifTrue(function($v) { return is_array($v) && isset($v['value']); })