From 1658b97ed80c574643594957e01ae5ad0f5e2a17 Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Mon, 31 Mar 2014 11:40:10 +0200
Subject: [PATCH 01/10] WIP adjust to routing cleanup

---
 app/config/config.yml                         |   6 +
 composer.json                                 |   3 +-
 composer.lock                                 | 236 +++++++++---------
 .../DataFixtures/PHPCR/LoadRoutingData.php    |   3 +-
 .../DataFixtures/PHPCR/LoadSimpleCmsData.php  |   4 +-
 5 files changed, 135 insertions(+), 117 deletions(-)

diff --git a/app/config/config.yml b/app/config/config.yml
index 7acbfb78..44c5c1dd 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -107,6 +107,12 @@ cmf_routing:
             cmf_routing.dynamic_router: 20
             router.default: 100
     dynamic:
+        # todo: adjust CoreBundle to prepend
+        persistence:
+            phpcr:
+                route_basepaths:
+                    - /cms/routes
+                    - /cms/simple
         controllers_by_type:
             demo_type: sandbox_main.controller:typeAction
         controllers_by_class:
diff --git a/composer.json b/composer.json
index b581f03f..47e54952 100644
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,7 @@
     },
     "minimum-stability": "dev",
     "require": {
+        "symfony-cmf/routing-bundle": "dev-cleanup-routing as 1.2.0",
         "php": ">=5.3.3",
         "symfony/symfony": "2.3.*",
         "twig/extensions": "~1.0",
@@ -24,7 +25,7 @@
         "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/simple-cms-bundle": "dev-cleanup-routing as 1.1.0",
         "symfony-cmf/search-bundle": "~1.1",
         "symfony-cmf/create-bundle": "~1.1",
         "jackalope/jackalope-doctrine-dbal": "~1.1",
diff --git a/composer.lock b/composer.lock
index b1632795..900d3dad 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
         "This file locks the dependencies of your project to a known state",
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
     ],
-    "hash": "515065cd5285983edc72a9cb606faea0",
+    "hash": "4bb6d254c5722f2f26c65bfef164212a",
     "packages": [
         {
             "name": "doctrine/annotations",
@@ -83,12 +83,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "36c4eee5051629524389da376ba270f15765e49f"
+                "reference": "bb9b55b17bed5923c9446c8158a92623d39480c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/36c4eee5051629524389da376ba270f15765e49f",
-                "reference": "36c4eee5051629524389da376ba270f15765e49f",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/bb9b55b17bed5923c9446c8158a92623d39480c6",
+                "reference": "bb9b55b17bed5923c9446c8158a92623d39480c6",
                 "shasum": ""
             },
             "require": {
@@ -149,7 +149,7 @@
                 "cache",
                 "caching"
             ],
-            "time": "2013-12-18 17:21:03"
+            "time": "2014-03-27 11:06:41"
         },
         {
             "name": "doctrine/collections",
@@ -715,12 +715,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/DoctrinePHPCRBundle.git",
-                "reference": "ad8fa77618e39c74feee9c25885e29f60e37258c"
+                "reference": "bf318493ef874905c66d7cd01108f39d2266ec74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrinePHPCRBundle/zipball/ad8fa77618e39c74feee9c25885e29f60e37258c",
-                "reference": "ad8fa77618e39c74feee9c25885e29f60e37258c",
+                "url": "https://api.github.com/repos/doctrine/DoctrinePHPCRBundle/zipball/bf318493ef874905c66d7cd01108f39d2266ec74",
+                "reference": "bf318493ef874905c66d7cd01108f39d2266ec74",
                 "shasum": ""
             },
             "require": {
@@ -778,7 +778,7 @@
                 "persistence",
                 "phpcr"
             ],
-            "time": "2014-03-23 14:34:25"
+            "time": "2014-03-27 07:24:29"
         },
         {
             "name": "doctrine/phpcr-odm",
@@ -970,12 +970,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git",
-                "reference": "74dcf0465b19f2c3082693a875850897241851ef"
+                "reference": "0f9f719b5b1cbcb18e40b6a13a9f700c0b1e5bb8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/74dcf0465b19f2c3082693a875850897241851ef",
-                "reference": "74dcf0465b19f2c3082693a875850897241851ef",
+                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/0f9f719b5b1cbcb18e40b6a13a9f700c0b1e5bb8",
+                "reference": "0f9f719b5b1cbcb18e40b6a13a9f700c0b1e5bb8",
                 "shasum": ""
             },
             "require": {
@@ -1039,7 +1039,7 @@
             "keywords": [
                 "rest"
             ],
-            "time": "2014-03-23 17:58:22"
+            "time": "2014-03-28 23:58:47"
         },
         {
             "name": "helios-ag/fm-elfinder-bundle",
@@ -1202,12 +1202,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/jackalope/jackalope.git",
-                "reference": "5051008ba1d67c8391809a13c18310a01c287cc6"
+                "reference": "14a69f82e865e92c2cfaa2644c75a9aa04fc7ca1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jackalope/jackalope/zipball/5051008ba1d67c8391809a13c18310a01c287cc6",
-                "reference": "5051008ba1d67c8391809a13c18310a01c287cc6",
+                "url": "https://api.github.com/repos/jackalope/jackalope/zipball/14a69f82e865e92c2cfaa2644c75a9aa04fc7ca1",
+                "reference": "14a69f82e865e92c2cfaa2644c75a9aa04fc7ca1",
                 "shasum": ""
             },
             "require": {
@@ -1247,7 +1247,7 @@
             "keywords": [
                 "phpcr"
             ],
-            "time": "2014-03-11 08:03:09"
+            "time": "2014-03-28 12:00:36"
         },
         {
             "name": "jackalope/jackalope-doctrine-dbal",
@@ -2063,12 +2063,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "392ef35fd470638e08d0160d6b1cbab63cb23174"
+                "reference": "4cf49e5496857532f4ca4bbb69d1eee591b88234"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/392ef35fd470638e08d0160d6b1cbab63cb23174",
-                "reference": "392ef35fd470638e08d0160d6b1cbab63cb23174",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4cf49e5496857532f4ca4bbb69d1eee591b88234",
+                "reference": "4cf49e5496857532f4ca4bbb69d1eee591b88234",
                 "shasum": ""
             },
             "require": {
@@ -2123,7 +2123,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2014-03-23 19:50:26"
+            "time": "2014-03-26 11:12:35"
         },
         {
             "name": "phpcollection/phpcollection",
@@ -2387,22 +2387,20 @@
         },
         {
             "name": "sensio/distribution-bundle",
-            "version": "dev-master",
+            "version": "v2.3.4",
             "target-dir": "Sensio/Bundle/DistributionBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
-                "reference": "7e5be792d3d17dcc407d73057f44f0c451a56b04"
+                "reference": "66df91b4bd637a83299d8072aed3658bfd3b3021"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/7e5be792d3d17dcc407d73057f44f0c451a56b04",
-                "reference": "7e5be792d3d17dcc407d73057f44f0c451a56b04",
+                "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/66df91b4bd637a83299d8072aed3658bfd3b3021",
+                "reference": "66df91b4bd637a83299d8072aed3658bfd3b3021",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3",
-                "symfony/class-loader": "~2.2",
                 "symfony/framework-bundle": "~2.2"
             },
             "type": "symfony-bundle",
@@ -2423,9 +2421,7 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "The base bundle for the Symfony Distributions",
@@ -2433,7 +2429,7 @@
                 "configuration",
                 "distribution"
             ],
-            "time": "2014-03-14 12:33:57"
+            "time": "2013-08-22 05:04:53"
         },
         {
             "name": "sensio/framework-extra-bundle",
@@ -2491,12 +2487,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git",
-                "reference": "eae9c659949b0901947a565ec0ff7606692ce53e"
+                "reference": "201c75b4ae26e906c26cdfe4db7ac5043cc15743"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/eae9c659949b0901947a565ec0ff7606692ce53e",
-                "reference": "eae9c659949b0901947a565ec0ff7606692ce53e",
+                "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/201c75b4ae26e906c26cdfe4db7ac5043cc15743",
+                "reference": "201c75b4ae26e906c26cdfe4db7ac5043cc15743",
                 "shasum": ""
             },
             "require": {
@@ -2532,7 +2528,7 @@
                 }
             ],
             "description": "This bundle generates code for you",
-            "time": "2014-02-19 06:31:38"
+            "time": "2014-03-30 07:47:50"
         },
         {
             "name": "sonata-project/admin-bundle",
@@ -2875,12 +2871,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle.git",
-                "reference": "d15ceb51f1ef60514a013e5a5dc106ba2ad05823"
+                "reference": "2340dc4a2e9c1d0771d7d5cf3c5b1ee7d389ac42"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataDoctrinePhpcrAdminBundle/zipball/d15ceb51f1ef60514a013e5a5dc106ba2ad05823",
-                "reference": "d15ceb51f1ef60514a013e5a5dc106ba2ad05823",
+                "url": "https://api.github.com/repos/sonata-project/SonataDoctrinePhpcrAdminBundle/zipball/2340dc4a2e9c1d0771d7d5cf3c5b1ee7d389ac42",
+                "reference": "2340dc4a2e9c1d0771d7d5cf3c5b1ee7d389ac42",
                 "shasum": ""
             },
             "require": {
@@ -2928,7 +2924,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2014-03-24 07:19:15"
+            "time": "2014-03-24 10:04:30"
         },
         {
             "name": "sonata-project/exporter",
@@ -3093,12 +3089,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/BlockBundle.git",
-                "reference": "f3c8d7f165b479045b0bfdd51d0fb70b26955491"
+                "reference": "5357f658938d48e0c63f085f02f79253c05bf54e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/BlockBundle/zipball/f3c8d7f165b479045b0bfdd51d0fb70b26955491",
-                "reference": "f3c8d7f165b479045b0bfdd51d0fb70b26955491",
+                "url": "https://api.github.com/repos/symfony-cmf/BlockBundle/zipball/5357f658938d48e0c63f085f02f79253c05bf54e",
+                "reference": "5357f658938d48e0c63f085f02f79253c05bf54e",
                 "shasum": ""
             },
             "require": {
@@ -3153,7 +3149,7 @@
                 "block",
                 "content fragments"
             ],
