Fix XML support

tablaz · Jul 8, 2013 · 2bc4b0b · 2bc4b0b
1 parent e99449c
commit 2bc4b0b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -35,11 +35,15 @@ public function getConfigTreeBuilder()
         $rootNode = $treeBuilder->root('sonata_admin', 'array');
 
         $rootNode
-            ->fixXmlConfig('dashboard_group')
+            ->fixXmlConfig('option')
             ->fixXmlConfig('admin_service')
+            ->fixXmlConfig('template')
+            ->fixXmlConfig('extension')
             ->children()
                 ->arrayNode('security')
                     ->addDefaultsIfNotSet()
+                    ->fixXmlConfig('admin_permission')
+                    ->fixXmlConfig('object_permission')
                     ->children()
                         ->scalarNode('handler')->defaultValue('sonata.admin.security.handler.noop')->end()
                         ->arrayNode('information')
@@ -74,6 +78,8 @@ public function getConfigTreeBuilder()
                 ->end()
                 ->arrayNode('dashboard')
                     ->addDefaultsIfNotSet()
+                    ->fixXmlConfig('group')
+                    ->fixXmlConfig('block')
                     ->children()
                         ->arrayNode('groups')
                             ->useAttributeAsKey('id')
@@ -95,6 +101,7 @@ public function getConfigTreeBuilder()
                         ->arrayNode('blocks')
                             ->defaultValue(array(array('position' => 'left', 'settings' => array(), 'type' => 'sonata.admin.block.admin_list')))
                             ->prototype('array')
+                                ->fixXmlConfig('setting')
                                 ->children()
                                     ->scalarNode('type')->cannotBeEmpty()->end()
                                     ->arrayNode('settings')
@@ -155,6 +162,10 @@ public function getConfigTreeBuilder()
                 ->useAttributeAsKey('id')
                 ->defaultValue(array('admins' => array(), 'excludes' => array(), 'implements' => array(), 'extends' => array(), 'instanceof' => array()))
                     ->prototype('array')
+                        ->fixXmlConfig('admin')
+                        ->fixXmlConfig('exclude')
+                        ->fixXmlConfig('implement')
+                        ->fixXmlConfig('extend')
                         ->children()
                             ->arrayNode('admins')
                                 ->prototype('scalar')->end()

diff --git a/DependencyInjection/SonataAdminExtension.php b/DependencyInjection/SonataAdminExtension.php
@@ -227,4 +227,12 @@ public function configureClassesToCompile()
             "Sonata\\AdminBundle\\Validator\\InlineValidator",
         ));
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getNamespace()
+    {
+        return 'http://sonata-project.org/schema/dic/admin';
+    }
 }