3.2.0

sonata-project · Mar 1, 2017 · 6abcbbe · 6abcbbe
1 parent ea0781e
commit 6abcbbe
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,20 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.2.0](https://github.com/sonata-project/SonataFormatterBundle/compare/3.1.0...3.2.0) - 2017-03-01
+### Added
+- Added the possibility to use `templates` defined in your `ivory_ckeditor.yml` in the `sonata_formatter_type` and `sonata_simple_formatter_type`
+- support for Twig 2.0
+
+### Deprecated
+- not specifying the `default_formatter` configuration node is deprecated
+- specifying a logger through the `SonataFormatterBundle\Formatter\Pool` constructor is deprecated in favor of specifying it through `setLogger` method
+- not specifying a default formatter to the `SonataFormatterBundle\Formatter\Pool` constructor
+
+### Fixed
+- Broken markitup header for rawhtml format in sonata_simple_formatter_type_widget
+- Remove wrong implements from `TextFormatterExtension`
+
 ## [3.1.0](https://github.com/sonata-project/SonataFormatterBundle/compare/3.0.1...3.1.0) - 2016-11-30
 ### Added
 - Added `SonataAdminBundle` to suggest

diff --git a/DependencyInjection/SonataFormatterExtension.php b/DependencyInjection/SonataFormatterExtension.php
@@ -59,7 +59,7 @@ public function load(array $configs, ContainerBuilder $container)
         // NEXT_MAJOR: remove this if block
         if (!isset($config['default_formatter'])) {
             @trigger_error(
-                'Not setting the default_formatter configuration node is deprecated since 3.x,'.
+                'Not setting the default_formatter configuration node is deprecated since 3.2,'.
                 ' and will no longer be supported in 4.0.',
                 E_USER_DEPRECATED
             );

diff --git a/Formatter/Pool.php b/Formatter/Pool.php
@@ -58,7 +58,7 @@ public function __construct($defaultFormatter = null)
         // NEXT_MAJOR: keep the else block only
         if ($this->logger) {
             @trigger_error(sprintf(
-                'Providing a logger to %s through the constructor is deprecated since 3.x'.
+                'Providing a logger to %s through the constructor is deprecated since 3.2'.
                 ' and will no longer be possible in 4.0'.
                 ' This argument should be provided through the setLogger() method.',
                 __CLASS__
@@ -70,7 +70,7 @@ public function __construct($defaultFormatter = null)
         // NEXT_MAJOR: make defaultFormatter required
         if (is_null($this->defaultFormatter)) {
             @trigger_error(sprintf(
-                'Not providing the defaultFormatter argument to %s is deprecated since 3.x.'.
+                'Not providing the defaultFormatter argument to %s is deprecated since 3.2.'.
                 ' This argument will become mandatory in 4.0.',
                 __METHOD__
             ), E_USER_DEPRECATED);

diff --git a/UPGRADE-3.x.md b/UPGRADE-3.x.md
@@ -1,6 +1,9 @@
 UPGRADE 3.x
 ===========
 
+UPGRADE FROM 3.1 to 3.2
+=======================
+
 ## Deprecated unspecified default_formatter configuration node
 
 The `default_formatter` configuration node will become required.