-            "time": "2014-03-24 07:31:37"
+            "time": "2014-03-27 08:00:01"
         },
         {
             "name": "symfony-cmf/content-bundle",
@@ -3162,12 +3158,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/ContentBundle.git",
-                "reference": "294b2e1d4a133aa1916ca1eb5672e7718765e403"
+                "reference": "ae15dbbcb38c47bc28cfc618779dac13c23e9a1b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/ContentBundle/zipball/294b2e1d4a133aa1916ca1eb5672e7718765e403",
-                "reference": "294b2e1d4a133aa1916ca1eb5672e7718765e403",
+                "url": "https://api.github.com/repos/symfony-cmf/ContentBundle/zipball/ae15dbbcb38c47bc28cfc618779dac13c23e9a1b",
+                "reference": "ae15dbbcb38c47bc28cfc618779dac13c23e9a1b",
                 "shasum": ""
             },
             "require": {
@@ -3218,7 +3214,7 @@
             "keywords": [
                 "Symfony CMF"
             ],
-            "time": "2014-03-09 21:31:43"
+            "time": "2014-03-27 07:56:59"
         },
         {
             "name": "symfony-cmf/core-bundle",
@@ -3227,12 +3223,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/CoreBundle.git",
-                "reference": "96ac5cb6c2b38bca0a6c04b87d2041c90ae4cbb8"
+                "reference": "ea20e56a14c5efede381e1f4eff4e5a16a79edfe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/CoreBundle/zipball/96ac5cb6c2b38bca0a6c04b87d2041c90ae4cbb8",
-                "reference": "96ac5cb6c2b38bca0a6c04b87d2041c90ae4cbb8",
+                "url": "https://api.github.com/repos/symfony-cmf/CoreBundle/zipball/ea20e56a14c5efede381e1f4eff4e5a16a79edfe",
+                "reference": "ea20e56a14c5efede381e1f4eff4e5a16a79edfe",
                 "shasum": ""
             },
             "require": {
@@ -3279,7 +3275,7 @@
             "keywords": [
                 "Symfony CMF"
             ],
-            "time": "2014-03-10 17:38:16"
+            "time": "2014-03-30 13:16:55"
         },
         {
             "name": "symfony-cmf/create-bundle",
@@ -3288,12 +3284,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/CreateBundle.git",
-                "reference": "13a545230d0c405a9884eec315fabc2bcbd201bb"
+                "reference": "eed8e5ccb40a4c5c1c03358d835e8ad7409d3342"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/CreateBundle/zipball/13a545230d0c405a9884eec315fabc2bcbd201bb",
-                "reference": "13a545230d0c405a9884eec315fabc2bcbd201bb",
+                "url": "https://api.github.com/repos/symfony-cmf/CreateBundle/zipball/eed8e5ccb40a4c5c1c03358d835e8ad7409d3342",
+                "reference": "eed8e5ccb40a4c5c1c03358d835e8ad7409d3342",
                 "shasum": ""
             },
             "require": {
@@ -3332,11 +3328,11 @@
                 },
                 {
                     "name": "Symfony CMF Community",
-                    "homepage": "https://github.com/symfony-cmf/CreateBundle/contributors"
+                    "homepage": "https://github.com/symfony-cmf/SimpleCmsBundle/contributors"
                 }
             ],
             "description": "Symfony Bundle for createphp and create.js. The easiest way to make any site editable and have semantic annotations with RDFa.",
-            "time": "2014-03-09 21:31:30"
+            "time": "2014-03-27 08:01:37"
         },
         {
             "name": "symfony-cmf/media-bundle",
@@ -3345,12 +3341,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/MediaBundle.git",
-                "reference": "fcd08bcede4f1222fa028c805f4407754c04841f"
+                "reference": "a954667518abbb36e6d47f5412ff76cc922d0179"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/MediaBundle/zipball/fcd08bcede4f1222fa028c805f4407754c04841f",
-                "reference": "fcd08bcede4f1222fa028c805f4407754c04841f",
+                "url": "https://api.github.com/repos/symfony-cmf/MediaBundle/zipball/a954667518abbb36e6d47f5412ff76cc922d0179",
+                "reference": "a954667518abbb36e6d47f5412ff76cc922d0179",
                 "shasum": ""
             },
             "require": {
@@ -3399,7 +3395,7 @@
                 "image",
                 "media"
             ],
-            "time": "2014-03-10 07:05:59"
+            "time": "2014-03-27 07:58:41"
         },
         {
             "name": "symfony-cmf/menu-bundle",
@@ -3408,12 +3404,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/MenuBundle.git",
-                "reference": "f2613020cce828cf711d1752b14d1405939f89be"
+                "reference": "9bf7ac68d253c33e1184667f92382e743ddf5d6c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/MenuBundle/zipball/f2613020cce828cf711d1752b14d1405939f89be",
-                "reference": "f2613020cce828cf711d1752b14d1405939f89be",
+                "url": "https://api.github.com/repos/symfony-cmf/MenuBundle/zipball/9bf7ac68d253c33e1184667f92382e743ddf5d6c",
+                "reference": "9bf7ac68d253c33e1184667f92382e743ddf5d6c",
                 "shasum": ""
             },
             "require": {
@@ -3460,21 +3456,21 @@
                 "Symfony CMF",
                 "menu"
             ],
-            "time": "2014-03-12 16:59:57"
+            "time": "2014-03-27 08:00:34"
         },
         {
             "name": "symfony-cmf/routing",
-            "version": "dev-master",
+            "version": "dev-candidates",
             "target-dir": "Symfony/Cmf/Component/Routing",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/Routing.git",
-                "reference": "988cdaf163da51c9aeb65fca733790678cce5e2f"
+                "reference": "2257e141a98550f65237b5b47a92fd9ea31c3d2c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/988cdaf163da51c9aeb65fca733790678cce5e2f",
-                "reference": "988cdaf163da51c9aeb65fca733790678cce5e2f",
+                "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/2257e141a98550f65237b5b47a92fd9ea31c3d2c",
+                "reference": "2257e141a98550f65237b5b47a92fd9ea31c3d2c",
                 "shasum": ""
             },
             "require": {
@@ -3518,26 +3514,26 @@
                 "database",
                 "routing"
             ],
-            "time": "2014-03-24 07:11:29"
+            "time": "2014-03-29 15:23:46"
         },
         {
             "name": "symfony-cmf/routing-bundle",
-            "version": "dev-master",
+            "version": "dev-cleanup-routing",
             "target-dir": "Symfony/Cmf/Bundle/RoutingBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/RoutingBundle.git",
-                "reference": "cb9124e4bbfb3c8a6037057c28c9070640444eff"
+                "reference": "797720c58c3813dd57f51ead2c352440ee8abc52"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/cb9124e4bbfb3c8a6037057c28c9070640444eff",
-                "reference": "cb9124e4bbfb3c8a6037057c28c9070640444eff",
+                "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/797720c58c3813dd57f51ead2c352440ee8abc52",
+                "reference": "797720c58c3813dd57f51ead2c352440ee8abc52",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
-                "symfony-cmf/routing": "~1.2.0",
+                "symfony-cmf/routing": "dev-candidates as 1.2.0",
                 "symfony/framework-bundle": "~2.2"
             },
             "require-dev": {
@@ -3584,7 +3580,7 @@
                 "database",
                 "routing"
             ],
-            "time": "2014-03-23 21:24:46"
+            "time": "2014-03-29 15:02:04"
         },
         {
             "name": "symfony-cmf/search-bundle",
@@ -3593,12 +3589,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/SearchBundle.git",
-                "reference": "c115f61cdbd13c82fa7388d93714a99161567b3b"
+                "reference": "86adb34df76cdabf8d5ae48ea42d8f39e941c109"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/SearchBundle/zipball/c115f61cdbd13c82fa7388d93714a99161567b3b",
-                "reference": "c115f61cdbd13c82fa7388d93714a99161567b3b",
+                "url": "https://api.github.com/repos/symfony-cmf/SearchBundle/zipball/86adb34df76cdabf8d5ae48ea42d8f39e941c109",
+                "reference": "86adb34df76cdabf8d5ae48ea42d8f39e941c109",
                 "shasum": ""
             },
             "require": {
@@ -3638,21 +3634,21 @@
                 "database",
                 "search"
             ],
-            "time": "2014-03-11 12:45:25"
+            "time": "2014-03-27 08:00:52"
         },
         {
             "name": "symfony-cmf/simple-cms-bundle",
-            "version": "dev-master",
+            "version": "dev-cleanup-routing",
             "target-dir": "Symfony/Cmf/Bundle/SimpleCmsBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/SimpleCmsBundle.git",
-                "reference": "d6d0b28a5a39e015a87556188fc164b6821de58e"
+                "reference": "6c640221a98e0129be3d5192a64f043b4699b447"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/SimpleCmsBundle/zipball/d6d0b28a5a39e015a87556188fc164b6821de58e",
-                "reference": "d6d0b28a5a39e015a87556188fc164b6821de58e",
+                "url": "https://api.github.com/repos/symfony-cmf/SimpleCmsBundle/zipball/6c640221a98e0129be3d5192a64f043b4699b447",
+                "reference": "6c640221a98e0129be3d5192a64f043b4699b447",
                 "shasum": ""
             },
             "require": {
@@ -3701,7 +3697,7 @@
                 "Symfony CMF",
                 "cms"
             ],
-            "time": "2014-03-09 21:29:42"
+            "time": "2014-03-29 16:40:22"
         },
         {
             "name": "symfony-cmf/symfony-cmf",
@@ -3709,12 +3705,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/symfony-cmf.git",
-                "reference": "c375321e8387d53efaab60724aed1bd5a931b39c"
+                "reference": "fb211068352ec83ae027f1b09c0941896787fef3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/symfony-cmf/zipball/c375321e8387d53efaab60724aed1bd5a931b39c",
-                "reference": "c375321e8387d53efaab60724aed1bd5a931b39c",
+                "url": "https://api.github.com/repos/symfony-cmf/symfony-cmf/zipball/fb211068352ec83ae027f1b09c0941896787fef3",
+                "reference": "fb211068352ec83ae027f1b09c0941896787fef3",
                 "shasum": ""
             },
             "require": {
@@ -3732,8 +3728,8 @@
             "suggest": {
                 "sonata-project/doctrine-phpcr-admin-bundle": "1.1.*",
                 "symfony-cmf/create-bundle": "1.1.*",
-                "symfony-cmf/routing-auto-bundle": "~1.0.0-alpha6",
                 "symfony-cmf/search-bundle": "1.0.*",
+                "symfony-cmf/seo-bundle": "1.0.*",
                 "symfony-cmf/simple-cms-bundle": "1.1.*",
                 "symfony-cmf/tree-browser-bundle": "1.1.*"
             },
@@ -3760,7 +3756,7 @@
             ],
             "description": "Symfony Content Management Framework",
             "homepage": "http://cmf.symfony.com",
-            "time": "2014-03-02 12:44:40"
+            "time": "2014-03-31 06:24:28"
         },
         {
             "name": "symfony-cmf/tree-browser-bundle",
@@ -3769,12 +3765,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/TreeBrowserBundle.git",
-                "reference": "8bf832a45e4dd30a723687e1f0a64535df683e16"
+                "reference": "e58b1621044c8177c7e7e9c334aa676e885c9137"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/TreeBrowserBundle/zipball/8bf832a45e4dd30a723687e1f0a64535df683e16",
-                "reference": "8bf832a45e4dd30a723687e1f0a64535df683e16",
+                "url": "https://api.github.com/repos/symfony-cmf/TreeBrowserBundle/zipball/e58b1621044c8177c7e7e9c334aa676e885c9137",
+                "reference": "e58b1621044c8177c7e7e9c334aa676e885c9137",
                 "shasum": ""
             },
             "require": {
@@ -3817,7 +3813,7 @@
                 "phpcr",
                 "tree"
             ],
