Merge pull request #376 from symfony-cmf/prepare_2.0

Prepare RC

Author: ElectricMaxxx

app/config/config.yml

@@ -222,51 +222,8 @@ sonata_doctrine_phpcr_admin:
     templates:
         form:
             - admin/form_admin_fields.html.twig
-    document_tree_defaults: [locale]
     document_tree:
-        Doctrine\ODM\PHPCR\Document\Generic:
-            valid_children:
-                - all
-        AppBundle\Document\DemoSeoContent:
-            valid_children:
-                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock
-                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ContainerBlock
-                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock
-                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock
-                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\RssBlock
-        Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock:
-            valid_children: []
-        Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock:
-            valid_children: []
-        Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock:
-            valid_children: []
-        Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SlideshowBlock:
-            valid_children:
-                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ImagineBlock
-        Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ImagineBlock:
-            valid_children: []
-        Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\RssBlock:
-            valid_children: []
-        Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ContainerBlock:
-            valid_children:
-                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock
-                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ContainerBlock
-                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock
-                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock
-                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SlideshowBlock
-                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\RssBlock
-        Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route:
-            valid_children:
-                - Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route
-                - Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute
-        Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute:
-            valid_children: []
-        Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\Menu:
-            valid_children:
-                - Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode
-        Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode:
-            valid_children:
-                - Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode
+        routing_defaults: [locale]
 
 sonata_translation:
     locales: '%locales%'

composer.json

@@ -31,7 +31,7 @@
         "symfony-cmf/seo-bundle": "^2.0",
         "symfony-cmf/routing": "^2.0",
         "symfony-cmf/routing-auto-bundle": "^2.0",
-        "symfony-cmf/sonata-phpcr-admin-integration-bundle": "^1.0@dev",
+        "symfony-cmf/sonata-phpcr-admin-integration-bundle": "^1.0",
 
         "jackalope/jackalope-doctrine-dbal": "1.2.*",
         "jackalope/jackalope-jackrabbit": "1.2.*",
@@ -42,7 +42,7 @@
 
         "sonata-project/cache-bundle": "^2.1",
         "sonata-project/translation-bundle": "2.1.0",
-        "sonata-project/doctrine-phpcr-admin-bundle": "^2.0@dev",
+        "sonata-project/doctrine-phpcr-admin-bundle": "^2.0",
 
         "jms/serializer-bundle": "^1.1",
         "friendsofsymfony/rest-bundle": "~1.7",