Prepare 2.0.0-RC2

symfony-cmf · Feb 10, 2017 · 08a2163 · 08a2163
1 parent 23631d7
commit 08a2163
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Changelog
 =========
 
+2.0.0-RC2
+---------
+
  * **2017-02-06**: [BC BREAK] The `_template` request parameter will be renamed
    to the `template` attribute instead of the `contentTemplate` attribute. The
    old attribute will still be available for backwards compatibility.

diff --git a/UPGRADE-2.0.md b/UPGRADE-2.0.md
@@ -68,7 +68,8 @@
                            - cmf_sonata_admin_integration.routing.redirect_route_admin
    ```
 
- * The settings `admin_basepath` and `content_basepath` are only relevant for the admin and thus have been moved as well.
+ * The settings `admin_basepath` and `content_basepath` are only relevant for
+   the admin and thus have been moved as well.
 
    Before:
 

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     },
     "require-dev": {
         "symfony-cmf/testing": "^2.0",
-        "doctrine/phpcr-odm": "^1.4|^2.0",
+        "doctrine/phpcr-odm": "^1.4",
         "symfony/phpunit-bridge": "^3.2",
         "matthiasnoback/symfony-dependency-injection-test": "~0.6",
         "matthiasnoback/symfony-config-test": "^1.3.1",