-            "time": "2014-03-09 21:32:25"
+            "time": "2014-03-27 08:01:07"
         },
         {
             "name": "symfony/assetic-bundle",
@@ -4053,12 +4049,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/symfony.git",
-                "reference": "bbaa839a82dac011750f0c3314d65fb9225b40e7"
+                "reference": "c778b030a9c73affbc315723a47152533e41a127"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/symfony/zipball/bbaa839a82dac011750f0c3314d65fb9225b40e7",
-                "reference": "bbaa839a82dac011750f0c3314d65fb9225b40e7",
+                "url": "https://api.github.com/repos/symfony/symfony/zipball/c778b030a9c73affbc315723a47152533e41a127",
+                "reference": "c778b030a9c73affbc315723a47152533e41a127",
                 "shasum": ""
             },
             "require": {
@@ -4155,7 +4151,7 @@
             "keywords": [
                 "framework"
             ],
-            "time": "2014-03-21 11:48:43"
+            "time": "2014-03-30 07:39:38"
         },
         {
             "name": "twig/extensions",
@@ -4212,12 +4208,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/fabpot/Twig.git",
-                "reference": "dab8d90755a7c1a54cd20be5098f5b5bf3346d9b"
+                "reference": "c8366374d9d531029a6b031528b552c37e1b2e66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fabpot/Twig/zipball/dab8d90755a7c1a54cd20be5098f5b5bf3346d9b",
-                "reference": "dab8d90755a7c1a54cd20be5098f5b5bf3346d9b",
+                "url": "https://api.github.com/repos/fabpot/Twig/zipball/c8366374d9d531029a6b031528b552c37e1b2e66",
+                "reference": "c8366374d9d531029a6b031528b552c37e1b2e66",
                 "shasum": ""
             },
             "require": {
@@ -4261,7 +4257,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2014-03-15 10:50:05"
+            "time": "2014-03-30 17:23:57"
         },
         {
             "name": "willdurand/jsonp-callback-validator",
@@ -4295,7 +4291,7 @@
             ],
             "authors": [
                 {
-                    "name": "William Durand",
+                    "name": "William DURAND",
                     "email": "william.durand1@gmail.com",
                     "homepage": "http://www.willdurand.fr"
                 }
@@ -4796,12 +4792,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/liip/LiipFunctionalTestBundle.git",
-                "reference": "21e1f5f8ca25364fa076ca6118b3645173be0036"
+                "reference": "fb68ae8c8dcc5f8c1177fa91e6a8ae35176e8558"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/liip/LiipFunctionalTestBundle/zipball/21e1f5f8ca25364fa076ca6118b3645173be0036",
-                "reference": "21e1f5f8ca25364fa076ca6118b3645173be0036",
+                "url": "https://api.github.com/repos/liip/LiipFunctionalTestBundle/zipball/fb68ae8c8dcc5f8c1177fa91e6a8ae35176e8558",
+                "reference": "fb68ae8c8dcc5f8c1177fa91e6a8ae35176e8558",
                 "shasum": ""
             },
             "require": {
@@ -4844,7 +4840,7 @@
             "keywords": [
                 "Symfony2"
             ],
-            "time": "2014-03-23 23:13:37"
+            "time": "2014-03-27 21:38:10"
         },
         {
             "name": "symfony-cmf/testing",
@@ -4852,12 +4848,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/Testing.git",
-                "reference": "5ea9e504a64f26c35903c408bd4244655fe546ea"
+                "reference": "b887d8b0f208a7799f801f73cd7df1fd061b5a6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/Testing/zipball/5ea9e504a64f26c35903c408bd4244655fe546ea",
-                "reference": "5ea9e504a64f26c35903c408bd4244655fe546ea",
+                "url": "https://api.github.com/repos/symfony-cmf/Testing/zipball/b887d8b0f208a7799f801f73cd7df1fd061b5a6a",
+                "reference": "b887d8b0f208a7799f801f73cd7df1fd061b5a6a",
                 "shasum": ""
             },
             "require": {
@@ -4894,16 +4890,28 @@
                 }
             ],
             "description": "Component for bootstraping functional tests for CMF bundles only.",
-            "time": "2014-03-10 11:23:36"
+            "time": "2014-03-29 21:34:52"
         }
     ],
     "aliases": [
-
+        {
+            "alias": "1.2.0",
+            "alias_normalized": "1.2.0.0",
+            "version": "dev-cleanup-routing",
+            "package": "symfony-cmf/routing-bundle"
+        },
+        {
+            "alias": "1.1.0",
+            "alias_normalized": "1.1.0.0",
+            "version": "dev-cleanup-routing",
+            "package": "symfony-cmf/simple-cms-bundle"
+        }
     ],
     "minimum-stability": "dev",
-    "stability-flags": [
-
-    ],
+    "stability-flags": {
+        "symfony-cmf/routing-bundle": 20,
+        "symfony-cmf/simple-cms-bundle": 20
+    },
     "platform": {
         "php": ">=5.3.3"
     },
diff --git a/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadRoutingData.php b/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadRoutingData.php
index bf0b4fec..de823a5a 100644
--- a/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadRoutingData.php
+++ b/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadRoutingData.php
@@ -34,7 +34,8 @@ public function load(ObjectManager $dm)
     {
         $session = $dm->getPhpcrSession();
 
-        $basepath = $this->container->getParameter('cmf_routing.dynamic.persistence.phpcr.route_basepath');
+        $basepath = $this->container->getParameter('cmf_routing.dynamic.persistence.phpcr.route_basepaths');
+        $basepath = reset($basepath);
         if ($session->itemExists($basepath)) {
             $session->removeItem($basepath);
         }
diff --git a/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadSimpleCmsData.php b/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadSimpleCmsData.php
index 87c7aa6f..0d964bb1 100644
--- a/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadSimpleCmsData.php
+++ b/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadSimpleCmsData.php
@@ -5,6 +5,7 @@
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\ODM\PHPCR\DocumentManager;
 
 use PHPCR\Util\NodeHelper;
 
@@ -23,6 +24,7 @@ public function load(ObjectManager $manager)
     {
         $basepath = $this->container->getParameter('cmf_simple_cms.persistence.phpcr.basepath');
         $root = $manager->find(null, $basepath);
+        $root->setTitle('simple cms root (hidden by the home route in the sandbox)');
 
         $this->createPage($manager, $root, 'about', 'About us', 'Some information about us', 'The about us page with some content');
         $this->createPage($manager, $root, 'contact', 'Contact', 'A contact page', 'Please send an email to cmf-devs@groups.google.com');
@@ -33,7 +35,7 @@ public function load(ObjectManager $manager)
     /**
      * @return Page instance with the specified information
      */
-    protected function createPage($manager, $parent, $name, $label, $title, $body)
+    protected function createPage(DocumentManager $manager, $parent, $name, $label, $title, $body)
     {
         $page = new Page();
         $page->setPosition($parent, $name);

From c849db4edcb1d37a5b1c7d75d823e202cabd4954 Mon Sep 17 00:00:00 2001
From: Lukas Kahwe Smith <smith@pooteeweet.org>
Date: Mon, 31 Mar 2014 22:22:36 +0200
Subject: [PATCH 02/10] hardcode jquery 1.8.3

until https://github.com/sonata-project/SonataAdminBundle/pull/2018 is merged
---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index 47e54952..77674d90 100644
--- a/composer.json
+++ b/composer.json
@@ -35,6 +35,7 @@
         "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",

From f181773de2003387c367224767f7589a216c9776 Mon Sep 17 00:00:00 2001
From: Lukas Kahwe Smith <smith@pooteeweet.org>
Date: Tue, 1 Apr 2014 16:48:35 +0200
Subject: [PATCH 03/10] updated dependencies

---
 composer.json |  1 -
 composer.lock | 96 +++++++++++++++++++++++----------------------------
 2 files changed, 43 insertions(+), 54 deletions(-)

diff --git a/composer.json b/composer.json
index 77674d90..a951abc6 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,6 @@
     },
     "minimum-stability": "dev",
     "require": {
-        "symfony-cmf/routing-bundle": "dev-cleanup-routing as 1.2.0",
         "php": ">=5.3.3",
         "symfony/symfony": "2.3.*",
         "twig/extensions": "~1.0",
diff --git a/composer.lock b/composer.lock
index 900d3dad..60f243a2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
         "This file locks the dependencies of your project to a known state",
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
     ],
-    "hash": "4bb6d254c5722f2f26c65bfef164212a",
+    "hash": "458d714748bce6bf6d14a961d4da396c",
     "packages": [
         {
             "name": "doctrine/annotations",
@@ -786,12 +786,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/phpcr-odm.git",
-                "reference": "22d03a826ac0e6a6089326fe29d41f20ecadb726"
+                "reference": "ea13fa3066efc433da9236f38e4a403e8eab6fee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/phpcr-odm/zipball/22d03a826ac0e6a6089326fe29d41f20ecadb726",
-                "reference": "22d03a826ac0e6a6089326fe29d41f20ecadb726",
+                "url": "https://api.github.com/repos/doctrine/phpcr-odm/zipball/ea13fa3066efc433da9236f38e4a403e8eab6fee",
+                "reference": "ea13fa3066efc433da9236f38e4a403e8eab6fee",
                 "shasum": ""
             },
             "require": {
@@ -852,7 +852,7 @@
                 "odm",
                 "phpcr"
             ],
-            "time": "2014-03-24 09:03:01"
+            "time": "2014-03-31 19:33:32"
         },
         {
             "name": "eko/feedbundle",
@@ -970,12 +970,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git",
-                "reference": "0f9f719b5b1cbcb18e40b6a13a9f700c0b1e5bb8"
+                "reference": "8a558a91dd6b6b9f1d22e065fed5ad58e1957c0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/0f9f719b5b1cbcb18e40b6a13a9f700c0b1e5bb8",
-                "reference": "0f9f719b5b1cbcb18e40b6a13a9f700c0b1e5bb8",
+                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/8a558a91dd6b6b9f1d22e065fed5ad58e1957c0a",
+                "reference": "8a558a91dd6b6b9f1d22e065fed5ad58e1957c0a",
                 "shasum": ""
             },
             "require": {
@@ -1039,7 +1039,7 @@
             "keywords": [
                 "rest"
             ],
-            "time": "2014-03-28 23:58:47"
+            "time": "2014-04-01 11:22:32"
         },
         {
             "name": "helios-ag/fm-elfinder-bundle",
@@ -2063,12 +2063,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "4cf49e5496857532f4ca4bbb69d1eee591b88234"
+                "reference": "9ebcdcd7f22e5ab94305d97fbeed0ad73a2bebd0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4cf49e5496857532f4ca4bbb69d1eee591b88234",
-                "reference": "4cf49e5496857532f4ca4bbb69d1eee591b88234",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/9ebcdcd7f22e5ab94305d97fbeed0ad73a2bebd0",
+                "reference": "9ebcdcd7f22e5ab94305d97fbeed0ad73a2bebd0",
                 "shasum": ""
             },
             "require": {
@@ -2123,7 +2123,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2014-03-26 11:12:35"
+            "time": "2014-03-31 17:22:13"
         },
         {
             "name": "phpcollection/phpcollection",
@@ -2984,30 +2984,27 @@
         },
         {
             "name": "sonata-project/jquery-bundle",
-            "version": "dev-master",
+            "version": "1.8.3",
+            "target-dir": "Sonata/jQueryBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sonata-project/SonatajQueryBundle.git",
-                "reference": "8db2fbc85e57f193d22ed67f0223c8a717eeaad5"
+                "reference": "1b6dde1becb93b801e64b20e96bc76a110ead712"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonatajQueryBundle/zipball/8db2fbc85e57f193d22ed67f0223c8a717eeaad5",
-                "reference": "8db2fbc85e57f193d22ed67f0223c8a717eeaad5",
+                "url": "https://api.github.com/repos/sonata-project/SonatajQueryBundle/zipball/1b6dde1becb93b801e64b20e96bc76a110ead712",
+                "reference": "1b6dde1becb93b801e64b20e96bc76a110ead712",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.2"
+                "php": ">=5.3.2",
+                "symfony/framework-bundle": "2.*"
             },
             "type": "symfony-bundle",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.9.x-dev"
-                }
-            },
             "autoload": {
-                "psr-4": {
-                    "Sonata\\jQueryBundle\\": ""
+                "psr-0": {
+                    "Sonata\\jQueryBundle": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -3031,7 +3028,7 @@
                 "jquery",
                 "sonata"
             ],
-            "time": "2014-03-19 11:45:00"
+            "time": "2013-03-01 17:24:02"
         },
         {
             "name": "swiftmailer/swiftmailer",
@@ -3223,12 +3220,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/CoreBundle.git",
-                "reference": "ea20e56a14c5efede381e1f4eff4e5a16a79edfe"
+                "reference": "fadc0d1e0590debed5e3d6ea3570ecf158cbdea8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/CoreBundle/zipball/ea20e56a14c5efede381e1f4eff4e5a16a79edfe",
-                "reference": "ea20e56a14c5efede381e1f4eff4e5a16a79edfe",
+                "url": "https://api.github.com/repos/symfony-cmf/CoreBundle/zipball/fadc0d1e0590debed5e3d6ea3570ecf158cbdea8",
+                "reference": "fadc0d1e0590debed5e3d6ea3570ecf158cbdea8",
                 "shasum": ""
             },
             "require": {
@@ -3275,7 +3272,7 @@
             "keywords": [
                 "Symfony CMF"
             ],
-            "time": "2014-03-30 13:16:55"
+            "time": "2014-04-01 07:47:46"
         },
         {
             "name": "symfony-cmf/create-bundle",
@@ -3460,17 +3457,17 @@
         },
         {
             "name": "symfony-cmf/routing",
-            "version": "dev-candidates",
+            "version": "dev-master",
             "target-dir": "Symfony/Cmf/Component/Routing",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/Routing.git",
-                "reference": "2257e141a98550f65237b5b47a92fd9ea31c3d2c"
+                "reference": "6fb75b22097dcb1d0f4fa132ea24646ee004871f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/2257e141a98550f65237b5b47a92fd9ea31c3d2c",
-                "reference": "2257e141a98550f65237b5b47a92fd9ea31c3d2c",
+                "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/6fb75b22097dcb1d0f4fa132ea24646ee004871f",
+                "reference": "6fb75b22097dcb1d0f4fa132ea24646ee004871f",
                 "shasum": ""
             },
             "require": {
@@ -3514,26 +3511,26 @@
                 "database",
                 "routing"
             ],
-            "time": "2014-03-29 15:23:46"
+            "time": "2014-04-01 09:05:49"
         },
         {
             "name": "symfony-cmf/routing-bundle",
-            "version": "dev-cleanup-routing",
+            "version": "dev-master",
             "target-dir": "Symfony/Cmf/Bundle/RoutingBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/RoutingBundle.git",
-                "reference": "797720c58c3813dd57f51ead2c352440ee8abc52"
+                "reference": "98a70fe221beefa7b6bb708f44af3914f8f34db8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/797720c58c3813dd57f51ead2c352440ee8abc52",
-                "reference": "797720c58c3813dd57f51ead2c352440ee8abc52",
+                "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/98a70fe221beefa7b6bb708f44af3914f8f34db8",
+                "reference": "98a70fe221beefa7b6bb708f44af3914f8f34db8",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
-                "symfony-cmf/routing": "dev-candidates as 1.2.0",
+                "symfony-cmf/routing": "~1.2.0",
                 "symfony/framework-bundle": "~2.2"
             },
             "require-dev": {
@@ -3580,7 +3577,7 @@
                 "database",
                 "routing"
             ],
