Merge 5.x into 6.x

src/Action/LoginAction.php

@@ -37,7 +37,7 @@ public function __construct(
         private TokenStorageInterface $tokenStorage,
         private TranslatorInterface $translator,
         private ?CsrfTokenManagerInterface $csrfTokenManager = null,
-        private bool $resetMail = true
+        private bool $resetMail = true,
     ) {
     }
 

src/Action/RequestAction.php

@@ -39,7 +39,7 @@ public function __construct(
         private UserManagerInterface $userManager,
         private MailerInterface $mailer,
         private TokenGeneratorInterface $tokenGenerator,
-        private int $retryTtl
+        private int $retryTtl,
     ) {
     }
 

src/Action/ResetAction.php

@@ -38,7 +38,7 @@ public function __construct(
         private FormFactoryInterface $formFactory,
         private UserManagerInterface $userManager,
         private TranslatorInterface $translator,
-        private int $tokenTtl
+        private int $tokenTtl,
     ) {
     }
 

src/DependencyInjection/SonataUserExtension.php

@@ -158,7 +158,7 @@ private function checkManagerTypeToModelTypesMapping(array $config): void
     private function prohibitModelTypeMapping(
         string $actualModelClass,
         string $prohibitedModelClass,
-        string $managerType
+        string $managerType,
     ): void {
         if (is_a($actualModelClass, $prohibitedModelClass, true)) {
             throw new \InvalidArgumentException(

src/Document/UserManager.php

@@ -34,7 +34,7 @@ public function __construct(
         string $class,
         ManagerRegistry $registry,
         private CanonicalFieldsUpdaterInterface $canonicalFieldsUpdater,
-        private UserPasswordHasherInterface $userPasswordHasher
+        private UserPasswordHasherInterface $userPasswordHasher,
     ) {
         parent::__construct($class, $registry);
     }

src/Entity/UserManager.php

@@ -34,7 +34,7 @@ public function __construct(
         string $class,
         ManagerRegistry $registry,
         private CanonicalFieldsUpdaterInterface $canonicalFieldsUpdater,
-        private UserPasswordHasherInterface $userPasswordHasher
+        private UserPasswordHasherInterface $userPasswordHasher,
     ) {
         parent::__construct($class, $registry);
     }

src/Listener/UserListener.php

@@ -34,7 +34,7 @@ final class UserListener implements EventSubscriber
 {
     public function __construct(
         private CanonicalFieldsUpdaterInterface $canonicalFieldsUpdater,
-        private UserManagerInterface $userManager
+        private UserManagerInterface $userManager,
     ) {
     }
 

src/Mailer/Mailer.php

@@ -29,7 +29,7 @@ public function __construct(
         private Environment $twig,
         private SymfonyMailerInterface $mailer,
         private array $fromEmail,
-        private string $emailTemplate
+        private string $emailTemplate,
     ) {
     }
 

src/Model/User.php

@@ -89,7 +89,7 @@ public function __unserialize(array $data): void
             $this->enabled,
             $this->id,
             $this->email,
-            $this->emailCanonical
+            $this->emailCanonical,
         ] = $data;
     }
 

src/Security/RolesBuilder/AdminRolesBuilder.php

@@ -35,7 +35,7 @@ public function __construct(
         private AuthorizationCheckerInterface $authorizationChecker,
         private Pool $pool,
         private SonataConfiguration $configuration,
-        private TranslatorInterface $translator
+        private TranslatorInterface $translator,
     ) {
     }
 

src/Security/RolesBuilder/MatrixRolesBuilder.php

@@ -23,7 +23,7 @@ final class MatrixRolesBuilder implements MatrixRolesBuilderInterface
     public function __construct(
         private TokenStorageInterface $tokenStorage,
         private AdminRolesBuilderInterface $adminRolesBuilder,
-        private ExpandableRolesBuilderInterface $securityRolesBuilder
+        private ExpandableRolesBuilderInterface $securityRolesBuilder,
     ) {
     }
 

src/Security/RolesBuilder/SecurityRolesBuilder.php

@@ -31,7 +31,7 @@ public function __construct(
         private AuthorizationCheckerInterface $authorizationChecker,
         private SonataConfiguration $configuration,
         private TranslatorInterface $translator,
-        private array $rolesHierarchy = []
+        private array $rolesHierarchy = [],
     ) {
     }
 

src/Twig/GlobalVariables.php

@@ -29,7 +29,7 @@ public function __construct(
         private string $defaultAvatar,
         private bool $impersonatingEnabled,
         private string $impersonatingRoute,
-        private array $impersonatingRouteParameters = []
+        private array $impersonatingRouteParameters = [],
     ) {
     }