From f707d0c25455c3d5316d15b80bc068bc7944a5af Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Sun, 7 Apr 2024 23:51:53 -0500 Subject: [PATCH] Fixing deprecations --- .../Controller/AccountController.php | 4 +- .../Controller/Admin/AdminController.php | 4 +- .../Admin/IndexBlocksController.php | 238 +++++++++--------- .../Controller/Admin/PluginsController.php | 4 +- .../Controller/Admin/SettingsController.php | 8 +- .../AbstractFeedbackSocialPostController.php | 2 +- .../Controller/Api/CreateCLinkAction.php | 2 +- .../Api/CreateSocialPostAttachmentAction.php | 2 +- .../Api/DislikeSocialPostController.php | 2 +- .../Api/SocialPostAttachmentsController.php | 2 +- .../Controller/Api/UpdateCLinkAction.php | 2 +- .../Api/UpdateCLinkCategoryAction.php | 2 +- src/CoreBundle/Controller/AssetController.php | 2 +- src/CoreBundle/Controller/BadgeController.php | 2 +- src/CoreBundle/Controller/ChatController.php | 2 +- .../Controller/ContactCategoryController.php | 6 +- .../Controller/ContactController.php | 4 +- .../Controller/CourseController.php | 9 +- .../Controller/CoursesController.php | 2 +- .../Controller/EditorController.php | 2 +- .../Controller/ExceptionController.php | 2 +- .../Controller/FileManagerController.php | 2 +- .../Controller/GradebookController.php | 2 +- src/CoreBundle/Controller/IndexController.php | 2 +- src/CoreBundle/Controller/LegalController.php | 2 +- src/CoreBundle/Controller/NewsController.php | 2 +- .../Controller/OnlineController.php | 2 +- .../Controller/PermissionsController.php | 2 +- .../PlatformConfigurationController.php | 2 +- .../Controller/ResetPasswordController.php | 6 +- .../Controller/ResourceController.php | 4 +- .../Controller/SecurityController.php | 2 +- .../Controller/SessionController.php | 2 +- .../Controller/SocialController.php | 2 +- .../Controller/TemplateController.php | 2 +- src/CoreBundle/Controller/ThemeController.php | 2 +- src/CoreBundle/Controller/ToolController.php | 2 +- src/CoreBundle/Controller/UserController.php | 2 +- .../Extension/CCalendarEventExtension.php | 2 +- .../Extension/CDocumentExtension.php | 2 +- .../CStudentPublicationExtension.php | 2 +- .../Extension/CToolIntroExtension.php | 2 +- .../Extension/CourseExtension.php | 2 +- .../Extension/CourseLinkExtensionTrait.php | 2 +- .../Extension/CourseRelUserExtension.php | 2 +- .../Extension/MessageExtension.php | 2 +- .../Extension/MessageRelUserExtension.php | 2 +- .../Extension/MessageTagExtension.php | 2 +- .../DataProvider/Extension/PageExtension.php | 2 +- .../Extension/PersonalFileExtension.php | 2 +- .../Extension/SessionRelUserExtension.php | 2 +- .../Extension/TrackEExerciseExtension.php | 2 +- .../DataProvider/UsergroupDataProvider.php | 2 +- .../Entity/Listener/ResourceListener.php | 2 +- .../Entity/Listener/ResourceNodeListener.php | 2 +- .../Entity/Listener/SessionListener.php | 2 +- .../Entity/Listener/SkillRelUserListener.php | 2 +- .../Entity/Listener/UserListener.php | 2 +- .../AnonymousUserSubscriber.php | 2 +- src/CoreBundle/Form/ExtraFieldType.php | 2 +- .../MessageHandler/MessageHandler.php | 6 +- .../Repository/SysAnnouncementRepository.php | 2 +- .../Voter/CCalendarEventVoter.php | 2 +- .../Authorization/Voter/CourseVoter.php | 2 +- .../Authorization/Voter/GroupVoter.php | 2 +- .../Authorization/Voter/MessageTagVoter.php | 2 +- .../Authorization/Voter/MessageVoter.php | 2 +- .../Authorization/Voter/ResourceNodeVoter.php | 2 +- .../Authorization/Voter/SessionVoter.php | 2 +- .../Voter/TrackEExerciseVoter.php | 2 +- .../Authorization/Voter/UserRelUserVoter.php | 2 +- .../Authorization/Voter/UserVoter.php | 2 +- .../Authorization/Voter/UsergroupVoter.php | 2 +- src/CoreBundle/Service/CourseService.php | 2 +- src/CoreBundle/Service/EventLoggerService.php | 2 +- .../ServiceHelper/TicketProjectHelper.php | 2 +- .../State/CCalendarEventProcessor.php | 2 +- .../CStudentPublicationPostProcessor.php | 2 +- src/CoreBundle/State/CToolProvider.php | 2 +- .../State/CalendarEventProvider.php | 2 +- .../State/UsergroupPostProcessor.php | 2 +- src/CoreBundle/Tool/ToolChain.php | 2 +- src/LtiBundle/Controller/AdminController.php | 6 +- src/LtiBundle/Controller/CourseController.php | 6 +- .../Controller/ServiceController.php | 2 +- 85 files changed, 226 insertions(+), 223 deletions(-) diff --git a/src/CoreBundle/Controller/AccountController.php b/src/CoreBundle/Controller/AccountController.php index ddb27cea7d..32a66d5f49 100644 --- a/src/CoreBundle/Controller/AccountController.php +++ b/src/CoreBundle/Controller/AccountController.php @@ -16,7 +16,7 @@ use Chamilo\CoreBundle\Traits\ControllerTrait; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Security\Core\User\UserInterface; /** @@ -64,7 +64,7 @@ class AccountController extends BaseController } return $this->render('@ChamiloCore/Account/edit.html.twig', [ - 'form' => $form->createView(), + 'form' => $form, 'user' => $user, ]); } diff --git a/src/CoreBundle/Controller/Admin/AdminController.php b/src/CoreBundle/Controller/Admin/AdminController.php index 224320dd03..af73560622 100644 --- a/src/CoreBundle/Controller/Admin/AdminController.php +++ b/src/CoreBundle/Controller/Admin/AdminController.php @@ -9,10 +9,10 @@ namespace Chamilo\CoreBundle\Controller\Admin; use Chamilo\CoreBundle\Controller\BaseController; use Chamilo\CoreBundle\ServiceHelper\AccessUrlHelper; use Chamilo\CoreBundle\Settings\SettingsManager; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; +use Symfony\Component\Security\Http\Attribute\IsGranted; #[Route('/admin')] class AdminController extends BaseController diff --git a/src/CoreBundle/Controller/Admin/IndexBlocksController.php b/src/CoreBundle/Controller/Admin/IndexBlocksController.php index 9905aff59a..db1158fa46 100644 --- a/src/CoreBundle/Controller/Admin/IndexBlocksController.php +++ b/src/CoreBundle/Controller/Admin/IndexBlocksController.php @@ -14,7 +14,7 @@ use Chamilo\CoreBundle\Repository\PageRepository; use Chamilo\CoreBundle\Settings\SettingsManager; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Component\HttpFoundation\JsonResponse; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Serializer\SerializerInterface; use Symfony\Contracts\Translation\TranslatorInterface; @@ -128,32 +128,6 @@ class IndexBlocksController extends BaseController return $this->json($json); } - private function getExtraContent(string $title): ?array - { - /** @var Page|null $page */ - $page = $this->pageRepository->findOneBy(['title' => $title]); - - $pageJsonld = $this->serializer->serialize($page, 'jsonld', ['groups' => ['adminblock:read']]); - $pageArray = json_decode($pageJsonld, true); - - if ($page) { - return $pageArray; - } - - /** @var PageCategory $category */ - $category = $this->pageCategoryRepository->findOneBy(['title' => $title]); - $categoryJsonld = $this->serializer->serialize($category, 'jsonld', ['groups' => ['page:read']]); - $categoryArray = json_decode($categoryJsonld, true); - - if (empty($categoryArray)) { - return []; - } - - return [ - 'category' => $categoryArray['@id'], - ]; - } - private function getItemsUsers(): array { $items = []; @@ -266,6 +240,32 @@ class IndexBlocksController extends BaseController return array_values($items); } + private function getExtraContent(string $title): ?array + { + /** @var Page|null $page */ + $page = $this->pageRepository->findOneBy(['title' => $title]); + + $pageJsonld = $this->serializer->serialize($page, 'jsonld', ['groups' => ['adminblock:read']]); + $pageArray = json_decode($pageJsonld, true); + + if ($page) { + return $pageArray; + } + + /** @var PageCategory $category */ + $category = $this->pageCategoryRepository->findOneBy(['title' => $title]); + $categoryJsonld = $this->serializer->serialize($category, 'jsonld', ['groups' => ['page:read']]); + $categoryArray = json_decode($categoryJsonld, true); + + if (empty($categoryArray)) { + return []; + } + + return [ + 'category' => $categoryArray['@id'], + ]; + } + private function getItemsCourses(): array { $items = []; @@ -512,96 +512,6 @@ class IndexBlocksController extends BaseController return $items; } - private function getItemsSessions(): array - { - $items = []; - $items[] = [ - 'class' => 'item-session-list', - 'url' => $this->generateUrl('legacy_main', ['name' => 'session/session_list.php']), - 'label' => $this->translator->trans('Training sessions list'), - ]; - $items[] = [ - 'class' => 'item-session-add', - 'url' => $this->generateUrl('legacy_main', ['name' => 'session/session_add.php']), - 'label' => $this->translator->trans('Add a training session'), - ]; - $items[] = [ - 'class' => 'item-session-category', - 'url' => $this->generateUrl('legacy_main', ['name' => 'session/session_category_list.php']), - 'label' => $this->translator->trans('Sessions categories list'), - ]; - $items[] = [ - 'class' => 'item-session-import', - 'url' => $this->generateUrl('legacy_main', ['name' => 'session/session_import.php']), - 'label' => $this->translator->trans('Import sessions list'), - ]; - $items[] = [ - 'class' => 'item-session-import-hr', - 'url' => $this->generateUrl('legacy_main', ['name' => 'session/session_import_drh.php']), - 'label' => $this->translator->trans('Import list of HR directors into sessions'), - ]; - if (\count($this->extAuthSource['ldap']) > 0) { - $items[] = [ - 'class' => 'item-session-subscription-ldap-import', - 'url' => $this->generateUrl('legacy_main', ['name' => 'admin/ldap_import_students_to_session.php']), - 'label' => $this->translator->trans('Import LDAP users into a session'), - ]; - } - $items[] = [ - 'class' => 'item-session-export', - 'url' => $this->generateUrl('legacy_main', ['name' => 'session/session_export.php']), - 'label' => $this->translator->trans('Export sessions list'), - ]; - - $items[] = [ - 'class' => 'item-session-course-copy', - 'url' => $this->generateUrl('legacy_main', ['name' => 'coursecopy/copy_course_session.php']), - 'label' => $this->translator->trans('Copy from course in session to another session'), - ]; - - $allowCareer = $this->settingsManager->getSetting('session.allow_session_admin_read_careers'); - - if ($this->isAdmin || ('true' === $allowCareer && $this->isSessionAdmin)) { - // option only visible in development mode. Enable through code if required - if (is_dir(api_get_path(SYS_TEST_PATH).'datafiller/')) { - $items[] = [ - 'class' => 'item-session-user-move-stats', - 'url' => $this->generateUrl('legacy_main', ['name' => 'admin/user_move_stats.php']), - 'label' => $this->translator->trans('Move users results from/to a session'), - ]; - } - - $items[] = [ - 'class' => 'item-session-user-move', - 'url' => $this->generateUrl('legacy_main', ['name' => 'coursecopy/move_users_from_course_to_session.php']), - 'label' => $this->translator->trans('Move users results from base course to a session'), - ]; - - $items[] = [ - 'class' => 'item-career-dashboard', - 'url' => $this->generateUrl('legacy_main', ['name' => 'admin/career_dashboard.php']), - 'label' => $this->translator->trans('Careers and promotions'), - ]; - $items[] = [ - 'class' => 'item-session-field', - 'url' => $this->generateUrl('legacy_main', ['name' => 'admin/extra_fields.php', 'type' => 'session']), - 'label' => $this->translator->trans('Manage session fields'), - ]; - $items[] = [ - 'class' => 'item-resource-sequence', - 'url' => $this->generateUrl('legacy_main', ['name' => 'admin/resource_sequence.php']), - 'label' => $this->translator->trans('Resources sequencing'), - ]; - $items[] = [ - 'class' => 'item-export-exercise-results', - 'url' => $this->generateUrl('legacy_main', ['name' => 'admin/export_exercise_results.php']), - 'label' => $this->translator->trans('Export all results from an exercise'), - ]; - } - - return $items; - } - private function getItemsSettings(): array { $items = []; @@ -695,6 +605,7 @@ class IndexBlocksController extends BaseController 'url' => $this->generateUrl('legacy_main', ['name' => 'skills/skills_gradebook.php']), 'label' => $this->translator->trans('Skills and assessments'), ]; + /*$items[] = [ 'url' => $this->$this->generateUrl('legacy_main', ['name' => 'admin/skill_badge.php'), 'label' => $this->translator->trans('Badges'), @@ -800,4 +711,97 @@ class IndexBlocksController extends BaseController return $items; } + + private function getItemsSessions(): array + { + $items = []; + $items[] = [ + 'class' => 'item-session-list', + 'url' => $this->generateUrl('legacy_main', ['name' => 'session/session_list.php']), + 'label' => $this->translator->trans('Training sessions list'), + ]; + $items[] = [ + 'class' => 'item-session-add', + 'url' => $this->generateUrl('legacy_main', ['name' => 'session/session_add.php']), + 'label' => $this->translator->trans('Add a training session'), + ]; + $items[] = [ + 'class' => 'item-session-category', + 'url' => $this->generateUrl('legacy_main', ['name' => 'session/session_category_list.php']), + 'label' => $this->translator->trans('Sessions categories list'), + ]; + $items[] = [ + 'class' => 'item-session-import', + 'url' => $this->generateUrl('legacy_main', ['name' => 'session/session_import.php']), + 'label' => $this->translator->trans('Import sessions list'), + ]; + $items[] = [ + 'class' => 'item-session-import-hr', + 'url' => $this->generateUrl('legacy_main', ['name' => 'session/session_import_drh.php']), + 'label' => $this->translator->trans('Import list of HR directors into sessions'), + ]; + if (\count($this->extAuthSource['ldap']) > 0) { + $items[] = [ + 'class' => 'item-session-subscription-ldap-import', + 'url' => $this->generateUrl('legacy_main', ['name' => 'admin/ldap_import_students_to_session.php']), + 'label' => $this->translator->trans('Import LDAP users into a session'), + ]; + } + $items[] = [ + 'class' => 'item-session-export', + 'url' => $this->generateUrl('legacy_main', ['name' => 'session/session_export.php']), + 'label' => $this->translator->trans('Export sessions list'), + ]; + + $items[] = [ + 'class' => 'item-session-course-copy', + 'url' => $this->generateUrl('legacy_main', ['name' => 'coursecopy/copy_course_session.php']), + 'label' => $this->translator->trans('Copy from course in session to another session'), + ]; + + $allowCareer = $this->settingsManager->getSetting('session.allow_session_admin_read_careers'); + + if ($this->isAdmin || ('true' === $allowCareer && $this->isSessionAdmin)) { + // option only visible in development mode. Enable through code if required + if (is_dir(api_get_path(SYS_TEST_PATH).'datafiller/')) { + $items[] = [ + 'class' => 'item-session-user-move-stats', + 'url' => $this->generateUrl('legacy_main', ['name' => 'admin/user_move_stats.php']), + 'label' => $this->translator->trans('Move users results from/to a session'), + ]; + } + + $items[] = [ + 'class' => 'item-session-user-move', + 'url' => $this->generateUrl( + 'legacy_main', + ['name' => 'coursecopy/move_users_from_course_to_session.php'] + ), + 'label' => $this->translator->trans('Move users results from base course to a session'), + ]; + + $items[] = [ + 'class' => 'item-career-dashboard', + 'url' => $this->generateUrl('legacy_main', ['name' => 'admin/career_dashboard.php']), + 'label' => $this->translator->trans('Careers and promotions'), + ]; + $items[] = [ + 'class' => 'item-session-field', + 'url' => $this->generateUrl('legacy_main', ['name' => 'admin/extra_fields.php', 'type' => 'session']), + 'label' => $this->translator->trans('Manage session fields'), + ]; + $items[] = [ + 'class' => 'item-resource-sequence', + 'url' => $this->generateUrl('legacy_main', ['name' => 'admin/resource_sequence.php']), + 'label' => $this->translator->trans('Resources sequencing'), + ]; + $items[] = [ + 'class' => 'item-export-exercise-results', + 'url' => $this->generateUrl('legacy_main', ['name' => 'admin/export_exercise_results.php']), + 'label' => $this->translator->trans('Export all results from an exercise'), + ]; + } + + return $items; + } } diff --git a/src/CoreBundle/Controller/Admin/PluginsController.php b/src/CoreBundle/Controller/Admin/PluginsController.php index 03402e9f36..97d240ce07 100644 --- a/src/CoreBundle/Controller/Admin/PluginsController.php +++ b/src/CoreBundle/Controller/Admin/PluginsController.php @@ -8,9 +8,9 @@ namespace Chamilo\CoreBundle\Controller\Admin; use AppPlugin; use Chamilo\CoreBundle\Controller\BaseController; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; +use Symfony\Component\Security\Http\Attribute\IsGranted; #[Route('/plugins')] class PluginsController extends BaseController diff --git a/src/CoreBundle/Controller/Admin/SettingsController.php b/src/CoreBundle/Controller/Admin/SettingsController.php index 7cf44c8272..59287d3863 100644 --- a/src/CoreBundle/Controller/Admin/SettingsController.php +++ b/src/CoreBundle/Controller/Admin/SettingsController.php @@ -9,13 +9,13 @@ namespace Chamilo\CoreBundle\Controller\Admin; use Chamilo\CoreBundle\Controller\BaseController; use Chamilo\CoreBundle\ServiceHelper\AccessUrlHelper; use Chamilo\CoreBundle\Traits\ControllerTrait; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; +use Symfony\Component\Security\Http\Attribute\IsGranted; use Symfony\Component\Validator\Exception\ValidatorException; #[Route('/admin')] @@ -84,7 +84,7 @@ class SettingsController extends BaseController 'schemas' => $schemas, 'settings' => $settings, 'form_list' => $formList, - 'search_form' => $searchForm->createView(), + 'search_form' => $searchForm, ] ); } @@ -167,7 +167,7 @@ class SettingsController extends BaseController 'settings' => $settings, 'form' => $form->createView(), 'keyword' => $keyword, - 'search_form' => $searchForm->createView(), + 'search_form' => $searchForm, ] ); } diff --git a/src/CoreBundle/Controller/Api/AbstractFeedbackSocialPostController.php b/src/CoreBundle/Controller/Api/AbstractFeedbackSocialPostController.php index 5798307d6f..7dcc418f18 100644 --- a/src/CoreBundle/Controller/Api/AbstractFeedbackSocialPostController.php +++ b/src/CoreBundle/Controller/Api/AbstractFeedbackSocialPostController.php @@ -12,9 +12,9 @@ use Chamilo\CoreBundle\Entity\User; use Chamilo\CoreBundle\Settings\SettingsManager; use Doctrine\ORM\EntityManager; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpKernel\Attribute\AsController; use Symfony\Component\Security\Core\Exception\AccessDeniedException; -use Symfony\Component\Security\Core\Security; #[AsController] abstract class AbstractFeedbackSocialPostController extends AbstractController diff --git a/src/CoreBundle/Controller/Api/CreateCLinkAction.php b/src/CoreBundle/Controller/Api/CreateCLinkAction.php index f468f2fc27..59b88f29bb 100644 --- a/src/CoreBundle/Controller/Api/CreateCLinkAction.php +++ b/src/CoreBundle/Controller/Api/CreateCLinkAction.php @@ -14,8 +14,8 @@ use Chamilo\CourseBundle\Entity\CLinkCategory; use Chamilo\CourseBundle\Repository\CLinkRepository; use Chamilo\CourseBundle\Repository\CShortcutRepository; use Doctrine\ORM\EntityManager; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Security\Core\Security; class CreateCLinkAction extends BaseResourceFileAction { diff --git a/src/CoreBundle/Controller/Api/CreateSocialPostAttachmentAction.php b/src/CoreBundle/Controller/Api/CreateSocialPostAttachmentAction.php index b83b2dd22d..0f42b4e4e9 100644 --- a/src/CoreBundle/Controller/Api/CreateSocialPostAttachmentAction.php +++ b/src/CoreBundle/Controller/Api/CreateSocialPostAttachmentAction.php @@ -14,9 +14,9 @@ use DateTime; use DateTimeZone; use Doctrine\ORM\EntityManager; use Exception; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Security\Core\Security; class CreateSocialPostAttachmentAction extends BaseResourceFileAction { diff --git a/src/CoreBundle/Controller/Api/DislikeSocialPostController.php b/src/CoreBundle/Controller/Api/DislikeSocialPostController.php index 14f7afbe97..7204523a5c 100644 --- a/src/CoreBundle/Controller/Api/DislikeSocialPostController.php +++ b/src/CoreBundle/Controller/Api/DislikeSocialPostController.php @@ -9,8 +9,8 @@ namespace Chamilo\CoreBundle\Controller\Api; use Chamilo\CoreBundle\Entity\SocialPost; use Chamilo\CoreBundle\Settings\SettingsManager; use Doctrine\ORM\EntityManager; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Security\Core\Exception\AccessDeniedException; -use Symfony\Component\Security\Core\Security; class DislikeSocialPostController extends AbstractFeedbackSocialPostController { diff --git a/src/CoreBundle/Controller/Api/SocialPostAttachmentsController.php b/src/CoreBundle/Controller/Api/SocialPostAttachmentsController.php index ceaab2e607..21d016ae8d 100644 --- a/src/CoreBundle/Controller/Api/SocialPostAttachmentsController.php +++ b/src/CoreBundle/Controller/Api/SocialPostAttachmentsController.php @@ -8,8 +8,8 @@ use Chamilo\CoreBundle\Entity\SocialPost; use Chamilo\CoreBundle\Entity\SocialPostAttachment; use Chamilo\CoreBundle\Repository\Node\SocialPostAttachmentRepository; use Doctrine\ORM\EntityManager; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\JsonResponse; -use Symfony\Component\Security\Core\Security; class SocialPostAttachmentsController extends BaseResourceFileAction { diff --git a/src/CoreBundle/Controller/Api/UpdateCLinkAction.php b/src/CoreBundle/Controller/Api/UpdateCLinkAction.php index 6b5dc06715..9c891247ae 100644 --- a/src/CoreBundle/Controller/Api/UpdateCLinkAction.php +++ b/src/CoreBundle/Controller/Api/UpdateCLinkAction.php @@ -14,8 +14,8 @@ use Chamilo\CourseBundle\Entity\CLinkCategory; use Chamilo\CourseBundle\Repository\CLinkRepository; use Chamilo\CourseBundle\Repository\CShortcutRepository; use Doctrine\ORM\EntityManager; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Security\Core\Security; class UpdateCLinkAction extends BaseResourceFileAction { diff --git a/src/CoreBundle/Controller/Api/UpdateCLinkCategoryAction.php b/src/CoreBundle/Controller/Api/UpdateCLinkCategoryAction.php index 6edc4a6123..d5a64e865f 100644 --- a/src/CoreBundle/Controller/Api/UpdateCLinkCategoryAction.php +++ b/src/CoreBundle/Controller/Api/UpdateCLinkCategoryAction.php @@ -8,8 +8,8 @@ namespace Chamilo\CoreBundle\Controller\Api; use Chamilo\CourseBundle\Entity\CLinkCategory; use Chamilo\CourseBundle\Repository\CLinkRepository; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Security\Core\Security; class UpdateCLinkCategoryAction extends BaseResourceFileAction { diff --git a/src/CoreBundle/Controller/AssetController.php b/src/CoreBundle/Controller/AssetController.php index 07a69e947c..851322e331 100644 --- a/src/CoreBundle/Controller/AssetController.php +++ b/src/CoreBundle/Controller/AssetController.php @@ -15,7 +15,7 @@ use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\ResponseHeaderBag; use Symfony\Component\HttpFoundation\StreamedResponse; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; #[Route('/assets')] class AssetController diff --git a/src/CoreBundle/Controller/BadgeController.php b/src/CoreBundle/Controller/BadgeController.php index f8ba9145f3..0f753dc7db 100644 --- a/src/CoreBundle/Controller/BadgeController.php +++ b/src/CoreBundle/Controller/BadgeController.php @@ -9,7 +9,7 @@ namespace Chamilo\CoreBundle\Controller; use Chamilo\CoreBundle\Traits\ControllerTrait; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; class BadgeController extends AbstractController { diff --git a/src/CoreBundle/Controller/ChatController.php b/src/CoreBundle/Controller/ChatController.php index c2f19b2f40..b12c219863 100644 --- a/src/CoreBundle/Controller/ChatController.php +++ b/src/CoreBundle/Controller/ChatController.php @@ -17,7 +17,7 @@ use Event; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; class ChatController extends AbstractResourceController implements CourseControllerInterface { diff --git a/src/CoreBundle/Controller/ContactCategoryController.php b/src/CoreBundle/Controller/ContactCategoryController.php index ad64642b4c..0acdecae18 100644 --- a/src/CoreBundle/Controller/ContactCategoryController.php +++ b/src/CoreBundle/Controller/ContactCategoryController.php @@ -12,7 +12,7 @@ use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; #[Route('/contact/category')] class ContactCategoryController extends AbstractController @@ -46,7 +46,7 @@ class ContactCategoryController extends AbstractController return $this->redirectToRoute('chamilo_contact_category_index', [], Response::HTTP_SEE_OTHER); } - return $this->renderForm('@ChamiloCore/ContactCategory/new.html.twig', [ + return $this->render('@ChamiloCore/ContactCategory/new.html.twig', [ 'contact_category' => $contactCategory, 'form' => $form, ]); @@ -72,7 +72,7 @@ class ContactCategoryController extends AbstractController return $this->redirectToRoute('chamilo_contact_category_index', [], Response::HTTP_SEE_OTHER); } - return $this->renderForm('@ChamiloCore/ContactCategory/edit.html.twig', [ + return $this->render('@ChamiloCore/ContactCategory/edit.html.twig', [ 'contact_category' => $contactCategory, 'form' => $form, ]); diff --git a/src/CoreBundle/Controller/ContactController.php b/src/CoreBundle/Controller/ContactController.php index 19a50acf64..7da873f934 100644 --- a/src/CoreBundle/Controller/ContactController.php +++ b/src/CoreBundle/Controller/ContactController.php @@ -16,7 +16,7 @@ use Symfony\Component\Routing\Annotation\Route; class ContactController extends AbstractController { - #[Route(path: '/contact', name: 'contact')] + #[\Symfony\Component\Routing\Attribute\Route(path: '/contact', name: 'contact')] public function index(Request $request, MailerInterface $mailer, SettingsManager $settingsManager) { $form = $this->createForm(ContactType::class); @@ -55,7 +55,7 @@ class ContactController extends AbstractController return $this->render( '@ChamiloCore/Contact/index.html.twig', [ - 'form' => $form->createView(), + 'form' => $form, 'termsContent' => $termsContent, ] ); diff --git a/src/CoreBundle/Controller/CourseController.php b/src/CoreBundle/Controller/CourseController.php index 36fe0aaccd..f7edc2068e 100644 --- a/src/CoreBundle/Controller/CourseController.php +++ b/src/CoreBundle/Controller/CourseController.php @@ -45,13 +45,13 @@ use Event; use Exception; use Exercise; use ExtraFieldValue; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Entity; +use Symfony\Bridge\Doctrine\Attribute\MapEntity; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Serializer\SerializerInterface; use Symfony\Component\Validator\Exception\ValidatorException; use Symfony\Contracts\Translation\TranslatorInterface; @@ -132,7 +132,6 @@ class CourseController extends ToolBaseController } #[Route('/{cid}/home.json', name: 'chamilo_core_course_home_json')] - #[Entity('course', expr: 'repository.find(cid)')] public function indexJson( Request $request, CShortcutRepository $shortcutRepository, @@ -307,9 +306,9 @@ class CourseController extends ToolBaseController * Edit configuration with given namespace. */ #[Route('/{cid}/settings/{namespace}', name: 'chamilo_core_course_settings')] - #[Entity('course', expr: 'repository.find(cid)')] public function updateSettings( Request $request, + #[MapEntity(expr: 'repository.find(cid)')] Course $course, string $namespace, SettingsCourseManager $manager, @@ -351,7 +350,7 @@ class CourseController extends ToolBaseController 'course' => $course, 'schemas' => $schemas, 'settings' => $settings, - 'form' => $form->createView(), + 'form' => $form, ] ); } diff --git a/src/CoreBundle/Controller/CoursesController.php b/src/CoreBundle/Controller/CoursesController.php index 4508de7fe1..53ab546336 100644 --- a/src/CoreBundle/Controller/CoursesController.php +++ b/src/CoreBundle/Controller/CoursesController.php @@ -12,7 +12,7 @@ use Chamilo\CourseBundle\Repository\CDocumentRepository; use Gedmo\Sluggable\Util\Urlizer; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Security\Core\Exception\AccessDeniedException; #[Route('/courses')] diff --git a/src/CoreBundle/Controller/EditorController.php b/src/CoreBundle/Controller/EditorController.php index a4ce851ef6..ca6e4c11c4 100644 --- a/src/CoreBundle/Controller/EditorController.php +++ b/src/CoreBundle/Controller/EditorController.php @@ -11,7 +11,7 @@ use Chamilo\CoreBundle\Traits\ControllerTrait; use Chamilo\CoreBundle\Traits\CourseControllerTrait; use Chamilo\CoreBundle\Traits\ResourceControllerTrait; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Routing\RouterInterface; use Symfony\Contracts\Translation\TranslatorInterface; diff --git a/src/CoreBundle/Controller/ExceptionController.php b/src/CoreBundle/Controller/ExceptionController.php index 99fe2bde52..e174af73f9 100644 --- a/src/CoreBundle/Controller/ExceptionController.php +++ b/src/CoreBundle/Controller/ExceptionController.php @@ -12,7 +12,7 @@ use Symfony\Component\ErrorHandler\Exception\FlattenException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\HttpException; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; class ExceptionController extends AbstractController { diff --git a/src/CoreBundle/Controller/FileManagerController.php b/src/CoreBundle/Controller/FileManagerController.php index 1a3c806aa9..7a417dae1e 100644 --- a/src/CoreBundle/Controller/FileManagerController.php +++ b/src/CoreBundle/Controller/FileManagerController.php @@ -15,7 +15,7 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; #[Route('/file-manager')] class FileManagerController extends AbstractController diff --git a/src/CoreBundle/Controller/GradebookController.php b/src/CoreBundle/Controller/GradebookController.php index 6887245442..d2a7f8b862 100644 --- a/src/CoreBundle/Controller/GradebookController.php +++ b/src/CoreBundle/Controller/GradebookController.php @@ -10,7 +10,7 @@ use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; #[Route('/gradebook')] class GradebookController extends AbstractController diff --git a/src/CoreBundle/Controller/IndexController.php b/src/CoreBundle/Controller/IndexController.php index d0bd6d04a8..9997c3526c 100644 --- a/src/CoreBundle/Controller/IndexController.php +++ b/src/CoreBundle/Controller/IndexController.php @@ -10,7 +10,7 @@ use Chamilo\CoreBundle\Settings\SettingsManager; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; class IndexController extends BaseController { diff --git a/src/CoreBundle/Controller/LegalController.php b/src/CoreBundle/Controller/LegalController.php index 9aac607749..812c87cb04 100644 --- a/src/CoreBundle/Controller/LegalController.php +++ b/src/CoreBundle/Controller/LegalController.php @@ -15,7 +15,7 @@ use LegalManager; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; #[Route('/legal')] class LegalController diff --git a/src/CoreBundle/Controller/NewsController.php b/src/CoreBundle/Controller/NewsController.php index 1decea729b..6daf9efe22 100644 --- a/src/CoreBundle/Controller/NewsController.php +++ b/src/CoreBundle/Controller/NewsController.php @@ -12,7 +12,7 @@ use Chamilo\CoreBundle\ServiceHelper\UserHelper; use Chamilo\CoreBundle\Traits\ControllerTrait; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; /** * @author Julio Montoya . diff --git a/src/CoreBundle/Controller/OnlineController.php b/src/CoreBundle/Controller/OnlineController.php index 8feb20c17e..507a04d1dc 100644 --- a/src/CoreBundle/Controller/OnlineController.php +++ b/src/CoreBundle/Controller/OnlineController.php @@ -8,7 +8,7 @@ namespace Chamilo\CoreBundle\Controller; use SocialManager; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; /** * @author Julio Montoya . diff --git a/src/CoreBundle/Controller/PermissionsController.php b/src/CoreBundle/Controller/PermissionsController.php index 623d04e746..961a0f9e57 100644 --- a/src/CoreBundle/Controller/PermissionsController.php +++ b/src/CoreBundle/Controller/PermissionsController.php @@ -9,7 +9,7 @@ namespace Chamilo\CoreBundle\Controller; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; #[Route('/permissions')] class PermissionsController extends AbstractController diff --git a/src/CoreBundle/Controller/PlatformConfigurationController.php b/src/CoreBundle/Controller/PlatformConfigurationController.php index 7e709219da..ddbd88dbb8 100644 --- a/src/CoreBundle/Controller/PlatformConfigurationController.php +++ b/src/CoreBundle/Controller/PlatformConfigurationController.php @@ -14,7 +14,7 @@ use Chamilo\CoreBundle\Traits\ControllerTrait; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; #[Route('/platform-config')] class PlatformConfigurationController extends AbstractController diff --git a/src/CoreBundle/Controller/ResetPasswordController.php b/src/CoreBundle/Controller/ResetPasswordController.php index a99a9ef3b9..35a0524605 100644 --- a/src/CoreBundle/Controller/ResetPasswordController.php +++ b/src/CoreBundle/Controller/ResetPasswordController.php @@ -17,7 +17,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Mailer\MailerInterface; use Symfony\Component\Mime\Address; use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use SymfonyCasts\Bundle\ResetPassword\Controller\ResetPasswordControllerTrait; use SymfonyCasts\Bundle\ResetPassword\Exception\ResetPasswordExceptionInterface; use SymfonyCasts\Bundle\ResetPassword\ResetPasswordHelperInterface; @@ -54,7 +54,7 @@ class ResetPasswordController extends AbstractController } return $this->render('@ChamiloCore/reset_password/request.html.twig', [ - 'requestForm' => $form->createView(), + 'requestForm' => $form, ]); } @@ -129,7 +129,7 @@ class ResetPasswordController extends AbstractController } return $this->render('@ChamiloCore/reset_password/reset.html.twig', [ - 'resetForm' => $form->createView(), + 'resetForm' => $form, ]); } diff --git a/src/CoreBundle/Controller/ResourceController.php b/src/CoreBundle/Controller/ResourceController.php index c021ed1dc2..51e03be622 100644 --- a/src/CoreBundle/Controller/ResourceController.php +++ b/src/CoreBundle/Controller/ResourceController.php @@ -28,6 +28,7 @@ use Chamilo\CourseBundle\Repository\CToolRepository; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Criteria; use Doctrine\ORM\EntityManagerInterface; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Filesystem\Exception\FileNotFoundException; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -37,9 +38,8 @@ use Symfony\Component\HttpFoundation\ResponseHeaderBag; use Symfony\Component\HttpFoundation\StreamedResponse; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Routing\RouterInterface; -use Symfony\Component\Security\Core\Security; use Symfony\Component\Serializer\SerializerInterface; use ZipStream\Option\Archive; use ZipStream\ZipStream; diff --git a/src/CoreBundle/Controller/SecurityController.php b/src/CoreBundle/Controller/SecurityController.php index 501afe4b70..1d09dd4e25 100644 --- a/src/CoreBundle/Controller/SecurityController.php +++ b/src/CoreBundle/Controller/SecurityController.php @@ -17,7 +17,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; use Symfony\Component\Serializer\SerializerInterface; diff --git a/src/CoreBundle/Controller/SessionController.php b/src/CoreBundle/Controller/SessionController.php index 9f7bcd5ddf..aaee6c2ada 100644 --- a/src/CoreBundle/Controller/SessionController.php +++ b/src/CoreBundle/Controller/SessionController.php @@ -29,7 +29,7 @@ use SessionManager; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use UserManager; #[Route('/sessions')] diff --git a/src/CoreBundle/Controller/SocialController.php b/src/CoreBundle/Controller/SocialController.php index 6a14eff47a..be22d00782 100644 --- a/src/CoreBundle/Controller/SocialController.php +++ b/src/CoreBundle/Controller/SocialController.php @@ -41,7 +41,7 @@ use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Mailer\MailerInterface; use Symfony\Component\Mime\Email; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Symfony\Contracts\Translation\TranslatorInterface; use UserManager; diff --git a/src/CoreBundle/Controller/TemplateController.php b/src/CoreBundle/Controller/TemplateController.php index 23baaa19ad..9d28e420f1 100644 --- a/src/CoreBundle/Controller/TemplateController.php +++ b/src/CoreBundle/Controller/TemplateController.php @@ -22,7 +22,7 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; #[Route('/template')] class TemplateController extends AbstractController diff --git a/src/CoreBundle/Controller/ThemeController.php b/src/CoreBundle/Controller/ThemeController.php index 67d0aad358..1c813ee6e2 100644 --- a/src/CoreBundle/Controller/ThemeController.php +++ b/src/CoreBundle/Controller/ThemeController.php @@ -11,7 +11,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; class ThemeController extends AbstractController { diff --git a/src/CoreBundle/Controller/ToolController.php b/src/CoreBundle/Controller/ToolController.php index 4190602f5f..b6dadc773d 100644 --- a/src/CoreBundle/Controller/ToolController.php +++ b/src/CoreBundle/Controller/ToolController.php @@ -10,7 +10,7 @@ use Chamilo\CoreBundle\Tool\ToolChain; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; #[Route('/tool')] class ToolController extends AbstractController diff --git a/src/CoreBundle/Controller/UserController.php b/src/CoreBundle/Controller/UserController.php index d7b8826012..d30972b0e2 100644 --- a/src/CoreBundle/Controller/UserController.php +++ b/src/CoreBundle/Controller/UserController.php @@ -10,7 +10,7 @@ use Chamilo\CoreBundle\Repository\Node\IllustrationRepository; use Chamilo\CoreBundle\Repository\Node\UserRepository; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Security\Core\User\UserInterface; /** diff --git a/src/CoreBundle/DataProvider/Extension/CCalendarEventExtension.php b/src/CoreBundle/DataProvider/Extension/CCalendarEventExtension.php index d0c9a97b4a..31e919ed3a 100644 --- a/src/CoreBundle/DataProvider/Extension/CCalendarEventExtension.php +++ b/src/CoreBundle/DataProvider/Extension/CCalendarEventExtension.php @@ -15,7 +15,7 @@ use Chamilo\CoreBundle\ServiceHelper\CidReqHelper; use Chamilo\CoreBundle\Settings\SettingsManager; use Chamilo\CourseBundle\Entity\CCalendarEvent; use Doctrine\ORM\QueryBuilder; -use Symfony\Component\Security\Core\Security; +use Symfony\Bundle\SecurityBundle\Security; use UserGroupModel; final class CCalendarEventExtension implements QueryCollectionExtensionInterface diff --git a/src/CoreBundle/DataProvider/Extension/CDocumentExtension.php b/src/CoreBundle/DataProvider/Extension/CDocumentExtension.php index 694c4ae3ee..d34f66eed1 100644 --- a/src/CoreBundle/DataProvider/Extension/CDocumentExtension.php +++ b/src/CoreBundle/DataProvider/Extension/CDocumentExtension.php @@ -12,9 +12,9 @@ use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Metadata\Operation; use Chamilo\CourseBundle\Entity\CDocument; use Doctrine\ORM\QueryBuilder; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Security\Core\Exception\AccessDeniedException; -use Symfony\Component\Security\Core\Security; /** * Extension is called when loading api/documents.json. diff --git a/src/CoreBundle/DataProvider/Extension/CStudentPublicationExtension.php b/src/CoreBundle/DataProvider/Extension/CStudentPublicationExtension.php index 5b7cfca8f8..e176c8206a 100644 --- a/src/CoreBundle/DataProvider/Extension/CStudentPublicationExtension.php +++ b/src/CoreBundle/DataProvider/Extension/CStudentPublicationExtension.php @@ -11,9 +11,9 @@ use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Metadata\Operation; use Chamilo\CourseBundle\Entity\CStudentPublication; use Doctrine\ORM\QueryBuilder; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Security\Core\Exception\AccessDeniedException; -use Symfony\Component\Security\Core\Security; class CStudentPublicationExtension implements QueryCollectionExtensionInterface { diff --git a/src/CoreBundle/DataProvider/Extension/CToolIntroExtension.php b/src/CoreBundle/DataProvider/Extension/CToolIntroExtension.php index 5173a18cea..376015b754 100644 --- a/src/CoreBundle/DataProvider/Extension/CToolIntroExtension.php +++ b/src/CoreBundle/DataProvider/Extension/CToolIntroExtension.php @@ -11,9 +11,9 @@ use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Metadata\Operation; use Chamilo\CourseBundle\Entity\CToolIntro; use Doctrine\ORM\QueryBuilder; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Security\Core\Exception\AccessDeniedException; -use Symfony\Component\Security\Core\Security; // use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface; diff --git a/src/CoreBundle/DataProvider/Extension/CourseExtension.php b/src/CoreBundle/DataProvider/Extension/CourseExtension.php index 32899fd8a1..716c33e3b9 100644 --- a/src/CoreBundle/DataProvider/Extension/CourseExtension.php +++ b/src/CoreBundle/DataProvider/Extension/CourseExtension.php @@ -11,8 +11,8 @@ use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Metadata\Operation; use Chamilo\CoreBundle\Entity\Course; use Doctrine\ORM\QueryBuilder; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Security\Core\Exception\AccessDeniedException; -use Symfony\Component\Security\Core\Security; // use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface; diff --git a/src/CoreBundle/DataProvider/Extension/CourseLinkExtensionTrait.php b/src/CoreBundle/DataProvider/Extension/CourseLinkExtensionTrait.php index 4a725f230a..d620652895 100644 --- a/src/CoreBundle/DataProvider/Extension/CourseLinkExtensionTrait.php +++ b/src/CoreBundle/DataProvider/Extension/CourseLinkExtensionTrait.php @@ -6,7 +6,7 @@ namespace Chamilo\CoreBundle\DataProvider\Extension; use Chamilo\CoreBundle\Entity\ResourceLink; use Doctrine\ORM\QueryBuilder; -use Symfony\Component\Security\Core\Security; +use Symfony\Bundle\SecurityBundle\Security; trait CourseLinkExtensionTrait { diff --git a/src/CoreBundle/DataProvider/Extension/CourseRelUserExtension.php b/src/CoreBundle/DataProvider/Extension/CourseRelUserExtension.php index 9903cc0511..c2918e7cb4 100644 --- a/src/CoreBundle/DataProvider/Extension/CourseRelUserExtension.php +++ b/src/CoreBundle/DataProvider/Extension/CourseRelUserExtension.php @@ -12,8 +12,8 @@ use ApiPlatform\Metadata\Operation; use Chamilo\CoreBundle\Entity\CourseRelUser; use Chamilo\CoreBundle\Entity\User; use Doctrine\ORM\QueryBuilder; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Security\Core\Exception\AccessDeniedException; -use Symfony\Component\Security\Core\Security; // use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface; diff --git a/src/CoreBundle/DataProvider/Extension/MessageExtension.php b/src/CoreBundle/DataProvider/Extension/MessageExtension.php index 98db68a5dd..9539016543 100644 --- a/src/CoreBundle/DataProvider/Extension/MessageExtension.php +++ b/src/CoreBundle/DataProvider/Extension/MessageExtension.php @@ -13,7 +13,7 @@ use Chamilo\CoreBundle\Entity\Message; use Chamilo\CoreBundle\Entity\User; use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; -use Symfony\Component\Security\Core\Security; +use Symfony\Bundle\SecurityBundle\Security; // use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface; // use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface; diff --git a/src/CoreBundle/DataProvider/Extension/MessageRelUserExtension.php b/src/CoreBundle/DataProvider/Extension/MessageRelUserExtension.php index 737789d6fd..ed442044c7 100644 --- a/src/CoreBundle/DataProvider/Extension/MessageRelUserExtension.php +++ b/src/CoreBundle/DataProvider/Extension/MessageRelUserExtension.php @@ -12,7 +12,7 @@ use ApiPlatform\Metadata\Operation; use Chamilo\CoreBundle\Entity\MessageRelUser; use Chamilo\CoreBundle\Entity\User; use Doctrine\ORM\QueryBuilder; -use Symfony\Component\Security\Core\Security; +use Symfony\Bundle\SecurityBundle\Security; class MessageRelUserExtension implements QueryCollectionExtensionInterface { diff --git a/src/CoreBundle/DataProvider/Extension/MessageTagExtension.php b/src/CoreBundle/DataProvider/Extension/MessageTagExtension.php index 31a8881b61..8483f0078e 100644 --- a/src/CoreBundle/DataProvider/Extension/MessageTagExtension.php +++ b/src/CoreBundle/DataProvider/Extension/MessageTagExtension.php @@ -11,7 +11,7 @@ use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Metadata\Operation; use Chamilo\CoreBundle\Entity\MessageTag; use Doctrine\ORM\QueryBuilder; -use Symfony\Component\Security\Core\Security; +use Symfony\Bundle\SecurityBundle\Security; // use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface; diff --git a/src/CoreBundle/DataProvider/Extension/PageExtension.php b/src/CoreBundle/DataProvider/Extension/PageExtension.php index 811808d77a..9e787e18b9 100644 --- a/src/CoreBundle/DataProvider/Extension/PageExtension.php +++ b/src/CoreBundle/DataProvider/Extension/PageExtension.php @@ -11,8 +11,8 @@ use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface; use ApiPlatform\Metadata\Operation; use Chamilo\CoreBundle\Entity\Page; use Doctrine\ORM\QueryBuilder; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\RequestStack; -use Symfony\Component\Security\Core\Security; // use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface; // use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface; diff --git a/src/CoreBundle/DataProvider/Extension/PersonalFileExtension.php b/src/CoreBundle/DataProvider/Extension/PersonalFileExtension.php index bc5762f88f..775bc5a036 100644 --- a/src/CoreBundle/DataProvider/Extension/PersonalFileExtension.php +++ b/src/CoreBundle/DataProvider/Extension/PersonalFileExtension.php @@ -13,8 +13,8 @@ use Chamilo\CoreBundle\Entity\PersonalFile; use Chamilo\CoreBundle\Entity\ResourceLink; use Chamilo\CoreBundle\Entity\User; use Doctrine\ORM\QueryBuilder; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\RequestStack; -use Symfony\Component\Security\Core\Security; // use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface; diff --git a/src/CoreBundle/DataProvider/Extension/SessionRelUserExtension.php b/src/CoreBundle/DataProvider/Extension/SessionRelUserExtension.php index a4f03c68bd..cb78e4c48f 100644 --- a/src/CoreBundle/DataProvider/Extension/SessionRelUserExtension.php +++ b/src/CoreBundle/DataProvider/Extension/SessionRelUserExtension.php @@ -14,9 +14,9 @@ use Chamilo\CoreBundle\Entity\User; use DateTime; use DateTimeZone; use Doctrine\ORM\QueryBuilder; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Security\Core\Exception\AccessDeniedException; -use Symfony\Component\Security\Core\Security; // use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface; diff --git a/src/CoreBundle/DataProvider/Extension/TrackEExerciseExtension.php b/src/CoreBundle/DataProvider/Extension/TrackEExerciseExtension.php index f04a595796..192dddbb89 100644 --- a/src/CoreBundle/DataProvider/Extension/TrackEExerciseExtension.php +++ b/src/CoreBundle/DataProvider/Extension/TrackEExerciseExtension.php @@ -12,8 +12,8 @@ use ApiPlatform\Metadata\Operation; use Chamilo\CoreBundle\Entity\TrackEExercise; use Chamilo\CoreBundle\Entity\User; use Doctrine\ORM\QueryBuilder; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Security\Core\Exception\AccessDeniedException; -use Symfony\Component\Security\Core\Security; final class TrackEExerciseExtension implements QueryCollectionExtensionInterface { diff --git a/src/CoreBundle/DataProvider/UsergroupDataProvider.php b/src/CoreBundle/DataProvider/UsergroupDataProvider.php index 48e5468373..2746802bdf 100644 --- a/src/CoreBundle/DataProvider/UsergroupDataProvider.php +++ b/src/CoreBundle/DataProvider/UsergroupDataProvider.php @@ -13,7 +13,7 @@ use Chamilo\CoreBundle\Entity\Usergroup; use Chamilo\CoreBundle\Repository\Node\IllustrationRepository; use Chamilo\CoreBundle\Repository\Node\UsergroupRepository; use Exception; -use Symfony\Component\Security\Core\Security; +use Symfony\Bundle\SecurityBundle\Security; /** * @template-implements ProviderInterface> diff --git a/src/CoreBundle/Entity/Listener/ResourceListener.php b/src/CoreBundle/Entity/Listener/ResourceListener.php index fb1f3a7094..341c4d404e 100644 --- a/src/CoreBundle/Entity/Listener/ResourceListener.php +++ b/src/CoreBundle/Entity/Listener/ResourceListener.php @@ -28,10 +28,10 @@ use Doctrine\ORM\Event\PrePersistEventArgs; use Doctrine\ORM\Event\PreUpdateEventArgs; use Exception; use InvalidArgumentException; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Security\Core\Exception\UserNotFoundException; -use Symfony\Component\Security\Core\Security; use const JSON_THROW_ON_ERROR; use const PATHINFO_EXTENSION; diff --git a/src/CoreBundle/Entity/Listener/ResourceNodeListener.php b/src/CoreBundle/Entity/Listener/ResourceNodeListener.php index 8f332ba725..2b5694e9e1 100644 --- a/src/CoreBundle/Entity/Listener/ResourceNodeListener.php +++ b/src/CoreBundle/Entity/Listener/ResourceNodeListener.php @@ -11,8 +11,8 @@ use Chamilo\CoreBundle\Repository\ResourceNodeRepository; use Chamilo\CoreBundle\Tool\ToolChain; use Cocur\Slugify\SlugifyInterface; use Doctrine\ORM\Event\PreUpdateEventArgs; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\RequestStack; -use Symfony\Component\Security\Core\Security; class ResourceNodeListener { diff --git a/src/CoreBundle/Entity/Listener/SessionListener.php b/src/CoreBundle/Entity/Listener/SessionListener.php index f2ffaf91c6..bd24c3b0bd 100644 --- a/src/CoreBundle/Entity/Listener/SessionListener.php +++ b/src/CoreBundle/Entity/Listener/SessionListener.php @@ -11,8 +11,8 @@ use Chamilo\CoreBundle\Traits\AccessUrlListenerTrait; use Doctrine\ORM\Event\PrePersistEventArgs; use Doctrine\ORM\Event\PreUpdateEventArgs; use Exception; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\RequestStack; -use Symfony\Component\Security\Core\Security; /** * Session entity listener, when a session is created/updated. diff --git a/src/CoreBundle/Entity/Listener/SkillRelUserListener.php b/src/CoreBundle/Entity/Listener/SkillRelUserListener.php index df42b3e433..c213157bde 100644 --- a/src/CoreBundle/Entity/Listener/SkillRelUserListener.php +++ b/src/CoreBundle/Entity/Listener/SkillRelUserListener.php @@ -12,8 +12,8 @@ use Chamilo\CoreBundle\Entity\User; use Chamilo\CoreBundle\Settings\SettingsManager; use Display; use Doctrine\ORM\Event\PostPersistEventArgs; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Routing\RouterInterface; -use Symfony\Component\Security\Core\Security; use Symfony\Contracts\Translation\TranslatorInterface; class SkillRelUserListener diff --git a/src/CoreBundle/Entity/Listener/UserListener.php b/src/CoreBundle/Entity/Listener/UserListener.php index a27a123377..9196b35d6b 100644 --- a/src/CoreBundle/Entity/Listener/UserListener.php +++ b/src/CoreBundle/Entity/Listener/UserListener.php @@ -12,8 +12,8 @@ use Chamilo\CoreBundle\Repository\Node\UserRepository; use Doctrine\ORM\Event\PrePersistEventArgs; use Doctrine\ORM\Event\PreRemoveEventArgs; use Doctrine\ORM\Event\PreUpdateEventArgs; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Security\Core\Exception\UserNotFoundException; -use Symfony\Component\Security\Core\Security; use Symfony\Contracts\Translation\TranslatorInterface; class UserListener diff --git a/src/CoreBundle/EventSubscriber/AnonymousUserSubscriber.php b/src/CoreBundle/EventSubscriber/AnonymousUserSubscriber.php index e819005cdd..9b0c049159 100644 --- a/src/CoreBundle/EventSubscriber/AnonymousUserSubscriber.php +++ b/src/CoreBundle/EventSubscriber/AnonymousUserSubscriber.php @@ -11,10 +11,10 @@ use Chamilo\CoreBundle\Entity\User; use Chamilo\CoreBundle\Settings\SettingsManager; use DateTime; use Doctrine\ORM\EntityManagerInterface; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpKernel\Event\RequestEvent; use Symfony\Component\HttpKernel\KernelEvents; -use Symfony\Component\Security\Core\Security; class AnonymousUserSubscriber implements EventSubscriberInterface { diff --git a/src/CoreBundle/Form/ExtraFieldType.php b/src/CoreBundle/Form/ExtraFieldType.php index b6638e38cf..decef3bda3 100644 --- a/src/CoreBundle/Form/ExtraFieldType.php +++ b/src/CoreBundle/Form/ExtraFieldType.php @@ -14,6 +14,7 @@ use Chamilo\CoreBundle\Repository\TagRepository; use DateTime; use GoogleMapsPlugin; use Oh\GoogleMapFormTypeBundle\Form\Type\GoogleMapType; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; @@ -28,7 +29,6 @@ use Symfony\Component\Form\Extension\Core\Type\UrlType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvents; -use Symfony\Component\Security\Core\Security; /** * @template-extends AbstractType diff --git a/src/CoreBundle/MessageHandler/MessageHandler.php b/src/CoreBundle/MessageHandler/MessageHandler.php index b9e418f72b..1245b93219 100644 --- a/src/CoreBundle/MessageHandler/MessageHandler.php +++ b/src/CoreBundle/MessageHandler/MessageHandler.php @@ -10,15 +10,15 @@ use Chamilo\CoreBundle\Entity\Message; use Chamilo\CoreBundle\Entity\MessageRelUser; use Symfony\Bridge\Twig\Mime\TemplatedEmail; use Symfony\Component\Mailer\Mailer; -use Symfony\Component\Messenger\Handler\MessageHandlerInterface; +use Symfony\Component\Messenger\Attribute\AsMessageHandler; use Symfony\Component\Mime\Address; -class MessageHandler implements MessageHandlerInterface +#[AsMessageHandler] +class MessageHandler { public function __construct( private readonly Mailer $mailer ) {} - public function __invoke(Message $message): void { if (Message::MESSAGE_TYPE_INBOX !== $message->getMsgType()) { diff --git a/src/CoreBundle/Repository/SysAnnouncementRepository.php b/src/CoreBundle/Repository/SysAnnouncementRepository.php index d89fe008cc..bcf706d71c 100644 --- a/src/CoreBundle/Repository/SysAnnouncementRepository.php +++ b/src/CoreBundle/Repository/SysAnnouncementRepository.php @@ -17,8 +17,8 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\DBAL\Types\Types; use Doctrine\ORM\QueryBuilder; use Doctrine\Persistence\ManagerRegistry; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; -use Symfony\Component\Security\Core\Security; class SysAnnouncementRepository extends ServiceEntityRepository { diff --git a/src/CoreBundle/Security/Authorization/Voter/CCalendarEventVoter.php b/src/CoreBundle/Security/Authorization/Voter/CCalendarEventVoter.php index 66339cdfe6..2368c9ace3 100644 --- a/src/CoreBundle/Security/Authorization/Voter/CCalendarEventVoter.php +++ b/src/CoreBundle/Security/Authorization/Voter/CCalendarEventVoter.php @@ -8,9 +8,9 @@ namespace Chamilo\CoreBundle\Security\Authorization\Voter; use Chamilo\CoreBundle\Entity\User; use Chamilo\CourseBundle\Entity\CCalendarEvent; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; -use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\User\UserInterface; class CCalendarEventVoter extends Voter diff --git a/src/CoreBundle/Security/Authorization/Voter/CourseVoter.php b/src/CoreBundle/Security/Authorization/Voter/CourseVoter.php index c1a516f774..708c215f41 100644 --- a/src/CoreBundle/Security/Authorization/Voter/CourseVoter.php +++ b/src/CoreBundle/Security/Authorization/Voter/CourseVoter.php @@ -10,10 +10,10 @@ use Chamilo\CoreBundle\Entity\Course; use Chamilo\CoreBundle\Entity\Session; use Chamilo\CoreBundle\Entity\User; use Doctrine\ORM\EntityManagerInterface; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; -use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\User\UserInterface; class CourseVoter extends Voter diff --git a/src/CoreBundle/Security/Authorization/Voter/GroupVoter.php b/src/CoreBundle/Security/Authorization/Voter/GroupVoter.php index 107aee68f9..7be17fc044 100644 --- a/src/CoreBundle/Security/Authorization/Voter/GroupVoter.php +++ b/src/CoreBundle/Security/Authorization/Voter/GroupVoter.php @@ -13,10 +13,10 @@ use Chamilo\CourseBundle\Entity\CGroup; use Chamilo\CourseBundle\Repository\CGroupRepository; use Doctrine\ORM\EntityManager; use GroupManager; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; -use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\User\UserInterface; class GroupVoter extends Voter diff --git a/src/CoreBundle/Security/Authorization/Voter/MessageTagVoter.php b/src/CoreBundle/Security/Authorization/Voter/MessageTagVoter.php index f4c5b69174..431a4f1615 100644 --- a/src/CoreBundle/Security/Authorization/Voter/MessageTagVoter.php +++ b/src/CoreBundle/Security/Authorization/Voter/MessageTagVoter.php @@ -8,9 +8,9 @@ namespace Chamilo\CoreBundle\Security\Authorization\Voter; use Chamilo\CoreBundle\Entity\MessageTag; use Chamilo\CoreBundle\Entity\User; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; -use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\User\UserInterface; class MessageTagVoter extends Voter diff --git a/src/CoreBundle/Security/Authorization/Voter/MessageVoter.php b/src/CoreBundle/Security/Authorization/Voter/MessageVoter.php index 4d07fd81c5..fa5dbbe65d 100644 --- a/src/CoreBundle/Security/Authorization/Voter/MessageVoter.php +++ b/src/CoreBundle/Security/Authorization/Voter/MessageVoter.php @@ -8,9 +8,9 @@ namespace Chamilo\CoreBundle\Security\Authorization\Voter; use Chamilo\CoreBundle\Entity\Message; use Chamilo\CoreBundle\Entity\User; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; -use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\User\UserInterface; class MessageVoter extends Voter diff --git a/src/CoreBundle/Security/Authorization/Voter/ResourceNodeVoter.php b/src/CoreBundle/Security/Authorization/Voter/ResourceNodeVoter.php index ca7a3a46d5..b8ec225c22 100644 --- a/src/CoreBundle/Security/Authorization/Voter/ResourceNodeVoter.php +++ b/src/CoreBundle/Security/Authorization/Voter/ResourceNodeVoter.php @@ -15,12 +15,12 @@ use Chamilo\CourseBundle\Entity\CGroup; use Laminas\Permissions\Acl\Acl; use Laminas\Permissions\Acl\Resource\GenericResource; use Laminas\Permissions\Acl\Role\GenericRole; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Security\Acl\Permission\MaskBuilder; use Symfony\Component\Security\Core\Authentication\Token\NullToken; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; -use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\User\UserInterface; class ResourceNodeVoter extends Voter diff --git a/src/CoreBundle/Security/Authorization/Voter/SessionVoter.php b/src/CoreBundle/Security/Authorization/Voter/SessionVoter.php index dcf1d5c30e..7620bbffa0 100644 --- a/src/CoreBundle/Security/Authorization/Voter/SessionVoter.php +++ b/src/CoreBundle/Security/Authorization/Voter/SessionVoter.php @@ -12,9 +12,9 @@ use Chamilo\CoreBundle\Entity\User; use Chamilo\CoreBundle\Settings\SettingsManager; use Doctrine\Common\Collections\Criteria; use SessionManager; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; -use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\User\UserInterface; /** diff --git a/src/CoreBundle/Security/Authorization/Voter/TrackEExerciseVoter.php b/src/CoreBundle/Security/Authorization/Voter/TrackEExerciseVoter.php index cce60ebf1b..5bcc4b675d 100644 --- a/src/CoreBundle/Security/Authorization/Voter/TrackEExerciseVoter.php +++ b/src/CoreBundle/Security/Authorization/Voter/TrackEExerciseVoter.php @@ -6,9 +6,9 @@ namespace Chamilo\CoreBundle\Security\Authorization\Voter; use Chamilo\CoreBundle\Entity\TrackEExercise; use Chamilo\CoreBundle\Entity\User; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; -use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\User\UserInterface; class TrackEExerciseVoter extends Voter diff --git a/src/CoreBundle/Security/Authorization/Voter/UserRelUserVoter.php b/src/CoreBundle/Security/Authorization/Voter/UserRelUserVoter.php index 5673166c0e..35ac8cd92c 100644 --- a/src/CoreBundle/Security/Authorization/Voter/UserRelUserVoter.php +++ b/src/CoreBundle/Security/Authorization/Voter/UserRelUserVoter.php @@ -8,9 +8,9 @@ namespace Chamilo\CoreBundle\Security\Authorization\Voter; use Chamilo\CoreBundle\Entity\User; use Chamilo\CoreBundle\Entity\UserRelUser; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; -use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\User\UserInterface; class UserRelUserVoter extends Voter diff --git a/src/CoreBundle/Security/Authorization/Voter/UserVoter.php b/src/CoreBundle/Security/Authorization/Voter/UserVoter.php index 0d281fd81f..d089c8d93e 100644 --- a/src/CoreBundle/Security/Authorization/Voter/UserVoter.php +++ b/src/CoreBundle/Security/Authorization/Voter/UserVoter.php @@ -8,9 +8,9 @@ namespace Chamilo\CoreBundle\Security\Authorization\Voter; use Chamilo\CoreBundle\Entity\User; use Chamilo\CoreBundle\Entity\UserRelUser; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; -use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\User\UserInterface; class UserVoter extends Voter diff --git a/src/CoreBundle/Security/Authorization/Voter/UsergroupVoter.php b/src/CoreBundle/Security/Authorization/Voter/UsergroupVoter.php index dc667d718d..2bd40d4a8a 100644 --- a/src/CoreBundle/Security/Authorization/Voter/UsergroupVoter.php +++ b/src/CoreBundle/Security/Authorization/Voter/UsergroupVoter.php @@ -8,9 +8,9 @@ namespace Chamilo\CoreBundle\Security\Authorization\Voter; use Chamilo\CoreBundle\Entity\Usergroup; use Chamilo\CoreBundle\Repository\Node\UsergroupRepository; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; -use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\User\UserInterface; class UsergroupVoter extends Voter diff --git a/src/CoreBundle/Service/CourseService.php b/src/CoreBundle/Service/CourseService.php index 801becaa21..386e73c74d 100644 --- a/src/CoreBundle/Service/CourseService.php +++ b/src/CoreBundle/Service/CourseService.php @@ -34,13 +34,13 @@ use InvalidArgumentException; use Link; use LogicException; use MultipleAnswer; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; use Symfony\Component\Finder\Finder; use Symfony\Component\Finder\SplFileInfo; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Mailer\MailerInterface; use Symfony\Component\Mime\Email; -use Symfony\Component\Security\Core\Security; use Symfony\Contracts\Translation\TranslatorInterface; class CourseService diff --git a/src/CoreBundle/Service/EventLoggerService.php b/src/CoreBundle/Service/EventLoggerService.php index 090889f4f3..495ac2935f 100644 --- a/src/CoreBundle/Service/EventLoggerService.php +++ b/src/CoreBundle/Service/EventLoggerService.php @@ -11,7 +11,7 @@ use Chamilo\CoreBundle\ServiceHelper\CidReqHelper; use DateTime; use DateTimeZone; use Doctrine\ORM\EntityManagerInterface; -use Symfony\Component\Security\Core\Security; +use Symfony\Bundle\SecurityBundle\Security; class EventLoggerService { diff --git a/src/CoreBundle/ServiceHelper/TicketProjectHelper.php b/src/CoreBundle/ServiceHelper/TicketProjectHelper.php index e95aba07b7..4be23fdabf 100644 --- a/src/CoreBundle/ServiceHelper/TicketProjectHelper.php +++ b/src/CoreBundle/ServiceHelper/TicketProjectHelper.php @@ -7,7 +7,7 @@ declare(strict_types=1); namespace Chamilo\CoreBundle\ServiceHelper; use Chamilo\CoreBundle\Settings\SettingsManager; -use Symfony\Component\Security\Core\Security; +use Symfony\Bundle\SecurityBundle\Security; use const JSON_ERROR_NONE; diff --git a/src/CoreBundle/State/CCalendarEventProcessor.php b/src/CoreBundle/State/CCalendarEventProcessor.php index 74a7852083..847dce2921 100644 --- a/src/CoreBundle/State/CCalendarEventProcessor.php +++ b/src/CoreBundle/State/CCalendarEventProcessor.php @@ -13,7 +13,7 @@ use Chamilo\CoreBundle\Entity\User; use Chamilo\CoreBundle\Settings\SettingsManager; use Chamilo\CourseBundle\Entity\CCalendarEvent; use Exception; -use Symfony\Component\Security\Core\Security; +use Symfony\Bundle\SecurityBundle\Security; /** * @implements ProcessorInterface diff --git a/src/CoreBundle/State/CStudentPublicationPostProcessor.php b/src/CoreBundle/State/CStudentPublicationPostProcessor.php index ad60fc41c0..29ec1bd893 100644 --- a/src/CoreBundle/State/CStudentPublicationPostProcessor.php +++ b/src/CoreBundle/State/CStudentPublicationPostProcessor.php @@ -19,8 +19,8 @@ use DateTime; use DateTimeZone; use Doctrine\ORM\EntityManagerInterface; use GradebookUtils; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Routing\RouterInterface; -use Symfony\Component\Security\Core\Security; use Symfony\Contracts\Translation\TranslatorInterface; class CStudentPublicationPostProcessor implements ProcessorInterface diff --git a/src/CoreBundle/State/CToolProvider.php b/src/CoreBundle/State/CToolProvider.php index eeccd58e7b..7b47fe3cc6 100644 --- a/src/CoreBundle/State/CToolProvider.php +++ b/src/CoreBundle/State/CToolProvider.php @@ -17,8 +17,8 @@ use Chamilo\CoreBundle\Tool\ToolChain; use Chamilo\CoreBundle\Traits\CourseFromRequestTrait; use Chamilo\CourseBundle\Entity\CTool; use Doctrine\ORM\EntityManagerInterface; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\RequestStack; -use Symfony\Component\Security\Core\Security; /** * @template-implements ProviderInterface diff --git a/src/CoreBundle/State/CalendarEventProvider.php b/src/CoreBundle/State/CalendarEventProvider.php index 04f7dfc85b..5fd3a2186b 100644 --- a/src/CoreBundle/State/CalendarEventProvider.php +++ b/src/CoreBundle/State/CalendarEventProvider.php @@ -14,8 +14,8 @@ use Chamilo\CoreBundle\Entity\User; use Chamilo\CoreBundle\Repository\SessionRepository; use Chamilo\CoreBundle\ServiceHelper\AccessUrlHelper; use Chamilo\CoreBundle\Settings\SettingsManager; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\RequestStack; -use Symfony\Component\Security\Core\Security; /** * @template-implements ProviderInterface diff --git a/src/CoreBundle/State/UsergroupPostProcessor.php b/src/CoreBundle/State/UsergroupPostProcessor.php index 1c3453a989..0e15234bd7 100644 --- a/src/CoreBundle/State/UsergroupPostProcessor.php +++ b/src/CoreBundle/State/UsergroupPostProcessor.php @@ -9,8 +9,8 @@ use ApiPlatform\State\ProcessorInterface; use Chamilo\CoreBundle\Entity\Usergroup; use Chamilo\CoreBundle\Entity\UsergroupRelUser; use Doctrine\ORM\EntityManagerInterface; +use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\RequestStack; -use Symfony\Component\Security\Core\Security; class UsergroupPostProcessor implements ProcessorInterface { diff --git a/src/CoreBundle/Tool/ToolChain.php b/src/CoreBundle/Tool/ToolChain.php index 4249e05a48..687f48218e 100644 --- a/src/CoreBundle/Tool/ToolChain.php +++ b/src/CoreBundle/Tool/ToolChain.php @@ -15,7 +15,7 @@ use Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter; use Chamilo\CoreBundle\Settings\SettingsManager; use Chamilo\CourseBundle\Entity\CTool; use Doctrine\ORM\EntityManagerInterface; -use Symfony\Component\Security\Core\Security; +use Symfony\Bundle\SecurityBundle\Security; /** * Class ToolChain. diff --git a/src/LtiBundle/Controller/AdminController.php b/src/LtiBundle/Controller/AdminController.php index 71a3b4f735..4e87885aa8 100644 --- a/src/LtiBundle/Controller/AdminController.php +++ b/src/LtiBundle/Controller/AdminController.php @@ -15,7 +15,7 @@ use Doctrine\Persistence\ManagerRegistry; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; /** * Class AdminController. @@ -61,7 +61,7 @@ class AdminController extends BaseController return $this->render( '@ChamiloCore/Lti/admin_form.html.twig', [ - 'form' => $form->createView(), + 'form' => $form, ] ); } @@ -101,7 +101,7 @@ class AdminController extends BaseController return $this->render( '@ChamiloCore/Lti/admin_form.html.twig', [ - 'form' => $form->createView(), + 'form' => $form, ] ); } diff --git a/src/LtiBundle/Controller/CourseController.php b/src/LtiBundle/Controller/CourseController.php index 52857c38b5..e2ed25aca0 100644 --- a/src/LtiBundle/Controller/CourseController.php +++ b/src/LtiBundle/Controller/CourseController.php @@ -30,7 +30,7 @@ use OAuthSignatureMethod_HMAC_SHA1; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use UserManager; @@ -70,7 +70,7 @@ class CourseController extends ToolBaseController 'title' => $this->trans('Edit external tool'), 'added_tools' => [], 'global_tools' => [], - 'form' => $form->createView(), + 'form' => $form, 'course' => $course, ] ); @@ -434,7 +434,7 @@ class CourseController extends ToolBaseController 'parent' => null, 'course' => null, ]), - 'form' => $form->createView(), + 'form' => $form, 'course' => $course, 'actions' => $actions, ] diff --git a/src/LtiBundle/Controller/ServiceController.php b/src/LtiBundle/Controller/ServiceController.php index b6c7d45a2a..9b76f22baf 100644 --- a/src/LtiBundle/Controller/ServiceController.php +++ b/src/LtiBundle/Controller/ServiceController.php @@ -18,7 +18,7 @@ use OAuthUtil; use SimpleXMLElement; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Symfony\Contracts\Translation\TranslatorInterface; class ServiceController extends BaseController