From 08a216385ed1e7c4407c3c544826c2d1f10a4822 Mon Sep 17 00:00:00 2001 From: WouterJ Date: Fri, 10 Feb 2017 15:43:26 +0100 Subject: [PATCH] Prepare 2.0.0-RC2 --- CHANGELOG.md | 3 +++ UPGRADE-2.0.md | 3 ++- composer.json | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index be2b018c..cdb20852 100644 --- 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 index 7626597b..1fb01e0c 100644 --- 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 index 096a440c..7dc4c88b 100644 --- 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",