fix the integration for routing admin with content bundle

Author: dbu

src/Admin/Routing/RouteAdmin.php

@@ -64,7 +64,7 @@ protected function configureFormFields(FormMapper $formMapper)
                         ->add(
                             'content',
                             TreeSelectType::class,
-                            ['root_node' => $this->routeRoot, 'widget' => 'browser', 'required' => false]
+                            ['root_node' => $this->contentRoot, 'widget' => 'browser', 'required' => false]
                         )
                     ->end() // group general
                 ->end() // tab general

src/DependencyInjection/CmfSonataPhpcrAdminIntegrationExtension.php

@@ -47,9 +47,7 @@ public function process(ContainerBuilder $container)
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $this->addDefaultFactories($container);
-
-        $configuration = new Configuration($this->factories);
+        $configuration = $this->getConfiguration([], $container);
         $config = $this->processConfiguration($configuration, $configs);
         $bundles = $container->getParameter('kernel.bundles');
 
@@ -65,6 +63,18 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('enhancer.xml');
     }
 
+    /**
+     * {@inheritdoc}
+     *
+     * Overwritten because configuration can not be auto instantiated as it has a constructor.
+     */
+    public function getConfiguration(array $config, ContainerBuilder $container)
+    {
+        $this->addDefaultFactories($container);
+
+        return new Configuration($this->factories);
+    }
+
     private function loadBundles(array $config, XmlFileLoader $loader, ContainerBuilder $container)
     {
         foreach ($this->factories as $name => $factory) {

src/DependencyInjection/Factory/RoutingAdminFactory.php

@@ -35,6 +35,7 @@ public function getKey()
     public function addConfiguration(NodeBuilder $builder)
     {
         $builder->scalarNode('basepath')->defaultNull()->end();
+        $builder->scalarNode('content_basepath')->defaultNull()->end();
     }
 
     /**
@@ -45,6 +46,7 @@ public function create(array $config, ContainerBuilder $container, XmlFileLoader
         $loader->load('routing.xml');
 
         $container->setParameter('cmf_sonata_phpcr_admin_integration.routing.basepath', $config['basepath']);
+        $container->setParameter('cmf_sonata_phpcr_admin_integration.routing.content_basepath', $config['content_basepath']);
     }
 
     /**
@@ -57,11 +59,17 @@ public function process(ContainerBuilder $container)
         }
 
         $basepath = $container->getParameter('cmf_sonata_phpcr_admin_integration.routing.basepath');
-        if (null !== $basepath) {
-            return;
+        if (null === $basepath) {
+            $basepaths = $container->getParameter('cmf_routing.dynamic.persistence.phpcr.route_basepaths');
+            $container->setParameter('cmf_sonata_phpcr_admin_integration.routing.basepath', reset($basepaths));
         }
 
-        $basepaths = $container->getParameter('cmf_routing.dynamic.persistence.phpcr.route_basepaths');
-        $container->setParameter('cmf_sonata_phpcr_admin_integration.routing.basepath', reset($basepaths));
+        $contentBasepath = $container->getParameter('cmf_sonata_phpcr_admin_integration.routing.content_basepath');
+        if (null === $contentBasepath) {
+            $contentBasepath = $container->hasParameter('cmf_content.persistence.phpcr.content_basepath')
+                ? $container->getParameter('cmf_content.persistence.phpcr.content_basepath')
+                : '/';
+            $container->setParameter('cmf_sonata_phpcr_admin_integration.routing.content_basepath', $contentBasepath);
+        }
     }
 }

src/Resources/config/routing.xml

@@ -25,7 +25,7 @@
             </call>
 
             <call method="setContentRoot">
-                <argument>%cmf_routing.dynamic.persistence.phpcr.content_basepath%</argument>
+                <argument>%cmf_sonata_phpcr_admin_integration.routing.content_basepath%</argument>
             </call>
 
             <call method="setRouteRoot">