From 4be14fefc7cabeba8ab0c6174a7dab851a080c70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iveta=20Hudcov=C3=A1?= Date: Thu, 20 Jan 2022 22:06:33 +0100 Subject: [PATCH 01/40] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index f782d41..0c1c68d 100644 --- a/composer.json +++ b/composer.json @@ -16,8 +16,8 @@ } ], "require": { - "php": ">=7.4", - "symfony/framework-bundle": "^4.4.16", + "php": "~8.0", + "symfony/framework-bundle": "^5.4", "doctrine/orm": "^2.7.4", "doctrine/doctrine-bundle": "^2.1.2", "symfony/swiftmailer-bundle": "^3.5.1", From a90233ceeafcff1eafcd663e687d78c0ef66a530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iveta=20Hudcov=C3=A1?= Date: Thu, 20 Jan 2022 22:07:47 +0100 Subject: [PATCH 02/40] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0c1c68d..2b58b71 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "symfony/swiftmailer-bundle": "^3.5.1", "imatic/view-bundle": "^5.0.4", "imatic/controller-bundle": "^5.0.0", - "sensio/framework-extra-bundle": "^5.6.1" + "sensio/framework-extra-bundle": "^6.2" }, "require-dev": { "imatic/testing": "^6.0.2", From 50e9177f6811c3ec6f3d4fbb0fe2b53d2b4eee91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iveta=20Hudcov=C3=A1?= Date: Sat, 22 Jan 2022 19:41:26 +0100 Subject: [PATCH 03/40] Update Mailer.php --- Mailer/Mailer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mailer/Mailer.php b/Mailer/Mailer.php index 68b6c97..8dd516f 100644 --- a/Mailer/Mailer.php +++ b/Mailer/Mailer.php @@ -7,14 +7,14 @@ class Mailer { - private \Swift_Mailer $mailer; + private \Symfony\Component\Mailer\MailerInterface $mailer; private UrlGeneratorInterface $router; private Environment $twig; private HtmlEmailBuilder $htmlEmailBuilder; private array $resettingFromEmail; public function __construct( - \Swift_Mailer $mailer, + \Symfony\Component\Mailer\MailerInterface $mailer, UrlGeneratorInterface $router, Environment $twig, HtmlEmailBuilder $htmlEmailBuilder, From 3efddc0503350377e5c96f0703ec261a28286676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iveta=20Hudcov=C3=A1?= Date: Sun, 23 Jan 2022 21:28:07 +0100 Subject: [PATCH 04/40] Update services.yml --- Resources/config/services.yml | 170 ++-------------------------------- 1 file changed, 7 insertions(+), 163 deletions(-) diff --git a/Resources/config/services.yml b/Resources/config/services.yml index 77010b3..b9d3c03 100755 --- a/Resources/config/services.yml +++ b/Resources/config/services.yml @@ -1,174 +1,18 @@ services: - # Form - imatic_user.form.type.profile: - class: Imatic\Bundle\UserBundle\Form\Type\User\ProfileType - arguments: - - '%imatic_user.entity.user.class%' - tags: - - {name: form.type } - - imatic_user.form.type.change_password: - class: Imatic\Bundle\UserBundle\Form\Type\User\ChangePasswordType - arguments: - - '%imatic_user.entity.user.class%' - tags: - - {name: form.type } - - imatic_user.form.type.user: - class: Imatic\Bundle\UserBundle\Form\Type\User\UserType - arguments: - - '%imatic_user.entity.user.class%' - tags: - - {name: form.type } - - Imatic\Bundle\UserBundle\Form\Type\User\ResettingFormType: - arguments: - - '%imatic_user.entity.user.class%' - tags: - - { name: form.type } - - # Command handler - imatic_user.data.handler.user_edit: - class: Imatic\Bundle\UserBundle\Data\Handler\User\UserEditHandler - arguments: - - '@Imatic\Bundle\UserBundle\Manager\UserManager' - tags: - - { name: imatic_data.handler } - - imatic_user.data.handler.user_create: - class: Imatic\Bundle\UserBundle\Data\Handler\User\UserCreateHandler - arguments: - - '@Imatic\Bundle\UserBundle\Manager\UserManager' - tags: - - { name: imatic_data.handler } - - imatic_user.data.handler.user_delete: - class: Imatic\Bundle\UserBundle\Data\Handler\User\UserDeleteHandler - arguments: - - '@Imatic\Bundle\UserBundle\Manager\UserManager' - tags: - - { name: imatic_data.handler } - - # Menu - imatic_user.menu.user_menu: - class: Imatic\Bundle\UserBundle\Menu\UserMenuBuilder - public: true - tags: - - {name: imatic_view.menu, alias: imatic.user} - - {name: imatic_view.menu, alias: imatic.user_anon, method: getMenuAnon} - - imatic_user.twig.extension.security: - class: Imatic\Bundle\UserBundle\Twig\Extension\SecurityExtension - arguments: - - '@imatic_user.security.role.provider.model_role_provider' - - '@imatic_user.security.role.translation.role_translator' - tags: - - {name: twig.extension} - - # Security - imatic_user.security.role.metadata_factory: - class: Doctrine\ORM\Mapping\ClassMetadataFactory - factory: ['@Doctrine\ORM\EntityManagerInterface', 'getMetadataFactory'] - - # Security role provider - imatic_user.security.role.provider.model_role_provider: - class: Imatic\Bundle\UserBundle\Security\Role\Provider\ModelRoleProvider - arguments: ['@imatic_user.security.role.metadata_factory'] - public: false - tags: - - {name: imatic_user.role_provider, alias: model} - - imatic_user.security.role.provider.hierarchy_role_provider: - class: Imatic\Bundle\UserBundle\Security\Role\Provider\HierarchyRoleProvider - arguments: ['%security.role_hierarchy.roles%'] - tags: - - {name: imatic_user.role_provider, alias: hierarchy} + _defaults: + autowire: true + autoconfigure: true - imatic_user.security.role.provider.chain_role_provider: - class: Imatic\Bundle\UserBundle\Security\Role\Provider\ChainRoleProvider - - imatic_user.role_provider: - alias: imatic_user.security.role.provider.chain_role_provider - - Imatic\Bundle\UserBundle\Security\Role\Provider\RoleProviderInterface: - alias: imatic_user.role_provider - - # Security role translation - imatic_user.security.role.translation.role_translator: - class: Imatic\Bundle\UserBundle\Security\Role\Translation\RoleTranslator - arguments: ['@translator'] - - imatic_user.security.role.translation.hierarchy_strategy: - class: Imatic\Bundle\UserBundle\Security\Role\Translation\HierarchyStrategy - arguments: ['@translator'] - tags: - - {name: imatic_user.role_translation_strategy} - - # User providers - imatic_user.user_provider.username: - class: Imatic\Bundle\UserBundle\Security\UserProvider - public: false - arguments: - - '@Imatic\Bundle\UserBundle\Manager\UserManager' + Imatic\Bundle\UserBundle\Security\Role\Provider\ChainRoleProvider: + Imatic\Bundle\UserBundle\Security\Role\Translation\RoleTranslator: imatic_user.user_provider.username_email: class: Imatic\Bundle\UserBundle\Security\EmailUserProvider - public: false - arguments: - - '@Imatic\Bundle\UserBundle\Manager\UserManager' - - imatic_user.user_filter: - class: Imatic\Bundle\UserBundle\Data\Filter\User\UserFilter - tags: - - { name: imatic_data.filter } - - imatic_user.monolog.logged_in_user_processor: - class: Imatic\Bundle\UserBundle\Monolog\LoggedInUserProcessor - arguments: - - '@security.token_storage' - tags: - - { name: 'monolog.processor', method: processRecord } Imatic\Bundle\UserBundle\Manager\UserManager: arguments: - - '@Doctrine\ORM\EntityManagerInterface' - - '@Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface' - - '%imatic_user.entity.user.class%' + $userClass: '%imatic_user.entity.user.class%' Imatic\Bundle\UserBundle\Manager\GroupManager: arguments: - - '@Doctrine\ORM\EntityManagerInterface' - - '%imatic_user.entity.group.class%' - - Imatic\Bundle\UserBundle\Mailer\HtmlEmailBuilder: - class: Imatic\Bundle\UserBundle\Mailer\NoopHtmlEmailBuilder - - Imatic\Bundle\UserBundle\Mailer\Mailer: - arguments: - - '@Swift_Mailer' - - '@Symfony\Component\Routing\Generator\UrlGeneratorInterface' - - '@Twig\Environment' - - '@Imatic\Bundle\UserBundle\Mailer\HtmlEmailBuilder' - - '%imatic.user.email.resseting_from%' - - Imatic\Bundle\UserBundle\Controller\ResettingController: - tags: - - { name: controller.service_arguments } - - Imatic\Bundle\UserBundle\Controller\ProfileController: - tags: - - { name: controller.service_arguments } - - Imatic\Bundle\UserBundle\Controller\ChangePasswordController: - tags: - - { name: controller.service_arguments } - - Imatic\Bundle\UserBundle\EventListener\LastLoginListener: - arguments: - - '@Imatic\Bundle\UserBundle\Manager\UserManager' - tags: - - { name: kernel.event_subscriber } - - Imatic\Bundle\UserBundle\Controller\RoleController: - tags: - - { name: controller.service_arguments } + $groupClass: '%imatic_user.entity.group.class%' From 352bc8bbc4e169ad9607a5f5068524cea59f7760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iveta=20Hudcov=C3=A1?= Date: Sun, 23 Jan 2022 21:29:43 +0100 Subject: [PATCH 05/40] Update SecurityPass.php --- DependencyInjection/Compiler/SecurityPass.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/DependencyInjection/Compiler/SecurityPass.php b/DependencyInjection/Compiler/SecurityPass.php index 1943d59..0def953 100644 --- a/DependencyInjection/Compiler/SecurityPass.php +++ b/DependencyInjection/Compiler/SecurityPass.php @@ -26,7 +26,7 @@ protected function processRoleProviders(ContainerBuilder $container): void $config = $container->getExtensionConfig('imatic_user'); $processor = new Processor(); $configuration = $processor->processConfiguration(new Configuration(), $config); - $definition = $container->getDefinition('imatic_user.security.role.provider.chain_role_provider'); + $definition = $container->getDefinition(\Imatic\Bundle\UserBundle\Security\Role\Provider\ChainRoleProvider::class); $roleProviders = $configuration['security']['role']; foreach ($container->findTaggedServiceIds('imatic_user.role_provider') as $id => $tagAttributes) { @@ -54,10 +54,11 @@ protected function processRoleProviders(ContainerBuilder $container): void */ protected function processTranslationStrategies(ContainerBuilder $container): void { - $definition = $container->getDefinition('imatic_user.security.role.translation.role_translator'); + $definition = $container->getDefinition(\Imatic\Bundle\UserBundle\Security\Role\Translation\RoleTranslator::class); foreach (\array_keys($container->findTaggedServiceIds('imatic_user.role_translation_strategy')) as $id) { $definition->addMethodCall('addStrategy', [new Reference($id)]); } } } + From dce18a5efd8f9c982ac0c09a5231adadd2af85fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iveta=20Hudcov=C3=A1?= Date: Fri, 4 Mar 2022 11:19:01 +0100 Subject: [PATCH 06/40] Update services.yml --- Resources/config/services.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/config/services.yml b/Resources/config/services.yml index b9d3c03..52222f6 100755 --- a/Resources/config/services.yml +++ b/Resources/config/services.yml @@ -2,6 +2,10 @@ services: _defaults: autowire: true autoconfigure: true + + Imatic\Bundle\UserBundle\Controller\: + resource: '../../Controller/' + tags: [ 'controller.service_arguments' ] Imatic\Bundle\UserBundle\Security\Role\Provider\ChainRoleProvider: Imatic\Bundle\UserBundle\Security\Role\Translation\RoleTranslator: From a29d33501043d7d3bfdae71d23a0fb76943f3957 Mon Sep 17 00:00:00 2001 From: Iveta Semecka Date: Thu, 17 Mar 2022 14:41:18 +0100 Subject: [PATCH 07/40] twig --- Resources/views/Resetting/request.html.twig | 10 +++++----- Resources/views/Security/base_login.html.twig | 10 +++++----- Resources/views/Security/login.html.twig | 2 +- Resources/views/layout.html.twig | 2 +- .../TestProject/Resources/views/base.html.twig | 2 +- composer.json | 1 + composer.lock | 2 +- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Resources/views/Resetting/request.html.twig b/Resources/views/Resetting/request.html.twig index 9fc26a1..90196c3 100644 --- a/Resources/views/Resetting/request.html.twig +++ b/Resources/views/Resetting/request.html.twig @@ -1,6 +1,6 @@ -{% import "ImaticViewBundle:Component:message.html.twig" as message %} -{% import "ImaticViewBundle:Component:panel.html.twig" as widget %} -{% extends "ImaticUserBundle::layout.html.twig" %} +{% import "@ImaticView/Component/message.html.twig" as message %} +{% import "@ImaticView/Component/panel.html.twig" as widget %} +{% extends "@ImaticUser/layout.html.twig" %} {% block headline %} {{ 'resetting.request.submit'|trans({}, 'ImaticUserBundle') }} @@ -9,10 +9,10 @@ {% block fos_user_content %}
- {% embed 'ImaticViewBundle:Layout:grid.html.twig' with {rows: [{ cols:{reseting: {size: 4, offset: 4} } }] } %} + {% embed '@ImaticView/Layout/grid.html.twig' with {rows: [{ cols:{reseting: {size: 4, offset: 4} } }] } %} {% block reseting %} - {% embed 'ImaticViewBundle:Component:panel.html.twig' %} + {% embed '@ImaticView/Component/panel.html.twig' %} {% set panel = {type: 'app'} %} {% block panel_header %}

{{ 'resetting.request.submit'|trans({}, 'ImaticUserBundle') }}

diff --git a/Resources/views/Security/base_login.html.twig b/Resources/views/Security/base_login.html.twig index 5e746eb..22d52c2 100755 --- a/Resources/views/Security/base_login.html.twig +++ b/Resources/views/Security/base_login.html.twig @@ -1,15 +1,15 @@ -{% extends "ImaticUserBundle::layout.html.twig" %} +{% extends "@ImaticUser/layout.html.twig" %} {% block headline 'layout.login'|trans({}, 'ImaticUserBundle') %} {% block action %} {% block fos_user_content %}