From 4410ffb11c746682fb849e95092ccbe22f82a25a Mon Sep 17 00:00:00 2001 From: core23 Date: Tue, 14 Dec 2021 19:12:38 +0100 Subject: [PATCH] Remove deprecations --- src/Resources/config/action.php | 72 +++++++++++++------------- src/Resources/config/admin.php | 38 +++++++------- src/Resources/config/admin_mongodb.php | 4 +- src/Resources/config/admin_orm.php | 4 +- src/Resources/config/avatar.php | 4 +- src/Resources/config/impersonating.php | 2 +- src/Resources/config/security_acl.php | 10 ++-- src/Resources/config/twig.php | 2 +- tests/App/Entity/User.php | 5 ++ 9 files changed, 73 insertions(+), 68 deletions(-) diff --git a/src/Resources/config/action.php b/src/Resources/config/action.php index e45e0e1a..ed722953 100644 --- a/src/Resources/config/action.php +++ b/src/Resources/config/action.php @@ -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) diff --git a/src/Resources/config/admin.php b/src/Resources/config/admin.php index 2c3c5000..ddaf30ca 100644 --- a/src/Resources/config/admin.php +++ b/src/Resources/config/admin.php @@ -27,42 +27,42 @@ ->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%', ]) @@ -70,7 +70,7 @@ ->public() ->tag('form.type') ->args([ - ref('nucleos_user_admin.matrix_roles_builder'), + service('nucleos_user_admin.matrix_roles_builder'), ]) ->set(RolesMatrixExtension::class) @@ -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)]) diff --git a/src/Resources/config/admin_mongodb.php b/src/Resources/config/admin_mongodb.php index 9984cea8..4b733110 100644 --- a/src/Resources/config/admin_mongodb.php +++ b/src/Resources/config/admin_mongodb.php @@ -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%', @@ -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%', diff --git a/src/Resources/config/admin_orm.php b/src/Resources/config/admin_orm.php index 33e75ec6..808f8961 100644 --- a/src/Resources/config/admin_orm.php +++ b/src/Resources/config/admin_orm.php @@ -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%', @@ -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%', diff --git a/src/Resources/config/avatar.php b/src/Resources/config/avatar.php index d693d054..dd1046cc 100644 --- a/src/Resources/config/avatar.php +++ b/src/Resources/config/avatar.php @@ -26,7 +26,7 @@ ->set(AvatarRuntime::class) ->tag('twig.runtime') ->args([ - ref(AvatarResolver::class), + service(AvatarResolver::class), null, [], ]) @@ -34,7 +34,7 @@ ->set(StaticAvatarResolver::class) ->args([ '%nucleos_user_admin.default_avatar%', - ref(Packages::class), + service(Packages::class), ]) ->alias(AvatarResolver::class, StaticAvatarResolver::class) diff --git a/src/Resources/config/impersonating.php b/src/Resources/config/impersonating.php index 2a502dd5..5449b3e6 100644 --- a/src/Resources/config/impersonating.php +++ b/src/Resources/config/impersonating.php @@ -23,7 +23,7 @@ ->set(ImpersonateRuntime::class) ->tag('twig.runtime') ->args([ - ref('router'), + service('router'), null, [], ]) diff --git a/src/Resources/config/security_acl.php b/src/Resources/config/security_acl.php index a9fa7ae9..60336a70 100644 --- a/src/Resources/config/security_acl.php +++ b/src/Resources/config/security_acl.php @@ -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(), ]) ; diff --git a/src/Resources/config/twig.php b/src/Resources/config/twig.php index 398d90bb..2dc3f98b 100644 --- a/src/Resources/config/twig.php +++ b/src/Resources/config/twig.php @@ -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(), ]) ; diff --git a/tests/App/Entity/User.php b/tests/App/Entity/User.php index 59c2d405..68ebfeb6 100644 --- a/tests/App/Entity/User.php +++ b/tests/App/Entity/User.php @@ -95,6 +95,11 @@ public function __unserialize($serialized): void ] = $data; } + public function getUserIdentifier(): string + { + return $this->getUsername(); + } + public function toString(): string { return $this->getUsername();