Merge pull request #145 from symfony-cmf/configuration-cleanup

move defaults to configuration class
symfony-cmf · Oct 5, 2013 · ac988d3 · ac988d3
2 parents 7ebb65b + f4dc73d
commit ac988d3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/DependencyInjection/CmfMenuExtension.php b/DependencyInjection/CmfMenuExtension.php
@@ -70,6 +70,8 @@ public function loadPhpcr($config, XmlFileLoader $loader, ContainerBuilder $cont
         $keys = array(
             'menu_document_class' => 'menu_document.class',
             'node_document_class' => 'node_document.class',
+            'menu_admin_class' => 'menu_admin.class',
+            'node_admin_class' => 'node_admin.class',
             'menu_basepath' => 'menu_basepath',
             'content_basepath' => 'content_basepath',
             'manager_name' => 'manager_name',

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -34,15 +34,15 @@ public function getConfigTreeBuilder()
                                 ->scalarNode('menu_basepath')->defaultValue('/cms/menu')->end()
                                 ->scalarNode('content_basepath')->defaultValue('/cms/content')->end()
                                 ->scalarNode('manager_name')->defaultNull()->end()
-                                ->scalarNode('menu_document_class')->defaultNull()->end()
-                                ->scalarNode('node_document_class')->defaultNull()->end()
+                                ->scalarNode('menu_document_class')->defaultValue('Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\Menu')->end()
+                                ->scalarNode('node_document_class')->defaultValue('Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode')->end()
 
                                 ->enumNode('use_sonata_admin')
                                     ->values(array(true, false, 'auto'))
                                     ->defaultValue('auto')
                                 ->end()
-                                ->scalarNode('menu_admin_class')->defaultNull()->end()
-                                ->scalarNode('node_admin_class')->defaultNull()->end()
+                                ->scalarNode('menu_admin_class')->defaultValue('Symfony\Cmf\Bundle\MenuBundle\Admin\MenuAdmin')->end()
+                                ->scalarNode('node_admin_class')->defaultValue('Symfony\Cmf\Bundle\MenuBundle\Admin\MenuNodeAdmin')->end()
                                 ->scalarNode('content_basepath')->defaultNull()->end()
                                 ->scalarNode('admin_recursive_breadcrumbs')->defaultTrue()->end()
                             ->end()

diff --git a/Resources/config/admin.xml b/Resources/config/admin.xml
@@ -5,10 +5,6 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="cmf_menu.persistence.phpcr.menu_document.class">Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\Menu</parameter>
-        <parameter key="cmf_menu.persistence.phpcr.node_document.class">Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode</parameter>
-        <parameter key="cmf_menu.persistence.phpcr.menu_admin.class">Symfony\Cmf\Bundle\MenuBundle\Admin\MenuAdmin</parameter>
-        <parameter key="cmf_menu.persistence.phpcr.node_admin.class">Symfony\Cmf\Bundle\MenuBundle\Admin\MenuNodeAdmin</parameter>
         <parameter key="cmf_menu.admin_extension.menu_reference.class">Symfony\Cmf\Bundle\MenuBundle\Admin\Extension\MenuNodeReferrersExtension</parameter>
     </parameters>