Skip to content

Commit

Permalink
Merge 5.x into 6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI authored Sep 6, 2024
2 parents 5ca071e + ecbcd89 commit 69cc334
Show file tree
Hide file tree
Showing 13 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/Action/LoginAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion src/Action/RequestAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function __construct(
private UserManagerInterface $userManager,
private MailerInterface $mailer,
private TokenGeneratorInterface $tokenGenerator,
private int $retryTtl
private int $retryTtl,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion src/Action/ResetAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function __construct(
private FormFactoryInterface $formFactory,
private UserManagerInterface $userManager,
private TranslatorInterface $translator,
private int $tokenTtl
private int $tokenTtl,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion src/DependencyInjection/SonataUserExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion src/Document/UserManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function __construct(
string $class,
ManagerRegistry $registry,
private CanonicalFieldsUpdaterInterface $canonicalFieldsUpdater,
private UserPasswordHasherInterface $userPasswordHasher
private UserPasswordHasherInterface $userPasswordHasher,
) {
parent::__construct($class, $registry);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Entity/UserManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function __construct(
string $class,
ManagerRegistry $registry,
private CanonicalFieldsUpdaterInterface $canonicalFieldsUpdater,
private UserPasswordHasherInterface $userPasswordHasher
private UserPasswordHasherInterface $userPasswordHasher,
) {
parent::__construct($class, $registry);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Listener/UserListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ final class UserListener implements EventSubscriber
{
public function __construct(
private CanonicalFieldsUpdaterInterface $canonicalFieldsUpdater,
private UserManagerInterface $userManager
private UserManagerInterface $userManager,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion src/Mailer/Mailer.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function __construct(
private Environment $twig,
private SymfonyMailerInterface $mailer,
private array $fromEmail,
private string $emailTemplate
private string $emailTemplate,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion src/Model/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function __unserialize(array $data): void
$this->enabled,
$this->id,
$this->email,
$this->emailCanonical
$this->emailCanonical,
] = $data;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Security/RolesBuilder/AdminRolesBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function __construct(
private AuthorizationCheckerInterface $authorizationChecker,
private Pool $pool,
private SonataConfiguration $configuration,
private TranslatorInterface $translator
private TranslatorInterface $translator,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion src/Security/RolesBuilder/MatrixRolesBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ final class MatrixRolesBuilder implements MatrixRolesBuilderInterface
public function __construct(
private TokenStorageInterface $tokenStorage,
private AdminRolesBuilderInterface $adminRolesBuilder,
private ExpandableRolesBuilderInterface $securityRolesBuilder
private ExpandableRolesBuilderInterface $securityRolesBuilder,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion src/Security/RolesBuilder/SecurityRolesBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function __construct(
private AuthorizationCheckerInterface $authorizationChecker,
private SonataConfiguration $configuration,
private TranslatorInterface $translator,
private array $rolesHierarchy = []
private array $rolesHierarchy = [],
) {
}

Expand Down
2 changes: 1 addition & 1 deletion src/Twig/GlobalVariables.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function __construct(
private string $defaultAvatar,
private bool $impersonatingEnabled,
private string $impersonatingRoute,
private array $impersonatingRouteParameters = []
private array $impersonatingRouteParameters = [],
) {
}

Expand Down

0 comments on commit 69cc334

Please sign in to comment.