-            "time": "2014-03-29 15:02:04"
+            "time": "2014-04-01 14:15:33"
         },
         {
             "name": "symfony-cmf/search-bundle",
@@ -4049,12 +4046,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/symfony.git",
-                "reference": "c778b030a9c73affbc315723a47152533e41a127"
+                "reference": "8aa194c0a663513f9316af54e74c4bea78178b79"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/symfony/zipball/c778b030a9c73affbc315723a47152533e41a127",
-                "reference": "c778b030a9c73affbc315723a47152533e41a127",
+                "url": "https://api.github.com/repos/symfony/symfony/zipball/8aa194c0a663513f9316af54e74c4bea78178b79",
+                "reference": "8aa194c0a663513f9316af54e74c4bea78178b79",
                 "shasum": ""
             },
             "require": {
@@ -4151,7 +4148,7 @@
             "keywords": [
                 "framework"
             ],
-            "time": "2014-03-30 07:39:38"
+            "time": "2014-04-01 06:01:53"
         },
         {
             "name": "twig/extensions",
@@ -4291,7 +4288,7 @@
             ],
             "authors": [
                 {
-                    "name": "William DURAND",
+                    "name": "William Durand",
                     "email": "william.durand1@gmail.com",
                     "homepage": "http://www.willdurand.fr"
                 }
@@ -4894,12 +4891,6 @@
         }
     ],
     "aliases": [
-        {
-            "alias": "1.2.0",
-            "alias_normalized": "1.2.0.0",
-            "version": "dev-cleanup-routing",
-            "package": "symfony-cmf/routing-bundle"
-        },
         {
             "alias": "1.1.0",
             "alias_normalized": "1.1.0.0",
@@ -4909,7 +4900,6 @@
     ],
     "minimum-stability": "dev",
     "stability-flags": {
-        "symfony-cmf/routing-bundle": 20,
         "symfony-cmf/simple-cms-bundle": 20
     },
     "platform": {

From 2f581360a9607d98ce743d21ab98ed6c2f1d558d Mon Sep 17 00:00:00 2001
From: Lukas Kahwe Smith <smith@pooteeweet.org>
Date: Thu, 3 Apr 2014 13:45:08 +0200
Subject: [PATCH 04/10] remove midgard

---
 .travis.yml                              |  9 +--------
 app/config/phpcr_midgard_mysql.yml.dist  | 18 ------------------
 app/config/phpcr_midgard_sqlite.yml.dist | 15 ---------------
 app/tests/travis_midgard_install.sh      | 12 ------------
 app/tests/travis_midgard_mysql.sh        | 11 -----------
 app/tests/travis_midgard_sqlite.sh       |  4 ----
 6 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 app/config/phpcr_midgard_mysql.yml.dist
 delete mode 100644 app/config/phpcr_midgard_sqlite.yml.dist
 delete mode 100755 app/tests/travis_midgard_install.sh
 delete mode 100755 app/tests/travis_midgard_mysql.sh
 delete mode 100755 app/tests/travis_midgard_sqlite.sh

diff --git a/.travis.yml b/.travis.yml
index fbd9d02a..0e50f6da 100644
--- a/.travis.yml
+++ b/.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"
\ No newline at end of file
diff --git a/app/config/phpcr_midgard_mysql.yml.dist b/app/config/phpcr_midgard_mysql.yml.dist
deleted file mode 100644
index 32bce485..00000000
--- a/app/config/phpcr_midgard_mysql.yml.dist
+++ /dev/null
@@ -1,18 +0,0 @@
-parameters:
-    locale: en
-
-    secret: xxxxxxxxxx
-
-    phpcr_backend:
-        type: midgard2
-        db_type: MySQL
-        db_name: midgard2_test
-        db_host: "0.0.0.0"
-        db_port: 3306
-        db_username: ""
-        db_password: ""
-        db_init: true
-        blobdir: /tmp/cmf-blobs
-    phpcr_workspace: default
-    phpcr_user: admin
-    phpcr_pass: password
diff --git a/app/config/phpcr_midgard_sqlite.yml.dist b/app/config/phpcr_midgard_sqlite.yml.dist
deleted file mode 100644
index 8820314d..00000000
--- a/app/config/phpcr_midgard_sqlite.yml.dist
+++ /dev/null
@@ -1,15 +0,0 @@
-parameters:
-    locale: en
-
-    secret: xxxxxxxxxx
-
-    phpcr_backend:
-        type: midgard2
-        db_type: SQLite
-        db_name: cmf
-        db_dir: /tmp
-        db_init: true
-        blobdir: /tmp/cmf-blobs
-    phpcr_workspace: default
-    phpcr_user: admin
-    phpcr_pass: password
diff --git a/app/tests/travis_midgard_install.sh b/app/tests/travis_midgard_install.sh
deleted file mode 100755
index cdae9c07..00000000
--- a/app/tests/travis_midgard_install.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Download installation script from phpcr-midgard2
-wget https://raw.github.com/midgardproject/phpcr-midgard2/master/tests/travis_midgard.sh
-chmod +x ./travis_midgard.sh
-./travis_midgard.sh
-
-# Copy PHPCR schemas to Midgard's global schema dir
-sudo wget --directory-prefix=/usr/share/midgard2/schema https://github.com/midgardproject/phpcr-midgard2/raw/master/data/share/schema/midgard_namespace_registry.xml
-sudo wget --directory-prefix=/usr/share/midgard2/schema https://github.com/midgardproject/phpcr-midgard2/raw/master/data/share/schema/midgard_tree_node.xml
-
-composer require midgard/phpcr:dev-master --prefer-source
diff --git a/app/tests/travis_midgard_mysql.sh b/app/tests/travis_midgard_mysql.sh
deleted file mode 100755
index 36ce1712..00000000
--- a/app/tests/travis_midgard_mysql.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Install libgda MySQL connector
-sudo apt-get install -y libgda-4.0-mysql
-
-# Create the database
-mysql -e 'create database midgard2_test;'
-sudo mysql -e 'SET GLOBAL sql_mode="";'
-
-# Install Midgard2
-./app/tests/travis_midgard_install.sh
diff --git a/app/tests/travis_midgard_sqlite.sh b/app/tests/travis_midgard_sqlite.sh
deleted file mode 100755
index b0b1cd70..00000000
--- a/app/tests/travis_midgard_sqlite.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# Install Midgard2
-./app/tests/travis_midgard_install.sh

From 9b664d832566d54fe9763b7a472e07493371c9b0 Mon Sep 17 00:00:00 2001
From: Lukas Kahwe Smith <smith@pooteeweet.org>
Date: Thu, 3 Apr 2014 13:45:19 +0200
Subject: [PATCH 05/10] update dependencies

---
 app/config/config.yml |  10 ----
 composer.lock         | 120 ++++++++++++++++++++++--------------------
 2 files changed, 63 insertions(+), 67 deletions(-)

diff --git a/app/config/config.yml b/app/config/config.yml
index 44c5c1dd..58fcbf33 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -107,12 +107,6 @@ cmf_routing:
             cmf_routing.dynamic_router: 20
             router.default: 100
     dynamic:
-        # todo: adjust CoreBundle to prepend
-        persistence:
-            phpcr:
-                route_basepaths:
-                    - /cms/routes
-                    - /cms/simple
         controllers_by_type:
             demo_type: sandbox_main.controller:typeAction
         controllers_by_class:
@@ -121,10 +115,6 @@ cmf_routing:
 
         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
 
 cmf_create:
diff --git a/composer.lock b/composer.lock
index 60f243a2..5671bd91 100644
--- a/composer.lock
+++ b/composer.lock
@@ -970,12 +970,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git",
-                "reference": "8a558a91dd6b6b9f1d22e065fed5ad58e1957c0a"
+                "reference": "615efee62258ee92fc7c372a3565e694f92fbf99"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/8a558a91dd6b6b9f1d22e065fed5ad58e1957c0a",
-                "reference": "8a558a91dd6b6b9f1d22e065fed5ad58e1957c0a",
+                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/615efee62258ee92fc7c372a3565e694f92fbf99",
+                "reference": "615efee62258ee92fc7c372a3565e694f92fbf99",
                 "shasum": ""
             },
             "require": {
@@ -1039,7 +1039,7 @@
             "keywords": [
                 "rest"
             ],
-            "time": "2014-04-01 11:22:32"
+            "time": "2014-04-02 13:23:37"
         },
         {
             "name": "helios-ag/fm-elfinder-bundle",
@@ -2063,12 +2063,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "9ebcdcd7f22e5ab94305d97fbeed0ad73a2bebd0"
+                "reference": "f3032a2b9874aa76efcc155eff776eabdf322d05"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/9ebcdcd7f22e5ab94305d97fbeed0ad73a2bebd0",
-                "reference": "9ebcdcd7f22e5ab94305d97fbeed0ad73a2bebd0",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f3032a2b9874aa76efcc155eff776eabdf322d05",
+                "reference": "f3032a2b9874aa76efcc155eff776eabdf322d05",
                 "shasum": ""
             },
             "require": {
@@ -2123,7 +2123,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2014-03-31 17:22:13"
+            "time": "2014-04-01 19:53:04"
         },
         {
             "name": "phpcollection/phpcollection",
@@ -2421,7 +2421,9 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
                 }
             ],
             "description": "The base bundle for the Symfony Distributions",
