Merge pull request #244 from symfony-cmf/routing-cleanup

adjust to routing cleanup

Author: dbu

.travis.yml

@@ -27,11 +27,4 @@ script: phpunit -c app
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"
-  email: "symfony-cmf-devs@googlegroups.com"
-
-#matrix:
-#  allow_failures:
-#    - env: TRANSPORT=midgard_sqlite MIDGARD_EXT_VERSION=ratatoskr
-#    - env: TRANSPORT=midgard_mysql MIDGARD_EXT_VERSION=ratatoskr
-#    - env: TRANSPORT=midgard_sqlite MIDGARD_EXT_VERSION=gjallarhorn
-#    - env: TRANSPORT=midgard_mysql MIDGARD_EXT_VERSION=gjallarhorn
+  email: "symfony-cmf-devs@googlegroups.com"

app/config/config.yml

@@ -95,12 +95,6 @@ cmf_core:
         phpcr:
             enabled: true
 
-cmf_menu:
-    persistence:
-        phpcr:
-            # TODO remove once https://github.com/jackalope/jackalope-doctrine-dbal/issues/189 is fixed
-            prefetch:             0
-
 cmf_routing:
     chain:
         routers_by_id:
@@ -113,13 +107,9 @@ cmf_routing:
             Sandbox\MainBundle\Document\DemoClassContent: sandbox_main.controller:classAction
             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
-
-cmf_simple_cms:
-    routing:
         templates_by_class:
             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/
@@ -145,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

app/config/phpcr_doctrine_dbal.yml.dist

@@ -1,5 +1,7 @@
 parameters:
     phpcr_backend:
+        logging: true
+        profiling: true
         type: doctrinedbal
         connection: default
         caches:

app/config/phpcr_jackrabbit.yml.dist

@@ -1,5 +1,7 @@
 parameters:
     phpcr_backend:
+        logging: true
+        profiling: true
         type: jackrabbit
         url: http://localhost:8080/server/
     phpcr_workspace: default

app/config/phpcr_midgard_mysql.yml.dist

@@ -110,7 +110,8 @@ protected function doTestReachableAdminRoutes($admin)
 
             // if an ID is required, try and find a document to test
             if (isset($requirements['id'])) {
-                if ($document = $this->dm->getRepository($class)->findOneBy(array())) {
+                $document = $admin->createQuery('list')->execute()->first();
+                if ($document) {
                     $node = $this->dm->getNodeForDocument($document);
                     $routeParams['id'] = $node->getPath();
                 } else {