From 2d94f2d8d02d0dfb8a00d074b2aaca2a52fdc4a0 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 18 Feb 2011 07:43:36 -0600 Subject: [PATCH] [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. --- .../Bundle/FrameworkBundle/DependencyInjection/Configuration.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index edd9c34f74..5fd8712f9b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php +++ b/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()