@@ -3032,16 +3034,16 @@
         },
         {
             "name": "swiftmailer/swiftmailer",
-            "version": "v5.0.3",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "32edc3b0de0fdc1b10f5c4912e8677b3f411a230"
+                "reference": "4f7a8b30aea0e580849a814876cdd8343277efc2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/32edc3b0de0fdc1b10f5c4912e8677b3f411a230",
-                "reference": "32edc3b0de0fdc1b10f5c4912e8677b3f411a230",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/4f7a8b30aea0e580849a814876cdd8343277efc2",
+                "reference": "4f7a8b30aea0e580849a814876cdd8343277efc2",
                 "shasum": ""
             },
             "require": {
@@ -3065,7 +3067,9 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
                 },
                 {
                     "name": "Chris Corbyn"
@@ -3077,7 +3081,7 @@
                 "mail",
                 "mailer"
             ],
-            "time": "2013-12-03 13:33:24"
+            "time": "2014-04-03 05:12:31"
         },
         {
             "name": "symfony-cmf/block-bundle",
@@ -3086,12 +3090,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/BlockBundle.git",
-                "reference": "5357f658938d48e0c63f085f02f79253c05bf54e"
+                "reference": "26bcf5465b972042b6e5fe43c8115a567187d8e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/BlockBundle/zipball/5357f658938d48e0c63f085f02f79253c05bf54e",
-                "reference": "5357f658938d48e0c63f085f02f79253c05bf54e",
+                "url": "https://api.github.com/repos/symfony-cmf/BlockBundle/zipball/26bcf5465b972042b6e5fe43c8115a567187d8e5",
+                "reference": "26bcf5465b972042b6e5fe43c8115a567187d8e5",
                 "shasum": ""
             },
             "require": {
@@ -3146,7 +3150,7 @@
                 "block",
                 "content fragments"
             ],
-            "time": "2014-03-27 08:00:01"
+            "time": "2014-04-02 12:52:00"
         },
         {
             "name": "symfony-cmf/content-bundle",
@@ -3220,12 +3224,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/CoreBundle.git",
-                "reference": "fadc0d1e0590debed5e3d6ea3570ecf158cbdea8"
+                "reference": "53c3dc16f5d2d40a40f321046064e31f9548ea1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/CoreBundle/zipball/fadc0d1e0590debed5e3d6ea3570ecf158cbdea8",
-                "reference": "fadc0d1e0590debed5e3d6ea3570ecf158cbdea8",
+                "url": "https://api.github.com/repos/symfony-cmf/CoreBundle/zipball/53c3dc16f5d2d40a40f321046064e31f9548ea1d",
+                "reference": "53c3dc16f5d2d40a40f321046064e31f9548ea1d",
                 "shasum": ""
             },
             "require": {
@@ -3272,7 +3276,7 @@
             "keywords": [
                 "Symfony CMF"
             ],
-            "time": "2014-04-01 07:47:46"
+            "time": "2014-04-02 08:03:25"
         },
         {
             "name": "symfony-cmf/create-bundle",
@@ -3401,12 +3405,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/MenuBundle.git",
-                "reference": "9bf7ac68d253c33e1184667f92382e743ddf5d6c"
+                "reference": "0e74d9af4ec8eb0dd7a9d4feee02cf056e0566f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/MenuBundle/zipball/9bf7ac68d253c33e1184667f92382e743ddf5d6c",
-                "reference": "9bf7ac68d253c33e1184667f92382e743ddf5d6c",
+                "url": "https://api.github.com/repos/symfony-cmf/MenuBundle/zipball/0e74d9af4ec8eb0dd7a9d4feee02cf056e0566f3",
+                "reference": "0e74d9af4ec8eb0dd7a9d4feee02cf056e0566f3",
                 "shasum": ""
             },
             "require": {
@@ -3453,7 +3457,7 @@
                 "Symfony CMF",
                 "menu"
             ],
-            "time": "2014-03-27 08:00:34"
+            "time": "2014-04-02 15:34:48"
         },
         {
             "name": "symfony-cmf/routing",
@@ -3520,12 +3524,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/RoutingBundle.git",
-                "reference": "98a70fe221beefa7b6bb708f44af3914f8f34db8"
+                "reference": "076eb53ea498d9c896202edaac46c3a84d196fbf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/98a70fe221beefa7b6bb708f44af3914f8f34db8",
-                "reference": "98a70fe221beefa7b6bb708f44af3914f8f34db8",
+                "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/076eb53ea498d9c896202edaac46c3a84d196fbf",
+                "reference": "076eb53ea498d9c896202edaac46c3a84d196fbf",
                 "shasum": ""
             },
             "require": {
@@ -3538,7 +3542,7 @@
                 "matthiasnoback/symfony-config-test": "0.*",
                 "matthiasnoback/symfony-dependency-injection-test": "0.*",
                 "sonata-project/doctrine-phpcr-admin-bundle": "1.1.*",
-                "symfony-cmf/core-bundle": "~1.0",
+                "symfony-cmf/core-bundle": "~1.1",
                 "symfony-cmf/testing": "1.1.*",
                 "symfony/monolog-bundle": "2.2.*"
             },
@@ -3577,7 +3581,7 @@
                 "database",
                 "routing"
             ],
-            "time": "2014-04-01 14:15:33"
+            "time": "2014-04-03 10:56:09"
         },
         {
             "name": "symfony-cmf/search-bundle",
@@ -3640,12 +3644,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/SimpleCmsBundle.git",
-                "reference": "6c640221a98e0129be3d5192a64f043b4699b447"
+                "reference": "9ae1897de42e909d594c39555164789fc9957a96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/SimpleCmsBundle/zipball/6c640221a98e0129be3d5192a64f043b4699b447",
-                "reference": "6c640221a98e0129be3d5192a64f043b4699b447",
+                "url": "https://api.github.com/repos/symfony-cmf/SimpleCmsBundle/zipball/9ae1897de42e909d594c39555164789fc9957a96",
+                "reference": "9ae1897de42e909d594c39555164789fc9957a96",
                 "shasum": ""
             },
             "require": {
@@ -3653,12 +3657,14 @@
                 "doctrine/phpcr-odm": ">=1.1.0,<1.2-dev",
                 "php": ">=5.3.3",
                 "symfony-cmf/content-bundle": ">=1.0.0,<1.2-dev",
-                "symfony-cmf/core-bundle": ">=1.0.0,<1.2-dev",
+                "symfony-cmf/core-bundle": ">=1.1.0,<1.2-dev",
                 "symfony-cmf/menu-bundle": ">=1.0.0,<1.2-dev",
                 "symfony-cmf/routing-bundle": "1.2.*",
                 "symfony/framework-bundle": "~2.2"
             },
             "require-dev": {
+                "matthiasnoback/symfony-config-test": "0.*",
+                "matthiasnoback/symfony-dependency-injection-test": "0.*",
                 "sonata-project/doctrine-phpcr-admin-bundle": ">=1.0.0,<1.2-dev",
                 "symfony-cmf/testing": ">=1.0.0,<1.2-dev",
                 "symfony/monolog-bundle": "~2.2"
@@ -3694,7 +3700,7 @@
                 "Symfony CMF",
                 "cms"
             ],
-            "time": "2014-03-29 16:40:22"
+            "time": "2014-04-03 09:31:00"
         },
         {
             "name": "symfony-cmf/symfony-cmf",
@@ -3985,22 +3991,22 @@
         },
         {
             "name": "symfony/swiftmailer-bundle",
-            "version": "v2.3.5",
+            "version": "dev-master",
             "target-dir": "Symfony/Bundle/SwiftmailerBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/SwiftmailerBundle.git",
-                "reference": "fcefa9dbd5a1ed20547b0f8a2afd5ad6837ea321"
+                "reference": "d272424f01656f9327198fd6c07a48499622d133"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/fcefa9dbd5a1ed20547b0f8a2afd5ad6837ea321",
-                "reference": "fcefa9dbd5a1ed20547b0f8a2afd5ad6837ea321",
+                "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/d272424f01656f9327198fd6c07a48499622d133",
+                "reference": "d272424f01656f9327198fd6c07a48499622d133",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2",
-                "swiftmailer/swiftmailer": ">=4.2.0,<5.1-dev",
+                "swiftmailer/swiftmailer": ">=4.2.0,~5.0",
                 "symfony/swiftmailer-bridge": "~2.1"
             },
             "require-dev": {
@@ -4012,7 +4018,7 @@
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.2-dev"
+                    "dev-master": "2.3-dev"
                 }
             },
             "autoload": {
@@ -4038,7 +4044,7 @@
             ],
             "description": "Symfony SwiftmailerBundle",
             "homepage": "http://symfony.com",
