From ef3f6d1529117f49766eeef49c6e837936030547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Tue, 8 May 2018 11:08:19 +0200
Subject: [PATCH] 4.2.0

---
 CHANGELOG.md                         | 12 ++++++++++++
 src/Form/Type/UserGenderListType.php |  4 ++--
 src/Resources/config/form.xml        |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f3326ed7..ff003b351 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.2.0](https://github.com/sonata-project/SonataUserBundle/compare/4.1.1...4.2.0) - 2018-05-08
+
+### Added
+- Role permissions can now be displayed in a matrix view using the `Sonata\UserBundle\Form\Type\RolesMatrixType`
+
+### Fixed
+- Missing french translations were added
+- Commands now work on Symfony 4
+
+### Removed
+- Removed compatibility with older versions of FOSRestBundle (<2.1)
+
 ## [4.1.1](https://github.com/sonata-project/SonataUserBundle/compare/4.1.0...4.1.1) - 2018-02-08
 ### Changed
 - Switch all templates references to Twig namespaced syntax
diff --git a/src/Form/Type/UserGenderListType.php b/src/Form/Type/UserGenderListType.php
index bd436275c..a570cc8bc 100644
--- a/src/Form/Type/UserGenderListType.php
+++ b/src/Form/Type/UserGenderListType.php
@@ -16,7 +16,7 @@
 use Sonata\CoreBundle\Form\Type\BaseStatusType;
 
 @trigger_error(
-    'The '.__NAMESPACE__.'\UserGenderListType class is deprecated since version 4.x and will be removed in 5.0.'
+    'The '.__NAMESPACE__.'\UserGenderListType class is deprecated since version 4.1 and will be removed in 5.0.'
     .' Use Symfony\Component\Form\Extension\Core\Type\ChoiceType instead.',
     E_USER_DEPRECATED
 );
@@ -24,7 +24,7 @@
 /**
  * NEXT_MAJOR: remove this class.
  *
- * @deprecated since version 4.x, to be removed in 5.0.
+ * @deprecated since version 4.1, to be removed in 5.0.
  * Use Symfony\Component\Form\Extension\Core\Type\ChoiceType instead
  */
 class UserGenderListType extends BaseStatusType
diff --git a/src/Resources/config/form.xml b/src/Resources/config/form.xml
index 2053f8fca..fec59949b 100644
--- a/src/Resources/config/form.xml
+++ b/src/Resources/config/form.xml
@@ -2,7 +2,7 @@
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
         <service id="sonata.user.form.gender_list" class="Sonata\UserBundle\Form\Type\UserGenderListType">
-            <deprecated>The "%service_id%" service is deprecated since 4.x and will be removed in 5.0.</deprecated>
+            <deprecated>The "%service_id%" service is deprecated since 4.1 and will be removed in 5.0.</deprecated>
             <argument>%fos_user.model.user.class%</argument>
             <argument>getGenderList</argument>
             <argument>Sonata\UserBundle\Form\Type\UserGenderListType</argument>