Merge pull request #3060 from stof/fix_more_deprecations

Fix more deprecations
FriendsOfSymfony · Jul 6, 2023 · de68488 · de68488
2 parents 627efd4 + c397959
commit de68488
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 13 deletions.
diff --git a/DependencyInjection/Compiler/CheckForSessionPass.php b/DependencyInjection/Compiler/CheckForSessionPass.php
@@ -26,7 +26,7 @@
  */
 class CheckForSessionPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if ($container->hasParameter('fos_user.session_needed') && !$container->has('session.storage.factory') && !$container->has('session')) {
             $message = 'FOSUserBundle requires the "session" to be available for the enabled features.';

diff --git a/DependencyInjection/Compiler/CheckForSwiftMailerPass.php b/DependencyInjection/Compiler/CheckForSwiftMailerPass.php
@@ -26,7 +26,7 @@
  */
 class CheckForSwiftMailerPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         // if the mailer isn't needed, then no error needed
         if (!$container->has('fos_user.mailer')) {

diff --git a/DependencyInjection/Compiler/ConfigurePasswordHasherPass.php b/DependencyInjection/Compiler/ConfigurePasswordHasherPass.php
@@ -21,7 +21,7 @@
  */
 final class ConfigurePasswordHasherPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if ($container->has('security.password_hasher_factory')) {
             return;

diff --git a/DependencyInjection/Compiler/InjectRememberMeServicesPass.php b/DependencyInjection/Compiler/InjectRememberMeServicesPass.php
@@ -26,7 +26,7 @@
  */
 class InjectRememberMeServicesPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $firewallName = $container->getParameter('fos_user.firewall_name');
         $loginManager = $container->getDefinition('fos_user.security.login_manager');

diff --git a/DependencyInjection/Compiler/InjectUserCheckerPass.php b/DependencyInjection/Compiler/InjectUserCheckerPass.php
@@ -26,7 +26,7 @@
  */
 class InjectUserCheckerPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $firewallName = $container->getParameter('fos_user.firewall_name');
         $loginManager = $container->findDefinition('fos_user.security.login_manager');

diff --git a/DependencyInjection/Compiler/ValidationPass.php b/DependencyInjection/Compiler/ValidationPass.php
@@ -25,7 +25,7 @@
  */
 class ValidationPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasParameter('fos_user.storage')) {
             return;

diff --git a/DependencyInjection/FOSUserExtension.php b/DependencyInjection/FOSUserExtension.php
@@ -33,15 +33,15 @@ class FOSUserExtension extends Extension
     private static $doctrineDrivers = [
         'orm' => [
             'registry' => 'doctrine',
-            'tag' => 'doctrine.event_subscriber',
+            'tag' => 'doctrine.event_listener',
         ],
         'mongodb' => [
             'registry' => 'doctrine_mongodb',
-            'tag' => 'doctrine_mongodb.odm.event_subscriber',
+            'tag' => 'doctrine_mongodb.odm.event_listener',
         ],
         'couchdb' => [
             'registry' => 'doctrine_couchdb',
-            'tag' => 'doctrine_couchdb.event_subscriber',
+            'tag' => 'doctrine_couchdb.event_listener',
             'listener_class' => 'FOS\UserBundle\Doctrine\CouchDB\UserListener',
         ],
     ];
@@ -97,7 +97,8 @@ public function load(array $configs, ContainerBuilder $container): void
 
         if ($config['use_listener'] && isset(self::$doctrineDrivers[$config['db_driver']])) {
             $listenerDefinition = $container->getDefinition('fos_user.user_listener');
-            $listenerDefinition->addTag(self::$doctrineDrivers[$config['db_driver']]['tag']);
+            $listenerDefinition->addTag(self::$doctrineDrivers[$config['db_driver']]['tag'], ['event' => 'prePersist']);
+            $listenerDefinition->addTag(self::$doctrineDrivers[$config['db_driver']]['tag'], ['event' => 'preUpdate']);
             if (isset(self::$doctrineDrivers[$config['db_driver']]['listener_class'])) {
                 $listenerDefinition->setClass(self::$doctrineDrivers[$config['db_driver']]['listener_class']);
             }

diff --git a/FOSUserBundle.php b/FOSUserBundle.php
@@ -31,7 +31,7 @@
  */
 class FOSUserBundle extends Bundle
 {
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
         $container->addCompilerPass(new ConfigurePasswordHasherPass());
@@ -44,7 +44,7 @@ public function build(ContainerBuilder $container)
         $this->addRegisterMappingsPass($container);
     }
 
-    private function addRegisterMappingsPass(ContainerBuilder $container)
+    private function addRegisterMappingsPass(ContainerBuilder $container): void
     {
         $mappings = [
             realpath(__DIR__.'/Resources/config/doctrine-mapping') => 'FOS\UserBundle\Model',

diff --git a/Validator/Initializer.php b/Validator/Initializer.php
@@ -36,7 +36,7 @@ public function __construct(CanonicalFieldsUpdater $canonicalFieldsUpdater)
     /**
      * @param object $object
      */
-    public function initialize($object)
+    public function initialize($object): void
     {
         if ($object instanceof UserInterface) {
             $this->canonicalFieldsUpdater->updateCanonicalFields($object);