-            "time": "2013-11-21 12:29:01"
+            "time": "2014-04-03 07:36:17"
         },
         {
             "name": "symfony/symfony",
@@ -4046,12 +4052,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/symfony.git",
-                "reference": "8aa194c0a663513f9316af54e74c4bea78178b79"
+                "reference": "a18ee423f92cd2a5245cdcd3a145dbd6e9402613"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/symfony/zipball/8aa194c0a663513f9316af54e74c4bea78178b79",
-                "reference": "8aa194c0a663513f9316af54e74c4bea78178b79",
+                "url": "https://api.github.com/repos/symfony/symfony/zipball/a18ee423f92cd2a5245cdcd3a145dbd6e9402613",
+                "reference": "a18ee423f92cd2a5245cdcd3a145dbd6e9402613",
                 "shasum": ""
             },
             "require": {
@@ -4148,7 +4154,7 @@
             "keywords": [
                 "framework"
             ],
-            "time": "2014-04-01 06:01:53"
+            "time": "2014-04-03 08:18:27"
         },
         {
             "name": "twig/extensions",
@@ -4288,7 +4294,7 @@
             ],
             "authors": [
                 {
-                    "name": "William Durand",
+                    "name": "William DURAND",
                     "email": "william.durand1@gmail.com",
                     "homepage": "http://www.willdurand.fr"
                 }
@@ -4789,12 +4795,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/liip/LiipFunctionalTestBundle.git",
-                "reference": "fb68ae8c8dcc5f8c1177fa91e6a8ae35176e8558"
+                "reference": "e7480e6716913c553f34b22e4e8c33480a2b022e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/liip/LiipFunctionalTestBundle/zipball/fb68ae8c8dcc5f8c1177fa91e6a8ae35176e8558",
-                "reference": "fb68ae8c8dcc5f8c1177fa91e6a8ae35176e8558",
+                "url": "https://api.github.com/repos/liip/LiipFunctionalTestBundle/zipball/e7480e6716913c553f34b22e4e8c33480a2b022e",
+                "reference": "e7480e6716913c553f34b22e4e8c33480a2b022e",
                 "shasum": ""
             },
             "require": {
@@ -4837,7 +4843,7 @@
             "keywords": [
                 "Symfony2"
             ],
-            "time": "2014-03-27 21:38:10"
+            "time": "2014-04-02 22:28:13"
         },
         {
             "name": "symfony-cmf/testing",
@@ -4845,12 +4851,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/Testing.git",
-                "reference": "b887d8b0f208a7799f801f73cd7df1fd061b5a6a"
+                "reference": "3b89e9f57774ddf98ad1d4d62166d6be5ddaa357"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/Testing/zipball/b887d8b0f208a7799f801f73cd7df1fd061b5a6a",
-                "reference": "b887d8b0f208a7799f801f73cd7df1fd061b5a6a",
+                "url": "https://api.github.com/repos/symfony-cmf/Testing/zipball/3b89e9f57774ddf98ad1d4d62166d6be5ddaa357",
+                "reference": "3b89e9f57774ddf98ad1d4d62166d6be5ddaa357",
                 "shasum": ""
             },
             "require": {
@@ -4887,7 +4893,7 @@
                 }
             ],
             "description": "Component for bootstraping functional tests for CMF bundles only.",
-            "time": "2014-03-29 21:34:52"
+            "time": "2014-04-02 20:46:35"
         }
     ],
     "aliases": [

From cb3d9e4154512adbf598fd227ca15d3d1d0932d7 Mon Sep 17 00:00:00 2001
From: Lukas Kahwe Smith <smith@pooteeweet.org>
Date: Thu, 3 Apr 2014 13:47:15 +0200
Subject: [PATCH 06/10] activate logging/profiling by default

---
 app/config/phpcr_doctrine_dbal.yml.dist | 2 ++
 app/config/phpcr_jackrabbit.yml.dist    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/config/phpcr_doctrine_dbal.yml.dist b/app/config/phpcr_doctrine_dbal.yml.dist
index fbb93140..4a10312b 100644
--- 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
index 1f40783b..7dab30c0 100644
--- 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

From dc5d07768b62f6941770b780c35662d4e0435b8b Mon Sep 17 00:00:00 2001
From: Lukas Kahwe Smith <smith@pooteeweet.org>
Date: Thu, 3 Apr 2014 14:22:03 +0200
Subject: [PATCH 07/10] update dependencies

---
 composer.json |  36 ++++++++---------
 composer.lock | 110 ++++++++++++++++++++++----------------------------
 2 files changed, 66 insertions(+), 80 deletions(-)

diff --git a/composer.json b/composer.json
index a951abc6..8dbf3103 100644
--- a/composer.json
+++ b/composer.json
@@ -23,28 +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": "dev-cleanup-routing as 1.1.0",
-        "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",
+        "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.12",
-        "wjzijderveld/check-bundles": "~1.0",
-        "helios-ag/fm-elfinder-bundle": "~1.4"
+        "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": [
diff --git a/composer.lock b/composer.lock
index 5671bd91..6ecab435 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
         "This file locks the dependencies of your project to a known state",
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
     ],
-    "hash": "458d714748bce6bf6d14a961d4da396c",
+    "hash": "d01658516dbeb8a2c0d4b69dfbe0f972",
     "packages": [
         {
             "name": "doctrine/annotations",
@@ -418,36 +418,30 @@
         },
         {
             "name": "doctrine/doctrine-bundle",
-            "version": "dev-master",
+            "version": "v1.2.0",
             "target-dir": "Doctrine/Bundle/DoctrineBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/DoctrineBundle.git",
-                "reference": "326bc9422817a0c3abe4551fd3b816a066947630"
+                "reference": "765b0d87fcc3e839c74817b7211258cbef3a4fb9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/326bc9422817a0c3abe4551fd3b816a066947630",
-                "reference": "326bc9422817a0c3abe4551fd3b816a066947630",
+                "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/765b0d87fcc3e839c74817b7211258cbef3a4fb9",
+                "reference": "765b0d87fcc3e839c74817b7211258cbef3a4fb9",
                 "shasum": ""
             },
             "require": {
-                "doctrine/dbal": "~2.3",
-                "doctrine/doctrine-cache-bundle": "~1.0",
+                "doctrine/dbal": ">=2.2,<2.5-dev",
                 "jdorn/sql-formatter": "~1.1",
                 "php": ">=5.3.2",
                 "symfony/doctrine-bridge": "~2.2",
                 "symfony/framework-bundle": "~2.2"
             },
             "require-dev": {
-                "doctrine/orm": "~2.3",
-                "phpunit/php-code-coverage": "~1.2",
-                "phpunit/phpunit": "~3.7",
-                "phpunit/phpunit-mock-objects": "~1.2",
-                "satooshi/php-coveralls": "~0.6.1",
+                "doctrine/orm": ">=2.2,<2.5-dev",
                 "symfony/validator": "~2.2",
-                "symfony/yaml": "~2.2",
-                "twig/twig": "~1"
+                "symfony/yaml": "~2.2"
             },
             "suggest": {
                 "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
@@ -456,7 +450,7 @@
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3.x-dev"
+                    "dev-master": "1.2.x-dev"
                 }
             },
             "autoload": {
@@ -482,10 +476,6 @@
                 {
                     "name": "Benjamin Eberlei",
                     "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Doctrine Project",
-                    "homepage": "http://www.doctrine-project.org/"
                 }
             ],
             "description": "Symfony DoctrineBundle",
@@ -496,7 +486,7 @@
                 "orm",
                 "persistence"
             ],
-            "time": "2014-03-04 21:50:51"
+            "time": "2013-03-25 20:13:59"
         },
         {
             "name": "doctrine/doctrine-cache-bundle",
@@ -715,12 +705,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/DoctrinePHPCRBundle.git",
-                "reference": "bf318493ef874905c66d7cd01108f39d2266ec74"
+                "reference": "e7fc9122f67766eef9cb4054034926b7660a275c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrinePHPCRBundle/zipball/bf318493ef874905c66d7cd01108f39d2266ec74",
-                "reference": "bf318493ef874905c66d7cd01108f39d2266ec74",
+                "url": "https://api.github.com/repos/doctrine/DoctrinePHPCRBundle/zipball/e7fc9122f67766eef9cb4054034926b7660a275c",
+                "reference": "e7fc9122f67766eef9cb4054034926b7660a275c",
                 "shasum": ""
             },
             "require": {
@@ -778,7 +768,7 @@
                 "persistence",
                 "phpcr"
             ],
-            "time": "2014-03-27 07:24:29"
+            "time": "2014-04-03 12:45:33"
         },
         {
             "name": "doctrine/phpcr-odm",
@@ -856,21 +846,22 @@
         },
         {
             "name": "eko/feedbundle",
-            "version": "dev-master",
+            "version": "1.0.1",
+            "target-dir": "Eko/FeedBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/eko/FeedBundle.git",
-                "reference": "59008490ef8fe8a97e0c167d66ca84a59eb584c1"
+                "reference": "f180c6dc7d5216ff0a5f1b905d32f4b427a4dcf5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/eko/FeedBundle/zipball/59008490ef8fe8a97e0c167d66ca84a59eb584c1",
-                "reference": "59008490ef8fe8a97e0c167d66ca84a59eb584c1",
+                "url": "https://api.github.com/repos/eko/FeedBundle/zipball/f180c6dc7d5216ff0a5f1b905d32f4b427a4dcf5",
+                "reference": "f180c6dc7d5216ff0a5f1b905d32f4b427a4dcf5",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2",
-                "symfony/framework-bundle": "~2.0",
+                "symfony/framework-bundle": ">=2.0,<2.4-dev",
                 "zendframework/zend-feed": ">=2.0",
                 "zendframework/zend-http": ">=2.0",
                 "zendframework/zend-servicemanager": ">=2.0"
@@ -878,12 +869,12 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Eko\\FeedBundle\\": ""
+                "psr-0": {
+                    "Eko\\FeedBundle": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -904,7 +895,7 @@
                 "feed",
                 "rss"
             ],
-            "time": "2014-03-07 19:16:00"
+            "time": "2013-06-08 08:30:49"
         },
         {
             "name": "friendsofsymfony/jsrouting-bundle",
@@ -1255,12 +1246,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/jackalope/jackalope-doctrine-dbal.git",
-                "reference": "b3fc10e3e365637730ecb622806d8a73e6962f16"
+                "reference": "9fac0169f5fc0486f717e2051a4a61ded69d325e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jackalope/jackalope-doctrine-dbal/zipball/b3fc10e3e365637730ecb622806d8a73e6962f16",
-                "reference": "b3fc10e3e365637730ecb622806d8a73e6962f16",
+                "url": "https://api.github.com/repos/jackalope/jackalope-doctrine-dbal/zipball/9fac0169f5fc0486f717e2051a4a61ded69d325e",
+                "reference": "9fac0169f5fc0486f717e2051a4a61ded69d325e",
                 "shasum": ""
             },
             "require": {
@@ -1309,7 +1300,7 @@
                 "phpcr",
                 "transport implementation"
             ],
-            "time": "2014-03-17 08:47:49"
+            "time": "2014-04-03 12:44:49"
         },
         {
             "name": "jackalope/jackalope-jackrabbit",
@@ -1839,17 +1830,17 @@
         },
         {
             "name": "liip/imagine-bundle",
-            "version": "0.x-dev",
+            "version": "v0.21.1",
             "target-dir": "Liip/ImagineBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/liip/LiipImagineBundle.git",
-                "reference": "e39b7c1d5a969605690ef5f9ab1f837bf4083b5f"
+                "reference": "0490ecfd7184e71b24108ba0c2a85261c14b9fc4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/liip/LiipImagineBundle/zipball/e39b7c1d5a969605690ef5f9ab1f837bf4083b5f",
-                "reference": "e39b7c1d5a969605690ef5f9ab1f837bf4083b5f",
+                "url": "https://api.github.com/repos/liip/LiipImagineBundle/zipball/0490ecfd7184e71b24108ba0c2a85261c14b9fc4",
+                "reference": "0490ecfd7184e71b24108ba0c2a85261c14b9fc4",
                 "shasum": ""
             },
             "require": {
@@ -1890,7 +1881,7 @@
                 "image",
                 "imagine"
             ],
