From 592f82c732466fb784d502e1b0fceeffd168b67f Mon Sep 17 00:00:00 2001
From: Sullivan SENECHAL <soullivaneuh@gmail.com>
Date: Tue, 19 Sep 2017 17:29:38 +0200
Subject: [PATCH] 3.5.0

---
 CHANGELOG.md                    | 17 +++++++++++++++++
 Form/Type/ColorSelectorType.php |  4 ++--
 UPGRADE-3.x.md                  |  5 +++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 827a3054..c59f7e36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,23 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.5.0](https://github.com/sonata-project/SonataCoreBundle/compare/3.4.0...3.5.0) - 2017-09-19
+### Added
+- New ColorType form type that should give us easier color picking functioanlity instead of choice field with color names
+
+### Changed
+- Removed add of `FormFactoryCompilerPass` when the option `form.mapping.enabled` is `false`
+
+### Deprecated
+- Class `ColorSelectorType` is deprecated and replaced by `ColorType`
+
+### Fixed
+- fixed Twig errors when using `sonata_template_box` without a translation domain
+- deprecation notices related to `addClassesToCompile`
+- Fixed deprecation notice in `ColorSelectorType` for Sf 3. support
+- Missing brazilian translations for color names and date_range messages.
+- Fixed passing empty translation domain to `sonata_template_box`
+
 ## [3.4.0](https://github.com/sonata-project/SonataCoreBundle/compare/3.3.0...3.4.0) - 2017-05-09
 ### Added
 - Options for `ImmutableArrayType` are now validated, which should yield better results.
diff --git a/Form/Type/ColorSelectorType.php b/Form/Type/ColorSelectorType.php
index 59cc6a74..186a8d34 100644
--- a/Form/Type/ColorSelectorType.php
+++ b/Form/Type/ColorSelectorType.php
@@ -17,7 +17,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 @trigger_error(
-    'The '.__NAMESPACE__.'\ColorSelectorType class is deprecated since version 3.4 and will be removed in 4.0.'
+    'The '.__NAMESPACE__.'\ColorSelectorType class is deprecated since version 3.5 and will be removed in 4.0.'
     .' Use '.__NAMESPACE__.'\ColorType instead.',
     E_USER_DEPRECATED
 );
@@ -25,7 +25,7 @@
 /**
  * NEXT_MAJOR: remove this class.
  *
- * @deprecated since version 3.4, to be removed in 4.0. Use ColorType instead
+ * @deprecated since version 3.5, to be removed in 4.0. Use ColorType instead
  */
 class ColorSelectorType extends AbstractType
 {
diff --git a/UPGRADE-3.x.md b/UPGRADE-3.x.md
index a7fd9a89..21ef6656 100644
--- a/UPGRADE-3.x.md
+++ b/UPGRADE-3.x.md
@@ -1,6 +1,11 @@
 UPGRADE 3.x
 ===========
 
+UPGRADE FROM 3.4 to 3.5
+=======================
+
+The `ColorSelectorType` class is deprecated. Use `ColorType` instead.
+
 UPGRADE FROM 3.2 to 3.3
 =======================