Jelajahi Sumber

[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 tahun lalu
induk
melakukan
2d94f2d8d0

+ 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()