From 65ec2e2aa3224430232f0ebcded6c870cf7e0145 Mon Sep 17 00:00:00 2001
From: Javier Spagnoletti <phansys@gmail.com>
Date: Mon, 23 Nov 2020 19:56:26 -0300
Subject: [PATCH] 4.10.0

---
 CHANGELOG.md               | 13 +++++++++++++
 UPGRADE-4.x.md             |  3 +++
 src/Action/LoginAction.php |  2 +-
 src/Mailer/Mailer.php      |  4 ++--
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6d47a771..5116aca0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.10.0](https://github.com/sonata-project/SonataUserBundle/compare/4.9.0...4.10.0) - 2020-11-24
+### Added
+- [[#1263](https://github.com/sonata-project/SonataUserBundle/pull/1263)] Support for "symfony/mailer" in `Sonata\UserBundle\Mailer\Mailer` ([@phansys](https://github.com/phansys))
+
+### Changed
+- [[#1271](https://github.com/sonata-project/SonataUserBundle/pull/1271)] Updates dutch translations ([@zghosts](https://github.com/zghosts))
+
+### Deprecated
+- [[#1263](https://github.com/sonata-project/SonataUserBundle/pull/1263)] Support for "swiftmailer/swiftmailer" in `Sonata\UserBundle\Mailer\Mailer` ([@phansys](https://github.com/phansys))
+
+### Fixed
+- [[#1266](https://github.com/sonata-project/SonataUserBundle/pull/1266)] Fixed the problem of the message "sonata_user_already_authenticated" not being translated ([@BitScout](https://github.com/BitScout))
+
 ## [4.9.0](https://github.com/sonata-project/SonataUserBundle/compare/4.8.0...4.9.0) - 2020-10-26
 ### Added
 - [[#1225](https://github.com/sonata-project/SonataUserBundle/pull/1225)] Support for `nelmio/api-doc-bundle` >= 3.6 ([@wbloszyk](https://github.com/wbloszyk))
diff --git a/UPGRADE-4.x.md b/UPGRADE-4.x.md
index c9610b7d7..d6862d9e1 100644
--- a/UPGRADE-4.x.md
+++ b/UPGRADE-4.x.md
@@ -4,6 +4,9 @@ UPGRADE 4.x
 UPGRADE FROM 4.x to 4.x
 =======================
 
+UPGRADE FROM 4.9 to 4.10
+========================
+
 ### Sonata\UserBundle\Mailer\Mailer
 
 Passing an instance of `\Swift_Mailer` as argument 3  for `Sonata\UserBundle\Mailer\Mailer::__construct()`
diff --git a/src/Action/LoginAction.php b/src/Action/LoginAction.php
index b38b783b3..ba74bcbc7 100644
--- a/src/Action/LoginAction.php
+++ b/src/Action/LoginAction.php
@@ -99,7 +99,7 @@ public function __construct(
         if (null === $translator) {
             @trigger_error(sprintf(
                 'Not passing an instance of "%s" as argument 6 to "%s()" is deprecated since'
-                .' sonata-project/user-bundle 4.x and will be not possible in version 5.0.',
+                .' sonata-project/user-bundle 4.10 and will be not possible in version 5.0.',
                 TranslatorInterface::class,
                 __METHOD__
             ), E_USER_DEPRECATED);
diff --git a/src/Mailer/Mailer.php b/src/Mailer/Mailer.php
index d6e76a79a..a91472985 100644
--- a/src/Mailer/Mailer.php
+++ b/src/Mailer/Mailer.php
@@ -64,8 +64,8 @@ public function __construct(UrlGeneratorInterface $urlGenerator, Environment $tw
 
         if (!$mailer instanceof SymfonyMailerInterface) {
             @trigger_error(sprintf(
-                'Passing other type than "%s" as argument 3 for "%s()" is deprecated since sonata-project/user-bundle 4.x'
-                .' and will be not supported in version 5.x.',
+                'Passing other type than "%s" as argument 3 for "%s()" is deprecated since sonata-project/user-bundle 4.10'
+                .' and will be not supported in version 5.0.',
                 SymfonyMailerInterface::class,
                 __METHOD__
             ), E_USER_DEPRECATED);