Merge pull request #117 from symfony-cmf/prepare_release

prepare RC
symfony-cmf · Jul 28, 2017 · be253a2 · be253a2
2 parents 74250d7 + d4d8ea7
commit be253a2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "require": {
         "php": "^5.6|^7.0",
         "symfony/framework-bundle": "^2.8|^3.0",
-        "sonata-project/doctrine-phpcr-admin-bundle": "^2.0",
+        "sonata-project/doctrine-phpcr-admin-bundle": "2.0.0-RC2",
         "sonata-project/admin-bundle": "^3.6.0",
         "symfony-cmf/tree-browser-bundle": "^2.0"
     },

diff --git a/tests/Resources/app/config/cmf_sonata_admin_integration.yml b/tests/Resources/app/config/cmf_sonata_admin_integration.yml
@@ -119,4 +119,6 @@ cmf_content:
         phpcr:
             content_basepath: /test/contents
 
-
+sonata_doctrine_phpcr_admin:
+    document_tree:
+        routing_defaults: []
diff --git a/tests/Resources/app/config/routing.yml b/tests/Resources/app/config/routing.yml
@@ -12,3 +12,7 @@ sonata_admin:
     prefix: /admin
     requirements:
         id:  .+
+
+sonata_phpcr_admin_tree:
+    resource: '@SonataDoctrinePHPCRAdminBundle/Resources/config/routing/tree.xml'
+    prefix: /admin