From 782cdcd7b9e73270784ff00e34df85fa18c463d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Mon, 27 Jul 2020 18:24:50 +0200
Subject: [PATCH] 4.7.0

---
 CHANGELOG.md                                  | 24 +++++++++++++++++++
 UPGRADE-4.x.md                                |  2 +-
 .../SonataUserExtension.php                   |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65a151ed4..5c2bc45b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,30 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.7.0](https://github.com/sonata-project/SonataUserBundle/compare/4.6.0...4.7.0) - 2020-07-30
+### Changed
+- [[#1183](https://github.com/sonata-project/SonataUserBundle/pull/1183)]
+  SonataEasyExtendsBundle is now optional, using SonataDoctrineBundle is
+preferred ([@jordisala1991](https://github.com/jordisala1991))
+
+### Deprecated
+- [[#1183](https://github.com/sonata-project/SonataUserBundle/pull/1183)] Using
+  SonataEasyExtendsBundle to add Doctrine mapping information
+([@jordisala1991](https://github.com/jordisala1991))
+
+### Fixed
+- [[#1202](https://github.com/sonata-project/SonataUserBundle/pull/1202)] Fixed
+  wrong placeholder delimiters at ReST API controller `UserController`.
+([@phansys](https://github.com/phansys))
+- [[#1195](https://github.com/sonata-project/SonataUserBundle/pull/1195)] Fixed
+  passing "format' parameter to API routes.
+([@phansys](https://github.com/phansys))
+- [[#1194](https://github.com/sonata-project/SonataUserBundle/pull/1194)] Fixed
+  API route names. ([@phansys](https://github.com/phansys))
+
+### Removed
+- [[#1192](https://github.com/sonata-project/SonataUserBundle/pull/1192)] Support for PHP < 7.2 ([@wbloszyk](https://github.com/wbloszyk))
+
 ## [4.6.0](https://github.com/sonata-project/SonataUserBundle/compare/4.5.3...4.6.0) - 2020-06-29
 ### Added
 - [[#1185](https://github.com/sonata-project/SonataUserBundle/pull/1185)] Added
diff --git a/UPGRADE-4.x.md b/UPGRADE-4.x.md
index d35d316ec..991c9d6fb 100644
--- a/UPGRADE-4.x.md
+++ b/UPGRADE-4.x.md
@@ -1,7 +1,7 @@
 UPGRADE 4.x
 ===========
 
-UPGRADE FROM 4.x to 4.x
+UPGRADE FROM 4.6 to 4.7
 ========================
 
 ### SonataEasyExtends is deprecated
diff --git a/src/DependencyInjection/SonataUserExtension.php b/src/DependencyInjection/SonataUserExtension.php
index b64f87e8d..7f682ecb6 100644
--- a/src/DependencyInjection/SonataUserExtension.php
+++ b/src/DependencyInjection/SonataUserExtension.php
@@ -234,7 +234,7 @@ public function configureController($config, ContainerBuilder $container): void
     public function registerDoctrineMapping(array $config): void
     {
         @trigger_error(
-            'Using this method is deprecated since sonata-project/user-bundle 4.x. You should instead register SonataDoctrineBundle and use `registerSonataDoctrineMapping()`',
+            'Using this method is deprecated since sonata-project/user-bundle 4.7. You should instead register SonataDoctrineBundle and use `registerSonataDoctrineMapping()`',
             E_USER_DEPRECATED
         );