-            "time": "2014-03-23 14:00:21"
+            "time": "2014-03-14 17:57:09"
         },
         {
             "name": "liip/search-bundle",
@@ -2738,16 +2729,16 @@
         },
         {
             "name": "sonata-project/cache-bundle",
-            "version": "dev-master",
+            "version": "2.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sonata-project/SonataCacheBundle.git",
-                "reference": "af5b3f2bc1622b4952bcb7a5d2edde313fb0c847"
+                "reference": "2803d69b13e237b2de53076750e5c0df528727e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataCacheBundle/zipball/af5b3f2bc1622b4952bcb7a5d2edde313fb0c847",
-                "reference": "af5b3f2bc1622b4952bcb7a5d2edde313fb0c847",
+                "url": "https://api.github.com/repos/sonata-project/SonataCacheBundle/zipball/2803d69b13e237b2de53076750e5c0df528727e8",
+                "reference": "2803d69b13e237b2de53076750e5c0df528727e8",
                 "shasum": ""
             },
             "require": {
@@ -2802,7 +2793,7 @@
             "keywords": [
                 "cache block"
             ],
-            "time": "2014-03-19 11:43:29"
+            "time": "2014-02-14 14:16:31"
         },
         {
             "name": "sonata-project/core-bundle",
@@ -3639,17 +3630,17 @@
         },
         {
             "name": "symfony-cmf/simple-cms-bundle",
-            "version": "dev-cleanup-routing",
+            "version": "dev-master",
             "target-dir": "Symfony/Cmf/Bundle/SimpleCmsBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/SimpleCmsBundle.git",
-                "reference": "9ae1897de42e909d594c39555164789fc9957a96"
+                "reference": "d9ece63cd4fab71767793eb8f5773f20fcd640aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/SimpleCmsBundle/zipball/9ae1897de42e909d594c39555164789fc9957a96",
-                "reference": "9ae1897de42e909d594c39555164789fc9957a96",
+                "url": "https://api.github.com/repos/symfony-cmf/SimpleCmsBundle/zipball/d9ece63cd4fab71767793eb8f5773f20fcd640aa",
+                "reference": "d9ece63cd4fab71767793eb8f5773f20fcd640aa",
                 "shasum": ""
             },
             "require": {
@@ -3700,7 +3691,7 @@
                 "Symfony CMF",
                 "cms"
             ],
-            "time": "2014-04-03 09:31:00"
+            "time": "2014-04-03 10:03:25"
         },
         {
             "name": "symfony-cmf/symfony-cmf",
@@ -4354,7 +4345,7 @@
         },
         {
             "name": "wjzijderveld/check-bundles",
-            "version": "1.x-dev",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wjzijderveld/CheckBundles.git",
@@ -4897,17 +4888,12 @@
         }
     ],
     "aliases": [
-        {
-            "alias": "1.1.0",
-            "alias_normalized": "1.1.0.0",
-            "version": "dev-cleanup-routing",
-            "package": "symfony-cmf/simple-cms-bundle"
-        }
+
     ],
     "minimum-stability": "dev",
-    "stability-flags": {
-        "symfony-cmf/simple-cms-bundle": 20
-    },
+    "stability-flags": [
+
+    ],
     "platform": {
         "php": ">=5.3.3"
     },

From a0a4ebc953b93053f97fc468e7d623f0c94463d0 Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Fri, 4 Apr 2014 15:15:59 +0200
Subject: [PATCH 08/10] update sandbox to routing refactoring

---
 app/config/config.yml                         | 11 ++-
 composer.lock                                 | 70 +++++++++----------
 .../DataFixtures/PHPCR/LoadRoutingData.php    |  3 +-
 3 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/app/config/config.yml b/app/config/config.yml
index 58fcbf33..1649a4f7 100644
--- 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:
@@ -114,8 +108,8 @@ cmf_routing:
             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
             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/
@@ -141,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/composer.lock b/composer.lock
index 6ecab435..094fc34f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -961,12 +961,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git",
-                "reference": "615efee62258ee92fc7c372a3565e694f92fbf99"
+                "reference": "890829effff016b53f392d45702107a09e71edcf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/615efee62258ee92fc7c372a3565e694f92fbf99",
-                "reference": "615efee62258ee92fc7c372a3565e694f92fbf99",
+                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/890829effff016b53f392d45702107a09e71edcf",
+                "reference": "890829effff016b53f392d45702107a09e71edcf",
                 "shasum": ""
             },
             "require": {
@@ -1030,7 +1030,7 @@
             "keywords": [
                 "rest"
             ],
-            "time": "2014-04-02 13:23:37"
+            "time": "2014-04-03 21:10:08"
         },
         {
             "name": "helios-ag/fm-elfinder-bundle",
@@ -1193,12 +1193,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/jackalope/jackalope.git",
-                "reference": "14a69f82e865e92c2cfaa2644c75a9aa04fc7ca1"
+                "reference": "1f936da47bd29deb8b0a1a21af46519485f99d37"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jackalope/jackalope/zipball/14a69f82e865e92c2cfaa2644c75a9aa04fc7ca1",
-                "reference": "14a69f82e865e92c2cfaa2644c75a9aa04fc7ca1",
+                "url": "https://api.github.com/repos/jackalope/jackalope/zipball/1f936da47bd29deb8b0a1a21af46519485f99d37",
+                "reference": "1f936da47bd29deb8b0a1a21af46519485f99d37",
                 "shasum": ""
             },
             "require": {
@@ -1238,7 +1238,7 @@
             "keywords": [
                 "phpcr"
             ],
-            "time": "2014-03-28 12:00:36"
+            "time": "2014-04-04 10:29:19"
         },
         {
             "name": "jackalope/jackalope-doctrine-dbal",
@@ -1246,17 +1246,17 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/jackalope/jackalope-doctrine-dbal.git",
-                "reference": "9fac0169f5fc0486f717e2051a4a61ded69d325e"
+                "reference": "571f54f95f46bc8b0608d87886ba17906685edf1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jackalope/jackalope-doctrine-dbal/zipball/9fac0169f5fc0486f717e2051a4a61ded69d325e",
-                "reference": "9fac0169f5fc0486f717e2051a4a61ded69d325e",
+                "url": "https://api.github.com/repos/jackalope/jackalope-doctrine-dbal/zipball/571f54f95f46bc8b0608d87886ba17906685edf1",
+                "reference": "571f54f95f46bc8b0608d87886ba17906685edf1",
                 "shasum": ""
             },
             "require": {
                 "doctrine/dbal": ">=2.2.0,<2.5",
-                "jackalope/jackalope": "~1.1.0",
+                "jackalope/jackalope": "~1.1.1",
                 "php": ">=5.3.3",
                 "phpcr/phpcr": "~2.1.0",
                 "phpcr/phpcr-utils": "~1.1.0"
@@ -1300,7 +1300,7 @@
                 "phpcr",
                 "transport implementation"
             ],
-            "time": "2014-04-03 12:44:49"
+            "time": "2014-04-04 12:08:19"
         },
         {
             "name": "jackalope/jackalope-jackrabbit",
@@ -2003,7 +2003,7 @@
         },
         {
             "name": "midgard/createphp",
-            "version": "dev-master",
+            "version": "1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/flack/createphp.git",
@@ -2122,12 +2122,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-collection.git",
-                "reference": "7e9d6fd65031a0258ec2a36e484a4f46a1f4b1ed"
+                "reference": "8ecd043d427706ead32abfc76ca672c8a4efad43"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/7e9d6fd65031a0258ec2a36e484a4f46a1f4b1ed",
-                "reference": "7e9d6fd65031a0258ec2a36e484a4f46a1f4b1ed",
+                "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/8ecd043d427706ead32abfc76ca672c8a4efad43",
+                "reference": "8ecd043d427706ead32abfc76ca672c8a4efad43",
                 "shasum": ""
             },
             "require": {
@@ -2164,7 +2164,7 @@
                 "sequence",
                 "set"
             ],
-            "time": "2014-03-18 16:15:04"
+            "time": "2014-04-04 12:06:15"
         },
         {
             "name": "phpcr/phpcr",
@@ -2412,9 +2412,7 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "The base bundle for the Symfony Distributions",
@@ -2864,16 +2862,16 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle.git",
-                "reference": "2340dc4a2e9c1d0771d7d5cf3c5b1ee7d389ac42"
+                "reference": "39a81d900aa15f6d29522166ec9b76f72bd81121"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataDoctrinePhpcrAdminBundle/zipball/2340dc4a2e9c1d0771d7d5cf3c5b1ee7d389ac42",
-                "reference": "2340dc4a2e9c1d0771d7d5cf3c5b1ee7d389ac42",
+                "url": "https://api.github.com/repos/sonata-project/SonataDoctrinePhpcrAdminBundle/zipball/39a81d900aa15f6d29522166ec9b76f72bd81121",
+                "reference": "39a81d900aa15f6d29522166ec9b76f72bd81121",
                 "shasum": ""
             },
             "require": {
-                "doctrine/phpcr-bundle": "~1.0",
+                "doctrine/phpcr-bundle": "~1.1",
                 "doctrine/phpcr-odm": "~1.1",
                 "php": ">=5.3.3",
                 "sonata-project/admin-bundle": ">=2.2.9,<2.2.11",
@@ -2917,7 +2915,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2014-03-24 10:04:30"
+            "time": "2014-04-03 13:22:09"
         },
         {
             "name": "sonata-project/exporter",
@@ -3276,18 +3274,18 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/CreateBundle.git",
-                "reference": "eed8e5ccb40a4c5c1c03358d835e8ad7409d3342"
+                "reference": "61ae0fbc573766f799229bc972e48a24ff769df9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/CreateBundle/zipball/eed8e5ccb40a4c5c1c03358d835e8ad7409d3342",
-                "reference": "eed8e5ccb40a4c5c1c03358d835e8ad7409d3342",
+                "url": "https://api.github.com/repos/symfony-cmf/CreateBundle/zipball/61ae0fbc573766f799229bc972e48a24ff769df9",
+                "reference": "61ae0fbc573766f799229bc972e48a24ff769df9",
                 "shasum": ""
             },
             "require": {
                 "friendsofsymfony/rest-bundle": "~1.0",
                 "jms/serializer-bundle": ">=0.12,<0.14",
-                "midgard/createphp": "0.9.*",
+                "midgard/createphp": "1.0.*",
                 "php": ">=5.3.3",
                 "symfony/assetic-bundle": "~2.1",
                 "symfony/framework-bundle": "~2.1"
@@ -3320,11 +3318,11 @@
                 },
                 {
                     "name": "Symfony CMF Community",
-                    "homepage": "https://github.com/symfony-cmf/SimpleCmsBundle/contributors"
+                    "homepage": "https://github.com/symfony-cmf/CreateBundle/contributors"
                 }
             ],
             "description": "Symfony Bundle for createphp and create.js. The easiest way to make any site editable and have semantic annotations with RDFa.",
-            "time": "2014-03-27 08:01:37"
+            "time": "2014-04-03 13:30:33"
         },
         {
             "name": "symfony-cmf/media-bundle",
@@ -3515,12 +3513,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/RoutingBundle.git",
-                "reference": "076eb53ea498d9c896202edaac46c3a84d196fbf"
+                "reference": "c85cad0ff1b9533c9fea07f1ff93d0eeffd76870"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/076eb53ea498d9c896202edaac46c3a84d196fbf",
-                "reference": "076eb53ea498d9c896202edaac46c3a84d196fbf",
+                "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/c85cad0ff1b9533c9fea07f1ff93d0eeffd76870",
+                "reference": "c85cad0ff1b9533c9fea07f1ff93d0eeffd76870",
                 "shasum": ""
             },
             "require": {
@@ -3572,7 +3570,7 @@
                 "database",
                 "routing"
             ],
