Merge branch 'routing-cleanup' of github.com:symfony-cmf/cmf-sandbox into routing-cleanup

Conflicts:
	composer.lock

Author: lsmith77

app/config/config.yml

@@ -108,8 +108,8 @@ cmf_routing:
             Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute:  cmf_routing.redirect_controller:redirectAction
 
         templates_by_class:
-            Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent: SandboxMainBundle:StaticContent:index.html.twig
             Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page:  CmfSimpleCmsBundle:Page:index.html.twig
+            Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent: SandboxMainBundle:StaticContent:index.html.twig
 
 cmf_create:
     editor_base_path: /bundles/cmfcreate/vendor/ckeditor/
@@ -135,6 +135,9 @@ sonata_block:
 
 sonata_admin:
     extensions:
+        cmf_core.admin_extension.child:
+            implements:
+                - Symfony\Cmf\Bundle\CoreBundle\Model\ChildInterface
         cmf_core.admin_extension.publish_workflow.time_period:
             implements:
                 - Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishTimePeriodInterface

src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadRoutingData.php

@@ -34,8 +34,7 @@ public function load(ObjectManager $dm)
     {
         $session = $dm->getPhpcrSession();
 
-        $basepath = $this->container->getParameter('cmf_routing.dynamic.persistence.phpcr.route_basepaths');
-        $basepath = reset($basepath);
+        $basepath = $this->container->getParameter('cmf_routing.dynamic.persistence.phpcr.admin_basepath');
         if ($session->itemExists($basepath)) {
             $session->removeItem($basepath);
         }