Merge 5.x into 6.x

sonata-project · Jul 23, 2023 · 66ef703 · 66ef703
2 parents 089eff8 + f680a6b
commit 66ef703
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -2,4 +2,4 @@
 #
 # It's auto-generated by sonata-project/dev-kit package.
 
-github: [jordisala1991, OskarStark, core23, greg0ire]
+github: [jordisala1991, OskarStark, core23, VincentLanglet]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [5.10.0](https://github.com/sonata-project/SonataUserBundle/compare/5.9.0...5.10.0) - 2023-07-22
+### Changed
+- [[#1653](https://github.com/sonata-project/SonataUserBundle/pull/1653)] User implements LegacyPasswordAuthenticatedUserInterface ([@Hanmac](https://github.com/Hanmac))
+
+### Fixed
+- [[#1651](https://github.com/sonata-project/SonataUserBundle/pull/1651)] Deprecation of Event Subscribers on Symfony 6.3. The UserListener now uses Event Listeners ([@Hanmac](https://github.com/Hanmac))
+
 ## [5.9.0](https://github.com/sonata-project/SonataUserBundle/compare/5.8.0...5.9.0) - 2023-06-03
 ### Added
 - [[#1646](https://github.com/sonata-project/SonataUserBundle/pull/1646)] Support for SonataBlockBundle 5.0 ([@jordisala1991](https://github.com/jordisala1991))

diff --git a/tests/App/AppKernel.php b/tests/App/AppKernel.php
@@ -80,9 +80,6 @@ protected function configureRoutes(RoutingConfigurator $routes): void
         $routes->import(__DIR__.'/config/routes.yaml');
     }
 
-    /**
-     * @psalm-suppress DeprecatedClass
-     */
     protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
     {
         $loader->load(__DIR__.'/config/config.yaml');
@@ -91,6 +88,9 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
             $loader->load(__DIR__.'/config/config_sf5.yaml');
         }
 
+        /*
+         * TODO: Remove when dropping support for sonatablock 4
+         */
         if (class_exists(HttpCacheHandler::class)) {
             $loader->load(__DIR__.'/config/config_sonata_block_v4.yaml');
         }