-            "time": "2014-04-03 10:56:09"
+            "time": "2014-04-04 11:37:28"
         },
         {
             "name": "symfony-cmf/search-bundle",
diff --git a/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadRoutingData.php b/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadRoutingData.php
index de823a5a..d771ed45 100644
--- a/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadRoutingData.php
+++ b/src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadRoutingData.php
@@ -34,8 +34,7 @@ public function load(ObjectManager $dm)
     {
         $session = $dm->getPhpcrSession();
 
-        $basepath = $this->container->getParameter('cmf_routing.dynamic.persistence.phpcr.route_basepaths');
-        $basepath = reset($basepath);
+        $basepath = $this->container->getParameter('cmf_routing.dynamic.persistence.phpcr.admin_basepath');
         if ($session->itemExists($basepath)) {
             $session->removeItem($basepath);
         }

From bb366e1fff6af0e8a4a06027c2bbd0efbb231096 Mon Sep 17 00:00:00 2001
From: Lukas Kahwe Smith <smith@pooteeweet.org>
Date: Fri, 4 Apr 2014 15:24:04 +0200
Subject: [PATCH 09/10] updated dependencies

---
 app/config/config.yml |  6 ----
 composer.lock         | 74 +++++++++++++++++++++----------------------
 2 files changed, 37 insertions(+), 43 deletions(-)

diff --git a/app/config/config.yml b/app/config/config.yml
index 58fcbf33..07ab7d96 100644
--- 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:
diff --git a/composer.lock b/composer.lock
index 6ecab435..f4120b06 100644
--- a/composer.lock
+++ b/composer.lock
@@ -961,12 +961,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git",
-                "reference": "615efee62258ee92fc7c372a3565e694f92fbf99"
+                "reference": "890829effff016b53f392d45702107a09e71edcf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/615efee62258ee92fc7c372a3565e694f92fbf99",
-                "reference": "615efee62258ee92fc7c372a3565e694f92fbf99",
+                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/890829effff016b53f392d45702107a09e71edcf",
+                "reference": "890829effff016b53f392d45702107a09e71edcf",
                 "shasum": ""
             },
             "require": {
@@ -1030,7 +1030,7 @@
             "keywords": [
                 "rest"
             ],
-            "time": "2014-04-02 13:23:37"
+            "time": "2014-04-03 21:10:08"
         },
         {
             "name": "helios-ag/fm-elfinder-bundle",
@@ -1193,12 +1193,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/jackalope/jackalope.git",
-                "reference": "14a69f82e865e92c2cfaa2644c75a9aa04fc7ca1"
+                "reference": "1f936da47bd29deb8b0a1a21af46519485f99d37"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jackalope/jackalope/zipball/14a69f82e865e92c2cfaa2644c75a9aa04fc7ca1",
-                "reference": "14a69f82e865e92c2cfaa2644c75a9aa04fc7ca1",
+                "url": "https://api.github.com/repos/jackalope/jackalope/zipball/1f936da47bd29deb8b0a1a21af46519485f99d37",
+                "reference": "1f936da47bd29deb8b0a1a21af46519485f99d37",
                 "shasum": ""
             },
             "require": {
@@ -1238,7 +1238,7 @@
             "keywords": [
                 "phpcr"
             ],
-            "time": "2014-03-28 12:00:36"
+            "time": "2014-04-04 10:29:19"
         },
         {
             "name": "jackalope/jackalope-doctrine-dbal",
@@ -1246,17 +1246,17 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/jackalope/jackalope-doctrine-dbal.git",
-                "reference": "9fac0169f5fc0486f717e2051a4a61ded69d325e"
+                "reference": "571f54f95f46bc8b0608d87886ba17906685edf1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jackalope/jackalope-doctrine-dbal/zipball/9fac0169f5fc0486f717e2051a4a61ded69d325e",
-                "reference": "9fac0169f5fc0486f717e2051a4a61ded69d325e",
+                "url": "https://api.github.com/repos/jackalope/jackalope-doctrine-dbal/zipball/571f54f95f46bc8b0608d87886ba17906685edf1",
+                "reference": "571f54f95f46bc8b0608d87886ba17906685edf1",
                 "shasum": ""
             },
             "require": {
                 "doctrine/dbal": ">=2.2.0,<2.5",
-                "jackalope/jackalope": "~1.1.0",
+                "jackalope/jackalope": "~1.1.1",
                 "php": ">=5.3.3",
                 "phpcr/phpcr": "~2.1.0",
                 "phpcr/phpcr-utils": "~1.1.0"
@@ -1300,7 +1300,7 @@
                 "phpcr",
                 "transport implementation"
             ],
-            "time": "2014-04-03 12:44:49"
+            "time": "2014-04-04 12:08:19"
         },
         {
             "name": "jackalope/jackalope-jackrabbit",
@@ -2003,7 +2003,7 @@
         },
         {
             "name": "midgard/createphp",
-            "version": "dev-master",
+            "version": "1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/flack/createphp.git",
@@ -2122,12 +2122,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-collection.git",
-                "reference": "7e9d6fd65031a0258ec2a36e484a4f46a1f4b1ed"
+                "reference": "8ecd043d427706ead32abfc76ca672c8a4efad43"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/7e9d6fd65031a0258ec2a36e484a4f46a1f4b1ed",
-                "reference": "7e9d6fd65031a0258ec2a36e484a4f46a1f4b1ed",
+                "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/8ecd043d427706ead32abfc76ca672c8a4efad43",
+                "reference": "8ecd043d427706ead32abfc76ca672c8a4efad43",
                 "shasum": ""
             },
             "require": {
@@ -2164,7 +2164,7 @@
                 "sequence",
                 "set"
             ],
-            "time": "2014-03-18 16:15:04"
+            "time": "2014-04-04 12:06:15"
         },
         {
             "name": "phpcr/phpcr",
@@ -2864,16 +2864,16 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle.git",
-                "reference": "2340dc4a2e9c1d0771d7d5cf3c5b1ee7d389ac42"
+                "reference": "75af28aa2ec5ffbdf648b759cf2fb3fff24338a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataDoctrinePhpcrAdminBundle/zipball/2340dc4a2e9c1d0771d7d5cf3c5b1ee7d389ac42",
-                "reference": "2340dc4a2e9c1d0771d7d5cf3c5b1ee7d389ac42",
+                "url": "https://api.github.com/repos/sonata-project/SonataDoctrinePhpcrAdminBundle/zipball/75af28aa2ec5ffbdf648b759cf2fb3fff24338a9",
+                "reference": "75af28aa2ec5ffbdf648b759cf2fb3fff24338a9",
                 "shasum": ""
             },
             "require": {
-                "doctrine/phpcr-bundle": "~1.0",
+                "doctrine/phpcr-bundle": "~1.1",
                 "doctrine/phpcr-odm": "~1.1",
                 "php": ">=5.3.3",
                 "sonata-project/admin-bundle": ">=2.2.9,<2.2.11",
@@ -2917,7 +2917,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2014-03-24 10:04:30"
+            "time": "2014-04-04 12:35:06"
         },
         {
             "name": "sonata-project/exporter",
@@ -3276,18 +3276,18 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/CreateBundle.git",
-                "reference": "eed8e5ccb40a4c5c1c03358d835e8ad7409d3342"
+                "reference": "61ae0fbc573766f799229bc972e48a24ff769df9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/CreateBundle/zipball/eed8e5ccb40a4c5c1c03358d835e8ad7409d3342",
-                "reference": "eed8e5ccb40a4c5c1c03358d835e8ad7409d3342",
+                "url": "https://api.github.com/repos/symfony-cmf/CreateBundle/zipball/61ae0fbc573766f799229bc972e48a24ff769df9",
+                "reference": "61ae0fbc573766f799229bc972e48a24ff769df9",
                 "shasum": ""
             },
             "require": {
                 "friendsofsymfony/rest-bundle": "~1.0",
                 "jms/serializer-bundle": ">=0.12,<0.14",
-                "midgard/createphp": "0.9.*",
+                "midgard/createphp": "1.0.*",
                 "php": ">=5.3.3",
                 "symfony/assetic-bundle": "~2.1",
                 "symfony/framework-bundle": "~2.1"
@@ -3320,11 +3320,11 @@
                 },
                 {
                     "name": "Symfony CMF Community",
-                    "homepage": "https://github.com/symfony-cmf/SimpleCmsBundle/contributors"
+                    "homepage": "https://github.com/symfony-cmf/CreateBundle/contributors"
                 }
             ],
             "description": "Symfony Bundle for createphp and create.js. The easiest way to make any site editable and have semantic annotations with RDFa.",
-            "time": "2014-03-27 08:01:37"
+            "time": "2014-04-03 13:30:33"
         },
         {
             "name": "symfony-cmf/media-bundle",
@@ -3396,12 +3396,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/MenuBundle.git",
-                "reference": "0e74d9af4ec8eb0dd7a9d4feee02cf056e0566f3"
+                "reference": "dae5e530c066913b145f09e4255b2fd651488da6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/MenuBundle/zipball/0e74d9af4ec8eb0dd7a9d4feee02cf056e0566f3",
-                "reference": "0e74d9af4ec8eb0dd7a9d4feee02cf056e0566f3",
+                "url": "https://api.github.com/repos/symfony-cmf/MenuBundle/zipball/dae5e530c066913b145f09e4255b2fd651488da6",
+                "reference": "dae5e530c066913b145f09e4255b2fd651488da6",
                 "shasum": ""
             },
             "require": {
@@ -3448,7 +3448,7 @@
                 "Symfony CMF",
                 "menu"
             ],
-            "time": "2014-04-02 15:34:48"
+            "time": "2014-04-04 12:22:35"
         },
         {
             "name": "symfony-cmf/routing",
@@ -3515,12 +3515,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/RoutingBundle.git",
-                "reference": "076eb53ea498d9c896202edaac46c3a84d196fbf"
+                "reference": "c85cad0ff1b9533c9fea07f1ff93d0eeffd76870"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/076eb53ea498d9c896202edaac46c3a84d196fbf",
-                "reference": "076eb53ea498d9c896202edaac46c3a84d196fbf",
+                "url": "https://api.github.com/repos/symfony-cmf/RoutingBundle/zipball/c85cad0ff1b9533c9fea07f1ff93d0eeffd76870",
+                "reference": "c85cad0ff1b9533c9fea07f1ff93d0eeffd76870",
                 "shasum": ""
             },
             "require": {
@@ -3572,7 +3572,7 @@
                 "database",
                 "routing"
             ],
-            "time": "2014-04-03 10:56:09"
+            "time": "2014-04-04 11:37:28"
         },
         {
             "name": "symfony-cmf/search-bundle",

From fcbe120c937dc632668dc26e77ff28e44d9731ee Mon Sep 17 00:00:00 2001
From: Lukas Kahwe Smith <smith@pooteeweet.org>
Date: Fri, 4 Apr 2014 15:24:19 +0200
Subject: [PATCH 10/10] fix test failure caused by test setup issue

---
 app/tests/AdminTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/tests/AdminTest.php b/app/tests/AdminTest.php
index da68174a..b118890b 100644
--- 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 {