浏览代码

[FrameworkBundle] Removing the "namespace" key when it's defined in its own weird location in XML. This prevents that key, which we move in this same location, from looking like an invalid option during validation.

Ryan Weaver 14 年之前
父节点
当前提交
2d94f2d8d0
共有 1 个文件被更改,包括 1 次插入0 次删除
  1. 1 0
      src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

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

@@ -195,6 +195,7 @@ class Configuration
                     ->ifTrue(function($v) { return is_array($v) && !empty($v['annotations']) && !empty($v['namespace']); })
                     ->then(function($v){
                         $v['annotations'] = array('namespace' => $v['namespace']);
+                        unset($v['namespace']);
                         return $v;
                     })
                     ->end()