Skip to content

Commit

Permalink
Remove deprecations
Browse files Browse the repository at this point in the history
  • Loading branch information
@core23
core23 committed Dec 14, 2021
1 parent 7acea63 commit 4410ffb
Show file tree
Hide file tree
Showing 9 changed files with 73 additions and 68 deletions.
72 changes: 36 additions & 36 deletions src/Resources/config/action.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,70 +25,70 @@
->set(RequestAction::class)
->public()
->args([
ref('twig'),
ref('router'),
ref('security.authorization_checker'),
ref('sonata.admin.pool'),
ref('sonata.admin.global_template_registry'),
ref('form.factory'),
service('twig'),
service('router'),
service('security.authorization_checker'),
service('sonata.admin.pool'),
service('sonata.admin.global_template_registry'),
service('form.factory'),
])

->set(SendEmailAction::class)
->public()
->args([
ref('router'),
ref('nucleos_user.user_manager'),
ref('nucleos_user.mailer'),
ref('nucleos_user.util.token_generator'),
service('router'),
service('nucleos_user.user_manager'),
service('nucleos_user.mailer'),
service('nucleos_user.util.token_generator'),
'%nucleos_user.resetting.retry_ttl%',
])

->set(CheckEmailAction::class)
->public()
->args([
ref('twig'),
ref('router'),
ref('sonata.admin.pool'),
ref('sonata.admin.global_template_registry'),
service('twig'),
service('router'),
service('sonata.admin.pool'),
service('sonata.admin.global_template_registry'),
'%nucleos_user.resetting.retry_ttl%',
])

->set(ResetAction::class)
->public()
->args([
ref('twig'),
ref('router'),
ref('security.authorization_checker'),
ref('sonata.admin.pool'),
ref('sonata.admin.global_template_registry'),
ref('form.factory'),
ref('nucleos_user.user_manager'),
ref('nucleos_user.security.login_manager'),
ref('translator'),
ref('session'),
service('twig'),
service('router'),
service('security.authorization_checker'),
service('sonata.admin.pool'),
service('sonata.admin.global_template_registry'),
service('form.factory'),
service('nucleos_user.user_manager'),
service('nucleos_user.security.login_manager'),
service('translator'),
service('session'),
'%nucleos_user.resetting.retry_ttl%',
'%nucleos_user.firewall_name%',
])
->call('setLogger', [
ref('logger')->ignoreOnInvalid(),
service('logger')->ignoreOnInvalid(),
])

->set(LoginAction::class)
->public()
->args([
ref('twig'),
ref('event_dispatcher'),
ref('router'),
ref('security.authorization_checker'),
ref('sonata.admin.pool'),
ref('sonata.admin.global_template_registry'),
ref('security.token_storage'),
ref('form.factory'),
ref('security.authentication_utils'),
ref('translator'),
service('twig'),
service('event_dispatcher'),
service('router'),
service('security.authorization_checker'),
service('sonata.admin.pool'),
service('sonata.admin.global_template_registry'),
service('security.token_storage'),
service('form.factory'),
service('security.authentication_utils'),
service('translator'),
])
->call('setCsrfTokenManager', [
ref('security.csrf.token_manager')->ignoreOnInvalid(),
service('security.csrf.token_manager')->ignoreOnInvalid(),
])

->set(CheckLoginAction::class)
Expand Down
38 changes: 19 additions & 19 deletions src/Resources/config/admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,50 +27,50 @@

->set('nucleos_user_admin.editable_role_builder', EditableRolesBuilder::class)
->args([
ref('security.token_storage'),
ref('security.authorization_checker'),
ref('sonata.admin.pool'),
ref('sonata.admin.configuration'),
service('security.token_storage'),
service('security.authorization_checker'),
service('sonata.admin.pool'),
service('sonata.admin.configuration'),
'%security.role_hierarchy.roles%',
])
->call('setTranslator', [
ref('translator'),
service('translator'),
])

->set('nucleos_user_admin.form.type.security_roles', SecurityRolesType::class)
->tag('form.type')
->args([
ref('nucleos_user_admin.editable_role_builder'),
service('nucleos_user_admin.editable_role_builder'),
])

->set('nucleos_user_admin.matrix_roles_builder', MatrixRolesBuilder::class)
->args([
ref('security.token_storage'),
ref('nucleos_user_admin.admin_roles_builder'),
ref('nucleos_user_admin.security_roles_builder'),
service('security.token_storage'),
service('nucleos_user_admin.admin_roles_builder'),
service('nucleos_user_admin.security_roles_builder'),
])

