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

adjust to routing cleanup
symfony-cmf · Apr 4, 2014 · bc40775 · bc40775
2 parents 83d4c1b + e09eb00
commit bc40775
Show file tree

Hide file tree

Showing 14 changed files with 209 additions and 285 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,11 +27,4 @@ script: phpunit -c app
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"
-  email: "[email protected]"
-
-#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: "[email protected]"
diff --git a/app/config/config.yml b/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

diff --git a/app/config/phpcr_doctrine_dbal.yml.dist b/app/config/phpcr_doctrine_dbal.yml.dist
@@ -1,5 +1,7 @@
 parameters:
     phpcr_backend:
+        logging: true
+        profiling: true
         type: doctrinedbal
         connection: default
         caches:

diff --git a/app/config/phpcr_jackrabbit.yml.dist b/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

diff --git a/app/config/phpcr_midgard_mysql.yml.dist b/app/config/phpcr_midgard_mysql.yml.dist
diff --git a/app/config/phpcr_midgard_sqlite.yml.dist b/app/config/phpcr_midgard_sqlite.yml.dist
diff --git a/app/tests/AdminTest.php b/app/tests/AdminTest.php
@@ -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 {

diff --git a/app/tests/travis_midgard_install.sh b/app/tests/travis_midgard_install.sh
diff --git a/app/tests/travis_midgard_mysql.sh b/app/tests/travis_midgard_mysql.sh
diff --git a/app/tests/travis_midgard_sqlite.sh b/app/tests/travis_midgard_sqlite.sh
diff --git a/composer.json b/composer.json
@@ -23,27 +23,28 @@
         "sensio/distribution-bundle": "2.3.*",
         "sensio/framework-extra-bundle": "2.3.*",
         "sensio/generator-bundle": "2.3.*",
-        "symfony-cmf/symfony-cmf": "~1.1",
-        "symfony-cmf/simple-cms-bundle": "~1.1",
-        "symfony-cmf/search-bundle": "~1.1",
-        "symfony-cmf/create-bundle": "~1.1",
-        "jackalope/jackalope-doctrine-dbal": "~1.1",
-        "jackalope/jackalope-jackrabbit": "~1.1",
-        "doctrine/doctrine-bundle": "~1.2",
+        "symfony-cmf/symfony-cmf": "1.1.*",
+        "symfony-cmf/simple-cms-bundle": "1.1.*",
+        "symfony-cmf/search-bundle": "1.1.*",
+        "symfony-cmf/create-bundle": "1.1.*",
+        "jackalope/jackalope-doctrine-dbal": "1.1.*",
+        "jackalope/jackalope-jackrabbit": "1.1.*",
+        "doctrine/doctrine-bundle": "1.2.*",
         "doctrine/data-fixtures": "1.0.*",
-        "doctrine/doctrine-cache-bundle": "~1.0",
-        "sonata-project/cache-bundle": "~2.1",
-        "sonata-project/doctrine-phpcr-admin-bundle": "~1.1",
-        "symfony-cmf/block-bundle": "~1.1",
-        "eko/feedbundle": "~1.0",
-        "lunetics/locale-bundle": "~2.2",
-        "liip/imagine-bundle": "~0.12",
-        "wjzijderveld/check-bundles": "~1.0",
-        "helios-ag/fm-elfinder-bundle": "~1.4"
+        "doctrine/doctrine-cache-bundle": "1.0.*",
+        "sonata-project/cache-bundle": "2.1.*",
+        "sonata-project/doctrine-phpcr-admin-bundle": "1.1.*",
+        "sonata-project/jquery-bundle": "1.8.3",
+        "symfony-cmf/block-bundle": "1.1.*",
+        "eko/feedbundle": "1.0.*",
+        "lunetics/locale-bundle": "2.2.*",
+        "liip/imagine-bundle": "0.21.*",
+        "wjzijderveld/check-bundles": "1.0.*",
+        "helios-ag/fm-elfinder-bundle": "1.4.*"
     },
     "require-dev": {
-        "liip/functional-test-bundle": "~1.0.1",
-        "symfony-cmf/testing": "~1.0"
+        "liip/functional-test-bundle": "1.0.*",
+        "symfony-cmf/testing": "1.1.*"
     },
     "scripts": {
         "post-install-cmd": [