Update for CMF BC breaks

Author: wouterj

app/AppKernel.php

@@ -37,8 +37,9 @@ public function registerBundles()
             new Symfony\Cmf\Bundle\TreeBrowserBundle\CmfTreeBrowserBundle(),
             new Symfony\Cmf\Bundle\BlockBundle\CmfBlockBundle(),
             new Symfony\Cmf\Bundle\SeoBundle\CmfSeoBundle(),
-            new Burgov\Bundle\KeyValueFormBundle\BurgovKeyValueFormBundle(),
             new Symfony\Cmf\Bundle\RoutingAutoBundle\CmfRoutingAutoBundle(),
+            new Symfony\Cmf\Bundle\ResourceBundle\CmfResourceBundle(),
+            new Symfony\Cmf\Bundle\ResourceRestBundle\CmfResourceRestBundle(),
 
             // language switcher
             new Lunetics\LocaleBundle\LuneticsLocaleBundle(),
@@ -48,15 +49,14 @@ public function registerBundles()
             new JMS\SerializerBundle\JMSSerializerBundle(),
 
             // admin bundle
-            new Sonata\jQueryBundle\SonatajQueryBundle(),
             new Sonata\BlockBundle\SonataBlockBundle(),
             new Sonata\CoreBundle\SonataCoreBundle(),
             new Sonata\AdminBundle\SonataAdminBundle(),
             new Sonata\DoctrinePHPCRAdminBundle\SonataDoctrinePHPCRAdminBundle(),
             new Sonata\SeoBundle\SonataSeoBundle(),
             new Sonata\TranslationBundle\SonataTranslationBundle(),
-            new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
             new Ivory\CKEditorBundle\IvoryCKEditorBundle(),
+            new Burgov\Bundle\KeyValueFormBundle\BurgovKeyValueFormBundle(),
 
             // jackalope doctrine caching
             new Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle(),

app/config/config.yml

@@ -118,6 +118,11 @@ cmf_menu:
     voters:
         content_identity: ~
 
+cmf_resource:
+    repositories:
+        default:
+            type: doctrine_phpcr_odm
+
 sonata_block:
     default_contexts: [cms]
     blocks:

app/config/routing.yml

@@ -45,13 +45,9 @@ sonata_admin:
     type: sonata_admin
     prefix: /{_locale}/admin
 
-fos_js_routing:
-    resource: '@FOSJsRoutingBundle/Resources/config/routing/routing.xml'
-
-cmf_tree:
-    resource: .
-    type: 'cmf_tree'
-
 block_cache:
     resource: '@CmfBlockBundle/Resources/config/routing/cache.xml'
     prefix: /
+
+cmf_resource:
+    resource: '@CmfResourceRestBundle/Resources/config/routing.yml'

src/AppBundle/Resources/config/cmf_routing_auto.yml

@@ -1,5 +1,6 @@
 AppBundle\Document\DemoNewsContent:
-    uri_schema: /news/{date}/{title}
+    definitions:
+        - { uri_schema: '/news/{date}/{title}' }
     token_providers:
         date: [content_datetime, { method: getDate, date_format: Y-m-d }]
         title: [content_method, {method: getTitle, slugify: true }]