From 48f4dd7072a578a940fee321e67239b970ea4bf3 Mon Sep 17 00:00:00 2001 From: Sullivan SENECHAL Date: Sun, 22 May 2016 00:17:58 +0200 Subject: [PATCH] egeloen/ckeditor-bundle ^4.0 --- CHANGELOG.md | 1 + UPGRADE-3.0.md | 4 ++-- composer.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43774a60..20a0cbea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,3 +5,4 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [3.0.0](https://github.com/sonata-project/SonataAdminBundle/compare/2.3.4...3.0.0) - 2016-05-21 ### Changed - Update [IvoryCKEditorBundle](https://github.com/egeloen/IvoryCKEditorBundle) to version 3.x. +- Bump `egeloen/ckeditor-bundle` required version to 4.0. diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md index 8576eefb..b20ca02b 100644 --- a/UPGRADE-3.0.md +++ b/UPGRADE-3.0.md @@ -3,9 +3,9 @@ UPGRADE FROM 2.3 to 3.0 ## IvoryCKEditorBundle upgrade -Update [IvoryCKEditorBundle](https://github.com/egeloen/IvoryCKEditorBundle) to version 3.x. +Update [IvoryCKEditorBundle](https://github.com/egeloen/IvoryCKEditorBundle) to version 4.x. -The old `{{ ckeditor_replace() }}` twig function has been replaced by `{{ckeditor_widget() }}`. +The old `{{ ckeditor_replace() }}` twig function has been replaced by `{{ ckeditor_widget() }}`. This introduce the new `inline` option of CKEditor plugin. diff --git a/composer.json b/composer.json index c2830b2b..3ace2ea1 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "symfony/property-access": "^2.3 || ^3.0", "twig/twig": "^1.12", "knplabs/knp-markdown-bundle": "^1.4", - "egeloen/ckeditor-bundle": "^2.5 || ^3.0 || ^4.0", + "egeloen/ckeditor-bundle": "^4.0", "sonata-project/block-bundle": "^3.0", "sonata-project/core-bundle": "^3.0" },