->set('nucleos_user_admin.admin_roles_builder', AdminRolesBuilder::class)
->args([
ref('security.authorization_checker'),
ref('sonata.admin.pool'),
ref('sonata.admin.configuration'),
ref('translator'),
service('security.authorization_checker'),
service('sonata.admin.pool'),
service('sonata.admin.configuration'),
service('translator'),
])

->set('nucleos_user_admin.security_roles_builder', SecurityRolesBuilder::class)
->args([
ref('security.authorization_checker'),
ref('sonata.admin.configuration'),
ref('translator'),
service('security.authorization_checker'),
service('sonata.admin.configuration'),
service('translator'),
'%security.role_hierarchy.roles%',
])

->set(RolesMatrixType::class)
->public()
->tag('form.type')
->args([
ref('nucleos_user_admin.matrix_roles_builder'),
service('nucleos_user_admin.matrix_roles_builder'),
])

->set(RolesMatrixExtension::class)
Expand All @@ -79,13 +79,13 @@
->set(RolesMatrixRuntime::class)
->tag('twig.runtime')
->args([
ref('nucleos_user_admin.matrix_roles_builder'),
service('nucleos_user_admin.matrix_roles_builder'),
])

->set('nucleos_user_admin.controller.user', UserCRUDController::class)
->public()
->args([
ref('event_dispatcher'),
service('event_dispatcher'),
])
->call('setContainer', [new ReferenceConfigurator(ContainerInterface::class)])

Expand Down
4 changes: 2 additions & 2 deletions src/Resources/config/admin_mongodb.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
null,
'%nucleos_user.model.user.class%',
'%nucleos_user_admin.admin.user.controller%',
ref('nucleos_user.user_manager'),
service('nucleos_user.user_manager'),
])
->call('setTranslationDomain', [
'%nucleos_user_admin.admin.group.translation_domain%',
Expand All @@ -56,7 +56,7 @@
null,
'%nucleos_user.model.group.class%',
'%nucleos_user_admin.admin.group.controller%',
ref('nucleos_user.group_manager'),
service('nucleos_user.group_manager'),
])
->call('setTranslationDomain', [
'%nucleos_user_admin.admin.group.translation_domain%',
Expand Down
4 changes: 2 additions & 2 deletions src/Resources/config/admin_orm.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
null,
'%nucleos_user.model.user.class%',
'%nucleos_user_admin.admin.user.controller%',
ref('nucleos_user.user_manager'),
service('nucleos_user.user_manager'),
])
->call('setTranslationDomain', [
'%nucleos_user_admin.admin.group.translation_domain%',
Expand All @@ -56,7 +56,7 @@
null,
'%nucleos_user.model.group.class%',
'%nucleos_user_admin.admin.group.controller%',
ref('nucleos_user.group_manager'),
service('nucleos_user.group_manager'),
])
->call('setTranslationDomain', [
'%nucleos_user_admin.admin.group.translation_domain%',
Expand Down
4 changes: 2 additions & 2 deletions src/Resources/config/avatar.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
->set(AvatarRuntime::class)
->tag('twig.runtime')
->args([
ref(AvatarResolver::class),
service(AvatarResolver::class),
null,
[],
])

->set(StaticAvatarResolver::class)
->args([
'%nucleos_user_admin.default_avatar%',
ref(Packages::class),
service(Packages::class),
])

->alias(AvatarResolver::class, StaticAvatarResolver::class)
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/config/impersonating.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
->set(ImpersonateRuntime::class)
->tag('twig.runtime')
->args([
ref('router'),
service('router'),
null,
[],
])
Expand Down
10 changes: 5 additions & 5 deletions src/Resources/config/security_acl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
'priority' => 255,
])
->args([
ref('security.acl.provider'),
ref('security.acl.object_identity_retrieval_strategy'),
ref('security.acl.security_identity_retrieval_strategy'),
ref('security.acl.permission.map'),
ref('logger')->nullOnInvalid(),
service('security.acl.provider'),
service('security.acl.object_identity_retrieval_strategy'),
service('security.acl.security_identity_retrieval_strategy'),
service('security.acl.permission.map'),
service('logger')->nullOnInvalid(),
])

;
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/config/twig.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

->set('nucleos_user_admin.twig.global', GlobalVariables::class)
->args([
ref('nucleos_user_admin.admin.user')->ignoreOnInvalid(),
service('nucleos_user_admin.admin.user')->ignoreOnInvalid(),
])

;
Expand Down
5 changes: 5 additions & 0 deletions tests/App/Entity/User.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ public function __unserialize($serialized): void
] = $data;
}

public function getUserIdentifier(): string
{
return $this->getUsername();
}

public function toString(): string
{
return $this->getUsername();
Expand Down

0 comments on commit 4410ffb

Please sign in to comment.