From 56ad5fed8e2c89854c101eecc4c787c144228171 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 5 Jul 2023 16:56:40 -0500 Subject: [PATCH] Minor: Format code --- .../Controller/CourseController.php | 35 ++++++++++++------- src/CoreBundle/Tool/AbstractTool.php | 12 ++----- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/src/CoreBundle/Controller/CourseController.php b/src/CoreBundle/Controller/CourseController.php index 5ad17674eb..c1ecfc21a5 100644 --- a/src/CoreBundle/Controller/CourseController.php +++ b/src/CoreBundle/Controller/CourseController.php @@ -50,13 +50,16 @@ use UserManager; class CourseController extends ToolBaseController { public function __construct( - private SerializerInterface $serializer + private readonly SerializerInterface $serializer ) { } #[Route('/{cid}/checkLegal.json', name: 'chamilo_core_course_check_legal_json')] - public function checkTermsAndConditionJson(Request $request, LegalRepository $legalTermsRepo, LanguageRepository $languageRepository): Response - { + public function checkTermsAndConditionJson( + Request $request, + LegalRepository $legalTermsRepo, + LanguageRepository $languageRepository + ): Response { /** @var User $user */ $user = $this->getUser(); $course = $this->getCourse(); @@ -109,7 +112,8 @@ class CourseController extends ToolBaseController } $redirect = true; - $allow = ('true' === Container::getSettingsManager()->getSetting('course.allow_public_course_with_no_terms_conditions')); + $allow = 'true' === Container::getSettingsManager() + ->getSetting('course.allow_public_course_with_no_terms_conditions'); if (true === $allow && null !== $course->getVisibility() && COURSE_VISIBILITY_OPEN_WORLD === $course->getVisibility() @@ -144,8 +148,13 @@ 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, CToolRepository $toolRepository, CShortcutRepository $shortcutRepository, ToolChain $toolChain, EntityManagerInterface $em): Response - { + public function indexJson( + Request $request, + CToolRepository $toolRepository, + CShortcutRepository $shortcutRepository, + ToolChain $toolChain, + EntityManagerInterface $em + ): Response { $requestData = json_decode($request->getContent(), true); // Sort behaviour if (!empty($requestData) && isset($requestData['toolItem'])) { @@ -227,8 +236,6 @@ class CourseController extends ToolBaseController $tools = []; $isCourseTeacher = $this->isGranted('ROLE_CURRENT_COURSE_TEACHER'); - - /** @var CTool $item */ foreach ($result as $item) { $toolModel = $toolChain->getToolFromName($item->getTool()->getName()); @@ -389,8 +396,13 @@ class CourseController extends ToolBaseController */ #[Route('/{cid}/settings/{namespace}', name: 'chamilo_core_course_settings')] #[Entity('course', expr: 'repository.find(cid)')] - public function updateSettings(Request $request, Course $course, string $namespace, SettingsCourseManager $manager, SettingsFormFactory $formFactory): Response - { + public function updateSettings( + Request $request, + Course $course, + string $namespace, + SettingsCourseManager $manager, + SettingsFormFactory $formFactory + ): Response { $this->denyAccessUnlessGranted(CourseVoter::VIEW, $course); $schemaAlias = $manager->convertNameSpaceToService($namespace); @@ -443,7 +455,6 @@ class CourseController extends ToolBaseController /** @var ?User $user */ $user = $this->getUser(); - /** @var EntityRepository $fieldsRepo */ $fieldsRepo = $em->getRepository(ExtraField::class); /** @var TagRepository $tagRepo */ $tagRepo = $em->getRepository(Tag::class); @@ -747,7 +758,7 @@ class CourseController extends ToolBaseController } } - /* SWITCH TO A DIFFERENT HOMEPAGE VIEW + /* SWITCH TO A DIFFERENT HOMEPAGE VIEW the setting homepage_view is adjustable through the platform administration section */ if (!empty($autoLaunchWarning)) { diff --git a/src/CoreBundle/Tool/AbstractTool.php b/src/CoreBundle/Tool/AbstractTool.php index cac98a189f..0de370ccaa 100644 --- a/src/CoreBundle/Tool/AbstractTool.php +++ b/src/CoreBundle/Tool/AbstractTool.php @@ -11,19 +11,13 @@ use Symfony\Component\Serializer\Annotation\Groups; abstract class AbstractTool { - /** - * @Groups({"ctool:read"}) - */ + #[Groups(['ctool:read'])] protected string $name; - /** - * @Groups({"ctool:read"}) - */ + #[Groups(['ctool:read'])] protected string $nameToShow = ''; - /** - * @Groups({"ctool:read"}) - */ + #[Groups(['ctool:read'])] protected string $icon = ''; protected string $category = ''; protected string $link;