[DoctrineBundle] fixed configuration class

berkin · Mar 18, 2011 · 341a296 · 341a296
1 parent acc3590
commit 341a296
Showing 1 changed file with 29 additions and 27 deletions.
diff --git a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/Configuration.php
@@ -178,35 +178,37 @@ private function getOrmEntityManagersNode()
                             ->end()
                         ->end()
                     ->end()
-                ->end()
-                ->arrayNode('dql')
-                    ->fixXmlConfig('string_function')
-                    ->arrayNode('string_functions')
-                        ->useAttributeAsKey('name')
-                        ->prototype('scalar')
-                            ->beforeNormalization()
-                                ->ifTrue(function($v) { return is_array($v) && isset($v['class']); })
-                                ->then(function($v) { return $v['class']; })
+                    ->arrayNode('dql')
+                        ->fixXmlConfig('string_function')
+                        ->fixXmlConfig('numeric_function')
+                        ->fixXmlConfig('datetime_function')
+                        ->children()
+                            ->arrayNode('string_functions')
+                                ->useAttributeAsKey('name')
+                                ->prototype('scalar')
+                                    ->beforeNormalization()
+                                        ->ifTrue(function($v) { return is_array($v) && isset($v['class']); })
+                                        ->then(function($v) { return $v['class']; })
+                                    ->end()
+                                ->end()
                             ->end()
-                        ->end()
-                    ->end()
-                    ->fixXmlConfig('numeric_function')
-                    ->arrayNode('numeric_functions')
-                        ->useAttributeAsKey('name')
-                        ->prototype('scalar')
-                            ->beforeNormalization()
-                                ->ifTrue(function($v) { return is_array($v) && isset($v['class']); })
-                                ->then(function($v) { return $v['class']; })
+                            ->arrayNode('numeric_functions')
+                                ->useAttributeAsKey('name')
+                                ->prototype('scalar')
+                                    ->beforeNormalization()
+                                        ->ifTrue(function($v) { return is_array($v) && isset($v['class']); })
+                                        ->then(function($v) { return $v['class']; })
+                                    ->end()
+                                ->end()
                             ->end()
-                        ->end()
-                    ->end()
-                    ->fixXmlConfig('datetime_function')
-                    ->arrayNode('datetime_functions')
-                        ->useAttributeAsKey('name')
-                        ->prototype('scalar')
-                            ->beforeNormalization()
-                                ->ifTrue(function($v) { return is_array($v) && isset($v['class']); })
-                                ->then(function($v) { return $v['class']; })
+                            ->arrayNode('datetime_functions')
+                                ->useAttributeAsKey('name')
+                                ->prototype('scalar')
+                                    ->beforeNormalization()
+                                        ->ifTrue(function($v) { return is_array($v) && isset($v['class']); })
+                                        ->then(function($v) { return $v['class']; })
+                                    ->end()
+                                ->end()
                             ->end()
                         ->end()
                     ->end()