diff --git a/CHANGELOG.md b/CHANGELOG.md index 14fda8d86..1f1bc5915 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [4.14.0](https://github.com/sonata-project/SonataUserBundle/compare/4.13.0...4.14.0) - 2021-12-28 +### Deprecated +- [[#1446](https://github.com/sonata-project/SonataUserBundle/pull/1446)] Deprecated the integration with `sonata-project/GoogleAuthenticator` ([@jordisala1991](https://github.com/jordisala1991)) +- [[#1439](https://github.com/sonata-project/SonataUserBundle/pull/1439)] Deprecated ReST API with FOSRest, Nelmio Api Docs and JMS Serializer. ([@jordisala1991](https://github.com/jordisala1991)) + +### Fixed +- [[#1430](https://github.com/sonata-project/SonataUserBundle/pull/1430)] Taking into account sonata_admin.options.logo_content configuration value ([@AntoineRoue](https://github.com/AntoineRoue)) + ## [4.13.0](https://github.com/sonata-project/SonataUserBundle/compare/4.12.0...4.13.0) - 2021-11-04 ### Fixed - [[#1412](https://github.com/sonata-project/SonataUserBundle/pull/1412)] `en`, `lt`, and `ru` translation keys ([@ft-1408](https://github.com/ft-1408)) diff --git a/UPGRADE-4.x.md b/UPGRADE-4.x.md index ea2804e79..59ee24ed0 100644 --- a/UPGRADE-4.x.md +++ b/UPGRADE-4.x.md @@ -1,8 +1,8 @@ UPGRADE 4.x =========== -UPGRADE FROM 4.x to 4.x -======================= +UPGRADE FROM 4.13 to 4.14 +========================= ### Deprecate API diff --git a/src/Command/TwoStepVerificationCommand.php b/src/Command/TwoStepVerificationCommand.php index d3c7a2eea..e4d70f125 100644 --- a/src/Command/TwoStepVerificationCommand.php +++ b/src/Command/TwoStepVerificationCommand.php @@ -25,7 +25,7 @@ /** * NEXT_MAJOR: Remove this command. * - * @deprecated since sonata-project/user-bundle 4.x, it will be removed on 5.0. + * @deprecated since sonata-project/user-bundle 4.14, it will be removed on 5.0. */ class TwoStepVerificationCommand extends ContainerAwareCommand { diff --git a/src/Controller/Api/GroupController.php b/src/Controller/Api/GroupController.php index c94e96038..def6d26b3 100644 --- a/src/Controller/Api/GroupController.php +++ b/src/Controller/Api/GroupController.php @@ -35,7 +35,7 @@ * * @author Hugo Briand * - * @deprecated since sonata-project/user-bundle 4.x, to be removed in 5.0. + * @deprecated since sonata-project/user-bundle 4.14, to be removed in 5.0. */ class GroupController { diff --git a/src/Controller/Api/Legacy/GroupController.php b/src/Controller/Api/Legacy/GroupController.php index 2599c35da..532991dac 100644 --- a/src/Controller/Api/Legacy/GroupController.php +++ b/src/Controller/Api/Legacy/GroupController.php @@ -33,7 +33,7 @@ * * @author Hugo Briand * - * @deprecated since sonata-project/user-bundle 4.x, to be removed in 5.0. + * @deprecated since sonata-project/user-bundle 4.14, to be removed in 5.0. */ class GroupController { diff --git a/src/Controller/Api/Legacy/UserController.php b/src/Controller/Api/Legacy/UserController.php index e8dad41fc..7e48a791b 100644 --- a/src/Controller/Api/Legacy/UserController.php +++ b/src/Controller/Api/Legacy/UserController.php @@ -35,7 +35,7 @@ * * @author Hugo Briand * - * @deprecated since sonata-project/user-bundle 4.x, to be removed in 5.0. + * @deprecated since sonata-project/user-bundle 4.14, to be removed in 5.0. */ class UserController { diff --git a/src/Controller/Api/UserController.php b/src/Controller/Api/UserController.php index 66d2d952c..0f7a3fea9 100644 --- a/src/Controller/Api/UserController.php +++ b/src/Controller/Api/UserController.php @@ -37,7 +37,7 @@ * * @author Hugo Briand * - * @deprecated since sonata-project/user-bundle 4.x, to be removed in 5.0. + * @deprecated since sonata-project/user-bundle 4.14, to be removed in 5.0. */ class UserController { diff --git a/src/DependencyInjection/SonataUserExtension.php b/src/DependencyInjection/SonataUserExtension.php index b1ada4f56..91dd7a405 100644 --- a/src/DependencyInjection/SonataUserExtension.php +++ b/src/DependencyInjection/SonataUserExtension.php @@ -188,7 +188,7 @@ public function configureGoogleAuthenticator($config, ContainerBuilder $containe } @trigger_error( - 'The Google Authenticator integration is deprecated since sonata-project/user-bundle 4.x and will be removed in 5.0.', + 'The Google Authenticator integration is deprecated since sonata-project/user-bundle 4.14 and will be removed in 5.0.', \E_USER_DEPRECATED ); diff --git a/src/Document/GroupManager.php b/src/Document/GroupManager.php index aa45dc326..96e0590e1 100644 --- a/src/Document/GroupManager.php +++ b/src/Document/GroupManager.php @@ -30,7 +30,7 @@ public function findGroupsBy(?array $criteria = null, ?array $orderBy = null, $l /** * NEXT_MAJOR: remove this method. * - * @deprecated since sonata-project/user-bundle 4.x, to be removed in 5.0. + * @deprecated since sonata-project/user-bundle 4.14, to be removed in 5.0. */ public function getPager(array $criteria, int $page, int $limit = 10, array $sort = []): PagerInterface { diff --git a/src/Document/UserManager.php b/src/Document/UserManager.php index de9369f7e..4e359e046 100644 --- a/src/Document/UserManager.php +++ b/src/Document/UserManager.php @@ -30,7 +30,7 @@ public function findUsersBy(?array $criteria = null, ?array $orderBy = null, $li /** * NEXT_MAJOR: remove this method. * - * @deprecated since sonata-project/user-bundle 4.x, to be removed in 5.0. + * @deprecated since sonata-project/user-bundle 4.14, to be removed in 5.0. */ public function getPager(array $criteria, int $page, int $limit = 10, array $sort = []): PagerInterface { diff --git a/src/Entity/GroupManager.php b/src/Entity/GroupManager.php index b88cd396c..4ef9d662a 100644 --- a/src/Entity/GroupManager.php +++ b/src/Entity/GroupManager.php @@ -31,7 +31,7 @@ public function findGroupsBy(?array $criteria = null, ?array $orderBy = null, $l /** * NEXT_MAJOR: remove this method. * - * @deprecated since sonata-project/user-bundle 4.x, to be removed in 5.0. + * @deprecated since sonata-project/user-bundle 4.14, to be removed in 5.0. */ public function getPager(array $criteria, int $page, int $limit = 10, array $sort = []): PagerInterface { diff --git a/src/Entity/UserManager.php b/src/Entity/UserManager.php index e00e58781..727668dd4 100644 --- a/src/Entity/UserManager.php +++ b/src/Entity/UserManager.php @@ -86,7 +86,7 @@ public function getConnection() /** * NEXT_MAJOR: remove this method. * - * @deprecated since sonata-project/user-bundle 4.x, to be removed in 5.0. + * @deprecated since sonata-project/user-bundle 4.14, to be removed in 5.0. */ public function getPager(array $criteria, int $page, int $limit = 10, array $sort = []): PagerInterface { diff --git a/src/Form/Type/ApiGroupType.php b/src/Form/Type/ApiGroupType.php index 7f1dce14e..8906aa67a 100644 --- a/src/Form/Type/ApiGroupType.php +++ b/src/Form/Type/ApiGroupType.php @@ -18,7 +18,7 @@ /** * NEXT_MAJOR: remove this class. * - * @deprecated since sonata-project/user-bundle 4.x, to be removed in 5.0. + * @deprecated since sonata-project/user-bundle 4.14, to be removed in 5.0. */ class ApiGroupType extends BaseDoctrineORMSerializationType { diff --git a/src/Form/Type/ApiUserType.php b/src/Form/Type/ApiUserType.php index 3043b2035..3968309f3 100644 --- a/src/Form/Type/ApiUserType.php +++ b/src/Form/Type/ApiUserType.php @@ -18,7 +18,7 @@ /** * NEXT_MAJOR: remove this class. * - * @deprecated since sonata-project/user-bundle 4.x, to be removed in 5.0. + * @deprecated since sonata-project/user-bundle 4.14, to be removed in 5.0. */ class ApiUserType extends BaseDoctrineORMSerializationType { diff --git a/src/GoogleAuthenticator/Helper.php b/src/GoogleAuthenticator/Helper.php index 5f7a37c12..06ac0ddc4 100644 --- a/src/GoogleAuthenticator/Helper.php +++ b/src/GoogleAuthenticator/Helper.php @@ -22,7 +22,7 @@ /** * NEXT_MAJOR: Remove this class. * - * @deprecated since sonata-project/user-bundle 4.x, it will be removed on 5.0. + * @deprecated since sonata-project/user-bundle 4.14, it will be removed on 5.0. */ class Helper { diff --git a/src/GoogleAuthenticator/InteractiveLoginListener.php b/src/GoogleAuthenticator/InteractiveLoginListener.php index fdabab121..04169a5d7 100644 --- a/src/GoogleAuthenticator/InteractiveLoginListener.php +++ b/src/GoogleAuthenticator/InteractiveLoginListener.php @@ -20,7 +20,7 @@ /** * NEXT_MAJOR: Remove this class. * - * @deprecated since sonata-project/user-bundle 4.x, it will be removed on 5.0. + * @deprecated since sonata-project/user-bundle 4.14, it will be removed on 5.0. */ class InteractiveLoginListener { diff --git a/src/GoogleAuthenticator/RequestListener.php b/src/GoogleAuthenticator/RequestListener.php index b31a9445b..9b946cf36 100644 --- a/src/GoogleAuthenticator/RequestListener.php +++ b/src/GoogleAuthenticator/RequestListener.php @@ -24,7 +24,7 @@ /** * NEXT_MAJOR: Remove this class. * - * @deprecated since sonata-project/user-bundle 4.x, it will be removed on 5.0. + * @deprecated since sonata-project/user-bundle 4.14, it will be removed on 5.0. */ class RequestListener { diff --git a/src/Serializer/UserSerializerHandler.php b/src/Serializer/UserSerializerHandler.php index 28a911de7..2e38be91a 100644 --- a/src/Serializer/UserSerializerHandler.php +++ b/src/Serializer/UserSerializerHandler.php @@ -20,7 +20,7 @@ * * @author Sylvain Deloux * - * @deprecated since sonata-project/user-bundle 4.x, to be removed in 5.0. + * @deprecated since sonata-project/user-bundle 4.14, to be removed in 5.0. */ class UserSerializerHandler extends BaseSerializerHandler {