Removed route root logic

The root path is now selectable, so the parent path hack can be removed.

Author: wouterj

src/Admin/Routing/RedirectRouteAdmin.php

@@ -23,13 +23,6 @@ class RedirectRouteAdmin extends AbstractAdmin
 {
     protected $translationDomain = 'CmfSonataPhpcrAdminIntegrationBundle';
 
-    /**
-     * Root path for the route parent selection.
-     *
-     * @var string
-     */
-    protected $routeRoot;
-
     protected function configureListFields(ListMapper $listMapper)
     {
         $listMapper->addIdentifier('path', 'text');
@@ -42,7 +35,7 @@ protected function configureFormFields(FormMapper $formMapper)
                 ->add(
                     'parentDocument',
                     TreeSelectType::class,
-                    ['root_node' => $this->routeRoot, 'widget' => 'browser']
+                    ['root_node' => $this->getRootPath(), 'widget' => 'browser']
                 )
                 ->add('name', TextType::class)
             ->end()
@@ -53,7 +46,7 @@ protected function configureFormFields(FormMapper $formMapper)
                 ->add(
                     'routeTarget',
                     TreeSelectType::class,
-                    ['root_node' => $this->routeRoot, 'widget' => 'browser', 'required' => false]
+                    ['root_node' => $this->getRootPath(), 'widget' => 'browser', 'required' => false]
                 )
             ->end()
         ;
@@ -66,11 +59,6 @@ protected function configureDatagridFilters(DatagridMapper $datagridMapper)
         $datagridMapper->add('name', 'doctrine_phpcr_nodename');
     }
 
-    public function setRouteRoot($routeRoot)
-    {
-        $this->routeRoot = $routeRoot;
-    }
-
     public function getExportFormats()
     {
         return array();

src/Admin/Routing/RouteAdmin.php

@@ -21,19 +21,11 @@
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Cmf\Bundle\RoutingBundle\Model\Route;
 use Symfony\Cmf\Bundle\RoutingBundle\Form\Type\RouteTypeType;
-use PHPCR\Util\PathHelper;
 
 class RouteAdmin extends AbstractAdmin
 {
     protected $translationDomain = 'CmfSonataPhpcrAdminIntegrationBundle';
 
-    /**
-     * Root path for the route parent selection.
-     *
-     * @var string
-     */
-    protected $routeRoot;
-
     /**
      * Root path for the route content selection.
      *
@@ -54,7 +46,7 @@ protected function configureFormFields(FormMapper $formMapper)
                     ->add(
                         'parentDocument',
                         TreeSelectType::class,
-                        ['root_node' => $this->routeRoot, 'widget' => 'browser']
+                        ['root_node' => $this->getRootPath(), 'widget' => 'browser']
                     )
                     ->add('name', TextType::class)
                 ->end() // group location
@@ -111,15 +103,6 @@ protected function configureDatagridFilters(DatagridMapper $datagridMapper)
         $datagridMapper->add('name', 'doctrine_phpcr_nodename');
     }
 
-    public function setRouteRoot($routeRoot)
-    {
-        // make limitation on base path work
-        parent::setRootPath($routeRoot);
-        // TODO: fix widget to show root node when root is selectable
-        // https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle/issues/148
-        $this->routeRoot = PathHelper::getParentPath($routeRoot);
-    }
-
     public function setContentRoot($contentRoot)
     {
         $this->contentRoot = $contentRoot;

src/Resources/config/routing.xml

@@ -28,7 +28,7 @@
                 <argument>%cmf_sonata_phpcr_admin_integration.routing.content_basepath%</argument>
             </call>
 
-            <call method="setRouteRoot">
+            <call method="setRootPath">
                 <argument>%cmf_sonata_phpcr_admin_integration.routing.basepath%</argument>
             </call>
         </service>
@@ -52,7 +52,7 @@
                 <argument type="service" id="sonata.admin.route.path_info_slashes" />
             </call>
 
-            <call method="setRouteRoot">
+            <call method="setRootPath">
                 <argument>%cmf_sonata_phpcr_admin_integration.routing.basepath%</argument>
             </call>
         </service>