From 7a9e7579100be1ed8b4abaf107903039694e42ff Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Fri, 27 Aug 2021 19:24:22 +0700 Subject: [PATCH] php-cs-fixer run with @Symfony rules --- lib/Admin/Controller/ApiClient/Audit.php | 3 ++- lib/Admin/Controller/ApiClient/Delete.php | 3 ++- lib/Admin/Controller/ApiClient/Download.php | 3 ++- lib/Admin/Controller/ApiClient/Main.php | 3 ++- lib/Admin/Controller/ApiClient/Report.php | 3 ++- lib/Admin/Controller/Cron/Audit.php | 3 ++- lib/Admin/Controller/Cron/Delete.php | 3 ++- lib/Admin/Controller/Cron/Download.php | 3 ++- lib/Admin/Controller/Cron/Get.php | 3 ++- lib/Admin/Controller/Cron/Main.php | 3 ++- lib/Admin/Controller/Cron/Put.php | 3 ++- lib/Admin/Controller/Cron/Report.php | 3 ++- lib/Admin/Controller/Cron/Run.php | 3 ++- lib/Admin/Controller/DashboardController.php | 2 +- lib/Admin/Controller/Group/Audit.php | 3 ++- lib/Admin/Controller/Group/Delete.php | 3 ++- lib/Admin/Controller/Group/Download.php | 3 ++- lib/Admin/Controller/Group/Get.php | 3 ++- lib/Admin/Controller/Group/Main.php | 3 ++- lib/Admin/Controller/Group/Permission.php | 3 ++- lib/Admin/Controller/Group/PermissionPut.php | 3 ++- lib/Admin/Controller/Group/Put.php | 3 ++- lib/Admin/Controller/LoginController.php | 2 +- lib/Admin/Controller/Me/CreateApiClient.php | 3 ++- lib/Admin/Controller/Me/DeleteApiClient.php | 6 +++--- lib/Admin/Controller/Me/Profile.php | 6 +++--- lib/Admin/Controller/Media/Audit.php | 3 ++- lib/Admin/Controller/Media/Delete.php | 3 ++- lib/Admin/Controller/Media/Download.php | 3 ++- lib/Admin/Controller/Media/Get.php | 3 ++- lib/Admin/Controller/Media/Main.php | 3 ++- lib/Admin/Controller/Menu/Audit.php | 3 ++- lib/Admin/Controller/Menu/Delete.php | 3 ++- lib/Admin/Controller/Menu/Download.php | 3 ++- lib/Admin/Controller/Menu/Get.php | 3 ++- lib/Admin/Controller/Menu/Main.php | 3 ++- lib/Admin/Controller/Menu/Put.php | 3 ++- lib/Admin/Controller/Setting/Audit.php | 3 ++- lib/Admin/Controller/Setting/Delete.php | 3 ++- lib/Admin/Controller/Setting/Download.php | 3 ++- lib/Admin/Controller/Setting/Get.php | 3 ++- lib/Admin/Controller/Setting/Main.php | 3 ++- lib/Admin/Controller/Setting/Put.php | 3 ++- lib/Admin/Controller/User/Audit.php | 3 ++- lib/Admin/Controller/User/Delete.php | 3 ++- lib/Admin/Controller/User/Download.php | 3 ++- lib/Admin/Controller/User/Get.php | 3 ++- lib/Admin/Controller/User/Main.php | 3 ++- lib/Admin/Controller/User/Put.php | 3 ++- lib/Audit/AuditItem.php | 2 +- lib/Entity/ApiClient.php | 5 ++--- lib/Entity/Cron.php | 5 ++--- lib/Entity/Group.php | 5 ++--- lib/Entity/Media.php | 3 +-- lib/Entity/Menu.php | 5 ++--- lib/Entity/Permission.php | 3 +-- lib/Entity/Setting.php | 5 ++--- lib/Entity/User.php | 7 +++---- lib/Form/MenuType.php | 2 +- lib/Form/UserType.php | 4 ++-- lib/Generator/GeneratorFactory.php | 2 +- lib/Pagination/Paginator.php | 3 ++- lib/Repository/AbstractRepository.php | 2 +- lib/Repository/GroupRepository.php | 2 +- lib/Repository/MenuRepository.php | 2 +- lib/Repository/PasswordHistoryRepository.php | 2 +- lib/Repository/UserRepository.php | 2 +- lib/Security/AdminAuthenticator.php | 2 +- lib/Security/Authorization/Voter.php | 1 + lib/Security/Service/GroupPermissionService.php | 2 +- lib/Security/Service/MenuPermissionService.php | 2 +- lib/Security/Service/MenuService.php | 1 + lib/Security/Service/PermissionService.php | 6 +++--- lib/Security/Service/UserProviderFactory.php | 2 +- lib/Security/Validator/PasswordHistoryValidator.php | 2 +- lib/Setting/SettingGroupFactory.php | 5 ++--- 76 files changed, 137 insertions(+), 98 deletions(-) diff --git a/lib/Admin/Controller/ApiClient/Audit.php b/lib/Admin/Controller/ApiClient/Audit.php index da73c0a9..71482f0a 100755 --- a/lib/Admin/Controller/ApiClient/Audit.php +++ b/lib/Admin/Controller/ApiClient/Audit.php @@ -38,7 +38,7 @@ public function __construct(private ApiClientService $service, private UserServi * @throws InvalidArgumentException */ #[Route(path: 'users/{userId}/api-clients/{id}/audit', name: Audit::class, methods: ['GET'], priority: -255)] - public function __invoke(string $userId, string $id) : Response + public function __invoke(string $userId, string $id): Response { $user = $this->userService->get($userId); if (!$user instanceof UserInterface) { @@ -60,6 +60,7 @@ public function __invoke(string $userId, string $id) : Response $audit = $this->audit->getAudits($entity, $id)->toArray(); $class = new ReflectionClass(ApiClient::class); $context = StringUtil::lowercase($class->getShortName()); + return $this->render(sprintf('%s/audit.html.twig', $context), [ 'page_title' => 'sas.page.audit.view', 'context' => $context, diff --git a/lib/Admin/Controller/ApiClient/Delete.php b/lib/Admin/Controller/ApiClient/Delete.php index 6b5f5de1..3cd28c2e 100755 --- a/lib/Admin/Controller/ApiClient/Delete.php +++ b/lib/Admin/Controller/ApiClient/Delete.php @@ -27,7 +27,7 @@ public function __construct(private ApiClientService $service, private UserServi } #[Route(path: 'users/{userId}/api-clients/{id}/delete', name: Delete::class, methods: ['GET'])] - public function __invoke(string $userId, string $id) : Response + public function __invoke(string $userId, string $id): Response { $user = $this->userService->get($userId); if (!$user instanceof UserInterface) { @@ -43,6 +43,7 @@ public function __invoke(string $userId, string $id) : Response } $this->service->remove($client); $this->addFlash('info', 'sas.page.api_client.deleted'); + return new RedirectResponse($this->generateUrl(Main::class)); } } diff --git a/lib/Admin/Controller/ApiClient/Download.php b/lib/Admin/Controller/ApiClient/Download.php index f69aebfb..115b9e42 100755 --- a/lib/Admin/Controller/ApiClient/Download.php +++ b/lib/Admin/Controller/ApiClient/Download.php @@ -27,7 +27,7 @@ public function __construct(private ApiClientService $service, private UserServi } #[Route(path: '/users/{userId}/api-clients/download', name: Download::class, methods: ['GET'])] - public function __invoke(string $userId) : Response + public function __invoke(string $userId): Response { $user = $this->userService->get($userId); if (!$user instanceof UserInterface) { @@ -46,6 +46,7 @@ public function __invoke(string $userId) : Response $response->headers->set('Content-type', 'text/csv'); $response->headers->set('Content-Disposition', sprintf('attachment; filename="%s_%s.csv"', 'api-clients', date('YmdHis'))); $response->setContent($this->serializer->serialize($this->service->all(), 'csv', ['groups' => 'read'])); + return $response; } } diff --git a/lib/Admin/Controller/ApiClient/Main.php b/lib/Admin/Controller/ApiClient/Main.php index 35d37793..26d0a7d7 100755 --- a/lib/Admin/Controller/ApiClient/Main.php +++ b/lib/Admin/Controller/ApiClient/Main.php @@ -36,7 +36,7 @@ public function __construct( } #[Route(path: '/users/{userId}/api-clients', name: Main::class, methods: ['GET', 'POST'], defaults: ['userId' => '2e0cac45-822f-4b97-95f1-9516ad824ec1'])] - public function __invoke(Request $request, string $userId) : Response + public function __invoke(Request $request, string $userId): Response { $user = $this->userService->get($userId); if (!$user instanceof UserInterface) { @@ -57,6 +57,7 @@ public function __invoke(Request $request, string $userId) : Response } $class = new ReflectionClass(ApiClient::class); $context = StringUtil::lowercase($class->getShortName()); + return $this->render(sprintf('%s/all.html.twig', $context), [ 'page_title' => 'sas.page.api_client.list', 'context' => $context, diff --git a/lib/Admin/Controller/ApiClient/Report.php b/lib/Admin/Controller/ApiClient/Report.php index a6a7730e..3ff8648f 100755 --- a/lib/Admin/Controller/ApiClient/Report.php +++ b/lib/Admin/Controller/ApiClient/Report.php @@ -32,7 +32,7 @@ public function __construct(private ApiClientRequestService $service, private Us } #[Route(path: '/users/{userId}/api-clients/{id}/logs', name: Report::class, methods: ['GET'])] - public function __invoke(Request $request, string $userId, string $id) : Response + public function __invoke(Request $request, string $userId, string $id): Response { $user = $this->userService->get($userId); if (!$user instanceof UserInterface) { @@ -41,6 +41,7 @@ public function __invoke(Request $request, string $userId, string $id) : Respons return new RedirectResponse($this->generateUrl(GetAllUser::class)); } $class = new ReflectionClass(ApiClientRequest::class); + return $this->render('apiclient/report.html.twig', [ 'page_title' => 'sas.page.api_client.report', 'id' => $id, diff --git a/lib/Admin/Controller/Cron/Audit.php b/lib/Admin/Controller/Cron/Audit.php index 7d98e675..883c611f 100755 --- a/lib/Admin/Controller/Cron/Audit.php +++ b/lib/Admin/Controller/Cron/Audit.php @@ -32,7 +32,7 @@ public function __construct(private CronService $service, private AuditService $ * @throws InvalidArgumentException */ #[Route(path: '/crons/{id}/audit', name: Audit::class, methods: ['GET'], priority: -255)] - public function __invoke(string $id) : Response + public function __invoke(string $id): Response { if (!$entity = $this->service->get($id)) { $this->addFlash('error', 'sas.page.cron.not_found'); @@ -44,6 +44,7 @@ public function __invoke(string $id) : Response return new RedirectResponse($this->generateUrl(Main::class)); } + return $this->renderAudit($this->audit->getAudits($entity, $id), new ReflectionClass(Cron::class)); } } diff --git a/lib/Admin/Controller/Cron/Delete.php b/lib/Admin/Controller/Cron/Delete.php index 688aef18..aea795ee 100755 --- a/lib/Admin/Controller/Cron/Delete.php +++ b/lib/Admin/Controller/Cron/Delete.php @@ -24,7 +24,7 @@ public function __construct(private CronService $service) } #[Route(path: '/crons/{id}/delete', name: Delete::class, methods: ['GET'])] - public function __invoke(string $id) : Response + public function __invoke(string $id): Response { $cron = $this->service->get($id); if (!$cron instanceof CronInterface) { @@ -34,6 +34,7 @@ public function __invoke(string $id) : Response } $this->service->remove($cron); $this->addFlash('info', 'sas.page.cron.deleted'); + return new RedirectResponse($this->generateUrl(Main::class)); } } diff --git a/lib/Admin/Controller/Cron/Download.php b/lib/Admin/Controller/Cron/Download.php index 1764fdde..3f7cee67 100755 --- a/lib/Admin/Controller/Cron/Download.php +++ b/lib/Admin/Controller/Cron/Download.php @@ -24,7 +24,7 @@ public function __construct(private CronService $service, private SerializerInte } #[Route(path: '/crons/download', name: Download::class, methods: ['GET'])] - public function __invoke() : Response + public function __invoke(): Response { $records = $this->service->total(); if (10000 < $records) { @@ -37,6 +37,7 @@ public function __invoke() : Response $response->headers->set('Content-type', 'text/csv'); $response->headers->set('Content-Disposition', sprintf('attachment; filename="%s_%s.csv"', 'crons', date('YmdHis'))); $response->setContent($this->serializer->serialize($this->service->all(), 'csv', ['groups' => 'read'])); + return $response; } } diff --git a/lib/Admin/Controller/Cron/Get.php b/lib/Admin/Controller/Cron/Get.php index 2633b188..d81788f8 100755 --- a/lib/Admin/Controller/Cron/Get.php +++ b/lib/Admin/Controller/Cron/Get.php @@ -30,7 +30,7 @@ public function __construct(private CronService $service, private AuditService $ } #[Route(path: '/crons/{id}', name: Get::class, methods: ['GET'])] - public function __invoke(string $id) : Response + public function __invoke(string $id): Response { $cron = $this->service->get($id); if (!$cron instanceof CronInterface) { @@ -42,6 +42,7 @@ public function __invoke(string $id) : Response if ($this->reader->getProvider()->isAuditable(Cron::class)) { $audit = $this->audit->getAudits($cron, $id, 1); } + return $this->renderDetail($audit, new ReflectionClass(Cron::class)); } } diff --git a/lib/Admin/Controller/Cron/Main.php b/lib/Admin/Controller/Cron/Main.php index b6a10b71..e6f46280 100755 --- a/lib/Admin/Controller/Cron/Main.php +++ b/lib/Admin/Controller/Cron/Main.php @@ -28,7 +28,7 @@ public function __construct(private CronService $service, Paginator $paginator) } #[Route(path: '/crons', name: Main::class, methods: ['GET', 'POST'])] - public function __invoke(Request $request) : Response + public function __invoke(Request $request): Response { $cron = new Cron(); if ($request->isMethod(Request::METHOD_POST)) { @@ -52,6 +52,7 @@ public function __invoke(Request $request) : Response $this->addFlash('info', 'sas.page.cron.saved'); } } + return $this->renderList($form, $request, new ReflectionClass(Cron::class)); } } diff --git a/lib/Admin/Controller/Cron/Put.php b/lib/Admin/Controller/Cron/Put.php index 60677831..c5f66d30 100755 --- a/lib/Admin/Controller/Cron/Put.php +++ b/lib/Admin/Controller/Cron/Put.php @@ -25,13 +25,14 @@ public function __construct(private CronService $service) } #[Route(path: '/crons/{id}/edit', name: Put::class, methods: ['GET'], priority: 1)] - public function __invoke(Request $request, string $id) : Response + public function __invoke(Request $request, string $id): Response { $cron = $this->service->get($id); if (!$cron instanceof CronInterface) { $this->addFlash('error', 'sas.page.cron.not_found'); } $this->addFlash('id', $cron->getId()); + return new RedirectResponse($this->generateUrl(Main::class, $request->query->all())); } } diff --git a/lib/Admin/Controller/Cron/Report.php b/lib/Admin/Controller/Cron/Report.php index 217668db..11c567ed 100755 --- a/lib/Admin/Controller/Cron/Report.php +++ b/lib/Admin/Controller/Cron/Report.php @@ -29,10 +29,11 @@ public function __construct(private CronReportService $service, private Paginato } #[Route(path: '/crons/{id}/logs', name: Report::class, methods: ['GET'], priority: -27)] - public function __invoke(Request $request, string $id) : Response + public function __invoke(Request $request, string $id): Response { $class = new ReflectionClass(CronReport::class); $request->query->set($this->settingService->getPerPageField(), 10); + return $this->render('cron/report.html.twig', [ 'page_title' => 'sas.page.cron_report.list', 'id' => $id, diff --git a/lib/Admin/Controller/Cron/Run.php b/lib/Admin/Controller/Cron/Run.php index fc5dd507..5b554612 100755 --- a/lib/Admin/Controller/Cron/Run.php +++ b/lib/Admin/Controller/Cron/Run.php @@ -28,7 +28,7 @@ public function __construct(private CronService $service, private KernelInterfac } #[Route(path: '/crons/{id}/run', name: Run::class, methods: ['GET'], priority: -17)] - public function __invoke(string $id) : Response + public function __invoke(string $id): Response { $cron = $this->service->get($id); if (!$cron instanceof CronInterface) { @@ -49,6 +49,7 @@ public function __invoke(string $id) : Response } else { $this->addFlash('error', 'sas.page.cron.run_failed'); } + return new RedirectResponse($this->generateUrl(Get::class, ['id' => $id])); } } diff --git a/lib/Admin/Controller/DashboardController.php b/lib/Admin/Controller/DashboardController.php index f91dcdb0..67e13bf7 100755 --- a/lib/Admin/Controller/DashboardController.php +++ b/lib/Admin/Controller/DashboardController.php @@ -15,7 +15,7 @@ final class DashboardController extends Base { #[Route(path: '/', name: AdminContext::ADMIN_ROUTE, methods: ['GET'])] - public function __invoke() : Response + public function __invoke(): Response { return $this->render('dashboard/layout.html.twig', ['page_title' => 'sas.page.dashboard']); } diff --git a/lib/Admin/Controller/Group/Audit.php b/lib/Admin/Controller/Group/Audit.php index 444493ea..42e19411 100755 --- a/lib/Admin/Controller/Group/Audit.php +++ b/lib/Admin/Controller/Group/Audit.php @@ -32,7 +32,7 @@ public function __construct(private GroupService $service, private AuditService * @throws InvalidArgumentException */ #[Route(path: '/groups/{id}/audit', name: Audit::class, methods: ['GET'], priority: -255)] - public function __invoke(string $id) : Response + public function __invoke(string $id): Response { if (!$entity = $this->service->get($id)) { $this->addFlash('error', 'sas.page.group.not_found'); @@ -44,6 +44,7 @@ public function __invoke(string $id) : Response return new RedirectResponse($this->generateUrl(Main::class)); } + return $this->renderAudit($this->audit->getAudits($entity, $id), new ReflectionClass(Group::class)); } } diff --git a/lib/Admin/Controller/Group/Delete.php b/lib/Admin/Controller/Group/Delete.php index 8e0282bd..9a23fd03 100755 --- a/lib/Admin/Controller/Group/Delete.php +++ b/lib/Admin/Controller/Group/Delete.php @@ -24,7 +24,7 @@ public function __construct(private GroupService $service) } #[Route(path: '/groups/{id}/delete', name: Delete::class, methods: ['GET'])] - public function __invoke(string $id) : Response + public function __invoke(string $id): Response { $group = $this->service->get($id); if (!$group instanceof GroupInterface) { @@ -34,6 +34,7 @@ public function __invoke(string $id) : Response } $this->service->remove($group); $this->addFlash('info', 'sas.page.group.deleted'); + return new RedirectResponse($this->generateUrl(Main::class)); } } diff --git a/lib/Admin/Controller/Group/Download.php b/lib/Admin/Controller/Group/Download.php index 8c5b46dc..9822b041 100755 --- a/lib/Admin/Controller/Group/Download.php +++ b/lib/Admin/Controller/Group/Download.php @@ -24,7 +24,7 @@ public function __construct(private GroupService $service, private SerializerInt } #[Route(path: '/groups/download', name: Download::class, methods: ['GET'])] - public function __invoke() : Response + public function __invoke(): Response { $records = $this->service->total(); if (10000 < $records) { @@ -37,6 +37,7 @@ public function __invoke() : Response $response->headers->set('Content-type', 'text/csv'); $response->headers->set('Content-Disposition', sprintf('attachment; filename="%s_%s.csv"', 'groups', date('YmdHis'))); $response->setContent($this->serializer->serialize($this->service->all(), 'csv', ['groups' => 'read'])); + return $response; } } diff --git a/lib/Admin/Controller/Group/Get.php b/lib/Admin/Controller/Group/Get.php index d03b7bef..e27cba29 100755 --- a/lib/Admin/Controller/Group/Get.php +++ b/lib/Admin/Controller/Group/Get.php @@ -30,7 +30,7 @@ public function __construct(private GroupService $service, private AuditService } #[Route(path: '/groups/{id}', name: Get::class, methods: ['GET'])] - public function __invoke(string $id) : Response + public function __invoke(string $id): Response { $group = $this->service->get($id); if (!$group instanceof GroupInterface) { @@ -42,6 +42,7 @@ public function __invoke(string $id) : Response if ($this->reader->getProvider()->isAuditable(Group::class)) { $audit = $this->audit->getAudits($group, $id, 1); } + return $this->renderDetail($audit, new ReflectionClass(Group::class)); } } diff --git a/lib/Admin/Controller/Group/Main.php b/lib/Admin/Controller/Group/Main.php index a63c9dea..49d27798 100755 --- a/lib/Admin/Controller/Group/Main.php +++ b/lib/Admin/Controller/Group/Main.php @@ -28,7 +28,7 @@ public function __construct(private GroupService $service, Paginator $paginator) } #[Route(path: '/groups', name: Main::class, methods: ['GET', 'POST'])] - public function __invoke(Request $request) : Response + public function __invoke(Request $request): Response { $group = new Group(); if ($request->isMethod(Request::METHOD_POST)) { @@ -52,6 +52,7 @@ public function __invoke(Request $request) : Response $this->addFlash('info', 'sas.page.group.saved'); } } + return $this->renderList($form, $request, new ReflectionClass(Group::class)); } } diff --git a/lib/Admin/Controller/Group/Permission.php b/lib/Admin/Controller/Group/Permission.php index 1cd6e979..e607d4b0 100755 --- a/lib/Admin/Controller/Group/Permission.php +++ b/lib/Admin/Controller/Group/Permission.php @@ -36,7 +36,7 @@ public function __construct( } #[Route(path: '/groups/{id}/permissions', name: Permission::class, methods: ['GET'])] - public function __invoke(Request $request, string $id) : Response + public function __invoke(Request $request, string $id): Response { $group = $this->groupService->get($id); if (!$group instanceof GroupInterface) { @@ -46,6 +46,7 @@ public function __invoke(Request $request, string $id) : Response } $request->query->set($this->settingService->getPerPageField(), 10); $class = new ReflectionClass(Entity::class); + return $this->render('group/permission.html.twig', [ 'page_title' => 'sas.page.permission.list', 'group' => $group, diff --git a/lib/Admin/Controller/Group/PermissionPut.php b/lib/Admin/Controller/Group/PermissionPut.php index 5cba53d8..54142040 100755 --- a/lib/Admin/Controller/Group/PermissionPut.php +++ b/lib/Admin/Controller/Group/PermissionPut.php @@ -28,7 +28,7 @@ public function __construct(private GroupService $groupService, private Permissi } #[Route(path: '/groups/{groupId}/permissions/{id}', name: PermissionPut::class, methods: ['POST'])] - public function __invoke(Request $request, string $groupId, string $id) : Response + public function __invoke(Request $request, string $groupId, string $id): Response { $group = $this->groupService->get($groupId); if (!$group) { @@ -63,6 +63,7 @@ public function __invoke(Request $request, string $groupId, string $id) : Respon } $this->service->save($permission); $this->addFlash('info', 'sas.page.permission.saved'); + return new RedirectResponse($this->generateUrl(GetPermission::class, ['id' => $groupId])); } } diff --git a/lib/Admin/Controller/Group/Put.php b/lib/Admin/Controller/Group/Put.php index b0ff9164..c7eb0cde 100755 --- a/lib/Admin/Controller/Group/Put.php +++ b/lib/Admin/Controller/Group/Put.php @@ -25,7 +25,7 @@ public function __construct(private GroupService $service) } #[Route(path: '/groups/{id}/edit', name: Put::class, methods: ['GET'], priority: 1)] - public function __invoke(Request $request, string $id) : Response + public function __invoke(Request $request, string $id): Response { $group = $this->service->get($id); if (!$group instanceof GroupInterface) { @@ -34,6 +34,7 @@ public function __invoke(Request $request, string $id) : Response return new RedirectResponse($this->generateUrl(Main::class, $request->query->all())); } $this->addFlash('id', $group->getId()); + return new RedirectResponse($this->generateUrl(Main::class, $request->query->all())); } } diff --git a/lib/Admin/Controller/LoginController.php b/lib/Admin/Controller/LoginController.php index cb049846..5411887b 100755 --- a/lib/Admin/Controller/LoginController.php +++ b/lib/Admin/Controller/LoginController.php @@ -20,7 +20,7 @@ public function __construct(private AuthenticationUtils $authenticationUtils) } #[Route(path: '/login', name: AdminContext::LOGIN_ROUTE, methods: ['GET', 'POST'])] - public function __invoke() : Response + public function __invoke(): Response { return $this->render('layout/login.html.twig', [ 'error' => $this->authenticationUtils->getLastAuthenticationError(), diff --git a/lib/Admin/Controller/Me/CreateApiClient.php b/lib/Admin/Controller/Me/CreateApiClient.php index 05566616..305beebc 100644 --- a/lib/Admin/Controller/Me/CreateApiClient.php +++ b/lib/Admin/Controller/Me/CreateApiClient.php @@ -27,7 +27,7 @@ public function __construct(private UserProviderFactory $userProviderFactory, pr } #[Route(path: '/me/api-clients', name: CreateApiClient::class, methods: ['POST'])] - public function __invoke(Request $request) : Response + public function __invoke(Request $request): Response { $user = $this->getUser(); if (!$user instanceof User) { @@ -51,6 +51,7 @@ public function __invoke(Request $request) : Response $client->setUser($user); $this->addFlash('info', 'sas.page.api_client.saved'); $this->service->save($client); + return new RedirectResponse($this->generateUrl(Profile::class)); } } diff --git a/lib/Admin/Controller/Me/DeleteApiClient.php b/lib/Admin/Controller/Me/DeleteApiClient.php index 9745a0bc..cda1b874 100644 --- a/lib/Admin/Controller/Me/DeleteApiClient.php +++ b/lib/Admin/Controller/Me/DeleteApiClient.php @@ -4,10 +4,9 @@ namespace KejawenLab\ApiSkeleton\Admin\Controller\Me; -use KejawenLab\ApiSkeleton\ApiClient\Model\ApiClientInterface; use KejawenLab\ApiSkeleton\Admin\AdminContext; use KejawenLab\ApiSkeleton\ApiClient\ApiClientService; -use KejawenLab\ApiSkeleton\Security\Model\UserInterface; +use KejawenLab\ApiSkeleton\ApiClient\Model\ApiClientInterface; use KejawenLab\ApiSkeleton\Security\Service\UserProviderFactory; use KejawenLab\ApiSkeleton\Security\User; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; @@ -26,7 +25,7 @@ public function __construct(private UserProviderFactory $userProviderFactory, pr } #[Route(path: '/me/api-clients/{id}/delete', name: DeleteApiClient::class, methods: ['GET'])] - public function __invoke(Request $request, string $id) : Response + public function __invoke(Request $request, string $id): Response { $user = $this->getUser(); if (!$user instanceof User) { @@ -47,6 +46,7 @@ public function __invoke(Request $request, string $id) : Response } $this->service->remove($client); $this->addFlash('info', 'sas.page.api_client.deleted'); + return new RedirectResponse($this->generateUrl(Profile::class)); } } diff --git a/lib/Admin/Controller/Me/Profile.php b/lib/Admin/Controller/Me/Profile.php index 8d1d4e9a..c6d6c6c6 100755 --- a/lib/Admin/Controller/Me/Profile.php +++ b/lib/Admin/Controller/Me/Profile.php @@ -44,13 +44,12 @@ public function __construct( } /** - * * @throws ReflectionException * @throws NoResultException * @throws NonUniqueResultException */ #[Route(path: '/me', name: Profile::class, methods: ['GET', 'POST'], priority: -1)] - public function __invoke(Request $request) : Response + public function __invoke(Request $request): Response { $user = $this->getUser(); if (!$user instanceof User) { @@ -88,6 +87,7 @@ public function __invoke(Request $request) : Response } $class = new ReflectionClass($user::class); $request->query->set($this->setting->getPerPageField(), 17); + return $this->render('profile/view.html.twig', [ 'page_title' => 'sas.page.profile.view', 'context' => StringUtil::lowercase($class->getShortName()), @@ -98,4 +98,4 @@ public function __invoke(Request $request) : Response 'form' => $form->createView(), ]); } -} \ No newline at end of file +} diff --git a/lib/Admin/Controller/Media/Audit.php b/lib/Admin/Controller/Media/Audit.php index 36f2e414..62fe17c4 100755 --- a/lib/Admin/Controller/Media/Audit.php +++ b/lib/Admin/Controller/Media/Audit.php @@ -33,7 +33,7 @@ public function __construct(private MediaService $service, private AuditService * @throws InvalidArgumentException */ #[Route(path: '/medias/{id}/audit', name: Audit::class, methods: ['GET'], priority: 1)] - public function __invoke(string $id) : Response + public function __invoke(string $id): Response { $entity = $this->service->get($id); if (!$entity instanceof MediaInterface) { @@ -46,6 +46,7 @@ public function __invoke(string $id) : Response return new RedirectResponse($this->generateUrl(Main::class)); } + return $this->renderAudit($this->audit->getAudits($entity, $id), new ReflectionClass(Media::class)); } } diff --git a/lib/Admin/Controller/Media/Delete.php b/lib/Admin/Controller/Media/Delete.php index 3682c4d4..52f806fc 100755 --- a/lib/Admin/Controller/Media/Delete.php +++ b/lib/Admin/Controller/Media/Delete.php @@ -24,7 +24,7 @@ public function __construct(private MediaService $service) } #[Route(path: '/medias/{id}/delete', name: Delete::class, methods: ['GET'])] - public function __invoke(string $id) : Response + public function __invoke(string $id): Response { $media = $this->service->get($id); if (!$media instanceof MediaInterface) { @@ -34,6 +34,7 @@ public function __invoke(string $id) : Response } $this->service->remove($media); $this->addFlash('info', 'sas.page.media.deleted'); + return new RedirectResponse($this->generateUrl(Main::class)); } } diff --git a/lib/Admin/Controller/Media/Download.php b/lib/Admin/Controller/Media/Download.php index 26f57ef5..5adba594 100755 --- a/lib/Admin/Controller/Media/Download.php +++ b/lib/Admin/Controller/Media/Download.php @@ -24,7 +24,7 @@ public function __construct(private MediaService $service, private SerializerInt } #[Route(path: '/medias/download', name: Download::class, methods: ['GET'])] - public function __invoke() : Response + public function __invoke(): Response { $records = $this->service->total(); if (10000 < $records) { @@ -37,6 +37,7 @@ public function __invoke() : Response $response->headers->set('Content-type', 'text/csv'); $response->headers->set('Content-Disposition', sprintf('attachment; filename="%s_%s.csv"', 'medias', date('YmdHis'))); $response->setContent($this->serializer->serialize($this->service->all(), 'csv', ['groups' => 'read'])); + return $response; } } diff --git a/lib/Admin/Controller/Media/Get.php b/lib/Admin/Controller/Media/Get.php index 4b77150c..b363a8ee 100755 --- a/lib/Admin/Controller/Media/Get.php +++ b/lib/Admin/Controller/Media/Get.php @@ -29,7 +29,7 @@ public function __construct(private MediaService $service, private PropertyMappi } #[Route(path: '/medias/{path}', name: Get::class, methods: ['GET'], requirements: ['path' => '.+'])] - public function __invoke(Request $request, string $path) : Response + public function __invoke(Request $request, string $path): Response { $path = explode('/', $path); if (MediaInterface::PUBLIC_FIELD === $path[0]) { @@ -54,6 +54,7 @@ public function __invoke(Request $request, string $path) : Response if ($request->query->get('f')) { $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $file->getFilename()); } + return $response; } } diff --git a/lib/Admin/Controller/Media/Main.php b/lib/Admin/Controller/Media/Main.php index 83d54663..249b3ba1 100755 --- a/lib/Admin/Controller/Media/Main.php +++ b/lib/Admin/Controller/Media/Main.php @@ -28,7 +28,7 @@ public function __construct(private MediaService $service, Paginator $paginator) } #[Route(path: '/medias', name: Main::class, methods: ['GET', 'POST'])] - public function __invoke(Request $request) : Response + public function __invoke(Request $request): Response { $media = new Media(); $form = $this->createForm(MediaType::class, $media); @@ -39,6 +39,7 @@ public function __invoke(Request $request) : Response $this->addFlash('info', 'sas.page.media.saved'); } } + return $this->renderList($form, $request, new ReflectionClass(Media::class)); } } diff --git a/lib/Admin/Controller/Menu/Audit.php b/lib/Admin/Controller/Menu/Audit.php index 1cd1e1bf..59191458 100755 --- a/lib/Admin/Controller/Menu/Audit.php +++ b/lib/Admin/Controller/Menu/Audit.php @@ -32,7 +32,7 @@ public function __construct(private MenuService $service, private AuditService $ * @throws InvalidArgumentException */ #[Route(path: '/menus/{id}/audit', name: Audit::class, methods: ['GET'], priority: -255)] - public function __invoke(string $id) : Response + public function __invoke(string $id): Response { if (!$entity = $this->service->get($id)) { $this->addFlash('error', 'sas.page.menu.not_found'); @@ -44,6 +44,7 @@ public function __invoke(string $id) : Response return new RedirectResponse($this->generateUrl(Main::class)); } + return $this->renderAudit($this->audit->getAudits($entity, $id), new ReflectionClass(Menu::class)); } } diff --git a/lib/Admin/Controller/Menu/Delete.php b/lib/Admin/Controller/Menu/Delete.php index 4a33c753..e417570d 100755 --- a/lib/Admin/Controller/Menu/Delete.php +++ b/lib/Admin/Controller/Menu/Delete.php @@ -24,7 +24,7 @@ public function __construct(private MenuService $service) } #[Route(path: '/menus/{id}/delete', name: Delete::class, methods: ['GET'])] - public function __invoke(string $id) : Response + public function __invoke(string $id): Response { $menu = $this->service->get($id); if (!$menu instanceof MenuInterface) { @@ -34,6 +34,7 @@ public function __invoke(string $id) : Response } $this->service->remove($menu); $this->addFlash('info', 'sas.page.menu.deleted'); + return new RedirectResponse($this->generateUrl(Main::class)); } } diff --git a/lib/Admin/Controller/Menu/Download.php b/lib/Admin/Controller/Menu/Download.php index a1b2a0db..8975b6c3 100755 --- a/lib/Admin/Controller/Menu/Download.php +++ b/lib/Admin/Controller/Menu/Download.php @@ -24,7 +24,7 @@ public function __construct(private MenuService $service, private SerializerInte } #[Route(path: '/menus/download', name: Download::class, methods: ['GET'])] - public function __invoke() : Response + public function __invoke(): Response { $records = $this->service->total(); if (10000 < $records) { @@ -37,6 +37,7 @@ public function __invoke() : Response $response->headers->set('Content-type', 'text/csv'); $response->headers->set('Content-Disposition', sprintf('attachment; filename="%s_%s.csv"', 'menus', date('YmdHis'))); $response->setContent($this->serializer->serialize($this->service->all(), 'csv', ['groups' => 'read'])); + return $response; } } diff --git a/lib/Admin/Controller/Menu/Get.php b/lib/Admin/Controller/Menu/Get.php index 6abdf01c..bafa1f01 100755 --- a/lib/Admin/Controller/Menu/Get.php +++ b/lib/Admin/Controller/Menu/Get.php @@ -30,7 +30,7 @@ public function __construct(private MenuService $service, private AuditService $ } #[Route(path: '/menus/{id}', name: Get::class, methods: ['GET'])] - public function __invoke(string $id) : Response + public function __invoke(string $id): Response { $menu = $this->service->get($id); if (!$menu instanceof MenuInterface) { @@ -42,6 +42,7 @@ public function __invoke(string $id) : Response if ($this->reader->getProvider()->isAuditable(Menu::class)) { $audit = $this->audit->getAudits($menu, $id, 1); } + return $this->renderDetail($audit, new ReflectionClass(Menu::class)); } } diff --git a/lib/Admin/Controller/Menu/Main.php b/lib/Admin/Controller/Menu/Main.php index d65c87c2..6f3bf9fe 100755 --- a/lib/Admin/Controller/Menu/Main.php +++ b/lib/Admin/Controller/Menu/Main.php @@ -28,7 +28,7 @@ public function __construct(private MenuService $service, Paginator $paginator) } #[Route(path: '/menus', name: Main::class, methods: ['GET', 'POST'])] - public function __invoke(Request $request) : Response + public function __invoke(Request $request): Response { $menu = new Menu(); if ($request->isMethod(Request::METHOD_POST)) { @@ -54,6 +54,7 @@ public function __invoke(Request $request) : Response $form = $this->createForm(MenuType::class); } } + return $this->renderList($form, $request, new ReflectionClass(Menu::class)); } } diff --git a/lib/Admin/Controller/Menu/Put.php b/lib/Admin/Controller/Menu/Put.php index 444adaf2..03d9424a 100755 --- a/lib/Admin/Controller/Menu/Put.php +++ b/lib/Admin/Controller/Menu/Put.php @@ -25,7 +25,7 @@ public function __construct(private MenuService $service) } #[Route(path: '/menus/{id}/edit', name: Put::class, methods: ['GET'], priority: 1)] - public function __invoke(Request $request, string $id) : Response + public function __invoke(Request $request, string $id): Response { $menu = $this->service->get($id); if (!$menu instanceof MenuInterface) { @@ -34,6 +34,7 @@ public function __invoke(Request $request, string $id) : Response return new RedirectResponse($this->generateUrl(Main::class, $request->query->all())); } $this->addFlash('id', $menu->getId()); + return new RedirectResponse($this->generateUrl(Main::class, $request->query->all())); } } diff --git a/lib/Admin/Controller/Setting/Audit.php b/lib/Admin/Controller/Setting/Audit.php index 74c949b9..cb50a126 100755 --- a/lib/Admin/Controller/Setting/Audit.php +++ b/lib/Admin/Controller/Setting/Audit.php @@ -32,7 +32,7 @@ public function __construct(private SettingService $service, private AuditServic * @throws InvalidArgumentException */ #[Route(path: '/settings/{id}/audit', name: Audit::class, methods: ['GET'], priority: -255)] - public function __invoke(string $id) : Response + public function __invoke(string $id): Response { if (!$entity = $this->service->get($id)) { $this->addFlash('error', 'sas.page.setting.not_found'); @@ -44,6 +44,7 @@ public function __invoke(string $id) : Response return new RedirectResponse($this->generateUrl(Main::class)); } + return $this->renderAudit($this->audit->getAudits($entity, $id), new ReflectionClass(Setting::class)); } } diff --git a/lib/Admin/Controller/Setting/Delete.php b/lib/Admin/Controller/Setting/Delete.php index 850df737..182c89a5 100755 --- a/lib/Admin/Controller/Setting/Delete.php +++ b/lib/Admin/Controller/Setting/Delete.php @@ -24,7 +24,7 @@ public function __construct(private SettingService $service) } #[Route(path: '/settings/{id}/delete', name: Delete::class, methods: ['GET'])] - public function __invoke(string $id) : Response + public function __invoke(string $id): Response { $setting = $this->service->get($id); if (!$setting instanceof SettingInterface) { @@ -39,6 +39,7 @@ public function __invoke(string $id) : Response } $this->service->remove($setting); $this->addFlash('info', 'sas.page.setting.deleted'); + return new RedirectResponse($this->generateUrl(Main::class)); } } diff --git a/lib/Admin/Controller/Setting/Download.php b/lib/Admin/Controller/Setting/Download.php index 7f5377ba..17afa90b 100755 --- a/lib/Admin/Controller/Setting/Download.php +++ b/lib/Admin/Controller/Setting/Download.php @@ -24,7 +24,7 @@ public function __construct(private SettingService $service, private SerializerI } #[Route(path: '/settings/download', name: Download::class, methods: ['GET'])] - public function __invoke() : Response + public function __invoke(): Response { $records = $this->service->total(); if (10000 < $records) { @@ -37,6 +37,7 @@ public function __invoke() : Response $response->headers->set('Content-type', 'text/csv'); $response->headers->set('Content-Disposition', sprintf('attachment; filename="%s_%s.csv"', 'settings', date('YmdHis'))); $response->setContent($this->serializer->serialize($this->service->all(), 'csv', ['groups' => 'read'])); + return $response; } } diff --git a/lib/Admin/Controller/Setting/Get.php b/lib/Admin/Controller/Setting/Get.php index cc80e472..84de4753 100755 --- a/lib/Admin/Controller/Setting/Get.php +++ b/lib/Admin/Controller/Setting/Get.php @@ -30,7 +30,7 @@ public function __construct(private SettingService $service, private AuditServic } #[Route(path: '/settings/{id}', name: Get::class, methods: ['GET'])] - public function __invoke(string $id) : Response + public function __invoke(string $id): Response { $setting = $this->service->get($id); if (!$setting instanceof SettingInterface) { @@ -42,6 +42,7 @@ public function __invoke(string $id) : Response if ($this->reader->getProvider()->isAuditable(Setting::class)) { $audit = $this->audit->getAudits($setting, $id, 1); } + return $this->renderDetail($audit, new ReflectionClass(Setting::class)); } } diff --git a/lib/Admin/Controller/Setting/Main.php b/lib/Admin/Controller/Setting/Main.php index 09421b8b..c12d560e 100755 --- a/lib/Admin/Controller/Setting/Main.php +++ b/lib/Admin/Controller/Setting/Main.php @@ -28,7 +28,7 @@ public function __construct(private SettingService $service, Paginator $paginato } #[Route(path: '/settings', name: Main::class, methods: ['GET', 'POST'])] - public function __invoke(Request $request) : Response + public function __invoke(Request $request): Response { $setting = new Setting(); if ($request->isMethod(Request::METHOD_POST)) { @@ -54,6 +54,7 @@ public function __invoke(Request $request) : Response $form = $this->createForm(SettingType::class); } } + return $this->renderList($form, $request, new ReflectionClass(Setting::class)); } } diff --git a/lib/Admin/Controller/Setting/Put.php b/lib/Admin/Controller/Setting/Put.php index aede85dd..2b3fed9c 100755 --- a/lib/Admin/Controller/Setting/Put.php +++ b/lib/Admin/Controller/Setting/Put.php @@ -25,7 +25,7 @@ public function __construct(private SettingService $service) } #[Route(path: '/settings/{id}/edit', name: Put::class, methods: ['GET'], priority: 1)] - public function __invoke(Request $request, string $id) : Response + public function __invoke(Request $request, string $id): Response { $setting = $this->service->get($id); if (!$setting instanceof SettingInterface) { @@ -34,6 +34,7 @@ public function __invoke(Request $request, string $id) : Response return new RedirectResponse($this->generateUrl(Main::class, $request->query->all())); } $this->addFlash('id', $setting->getId()); + return new RedirectResponse($this->generateUrl(Main::class, $request->query->all())); } } diff --git a/lib/Admin/Controller/User/Audit.php b/lib/Admin/Controller/User/Audit.php index d04d5099..42a78d37 100755 --- a/lib/Admin/Controller/User/Audit.php +++ b/lib/Admin/Controller/User/Audit.php @@ -32,7 +32,7 @@ public function __construct(private UserService $service, private AuditService $ * @throws InvalidArgumentException */ #[Route(path: '/users/{id}/audit', name: Audit::class, methods: ['GET'], priority: -255)] - public function __invoke(string $id) : Response + public function __invoke(string $id): Response { if (!$entity = $this->service->get($id)) { $this->addFlash('error', 'sas.page.user.not_found'); @@ -44,6 +44,7 @@ public function __invoke(string $id) : Response return new RedirectResponse($this->generateUrl(Main::class)); } + return $this->renderAudit($this->audit->getAudits($entity, $id), new ReflectionClass(User::class)); } } diff --git a/lib/Admin/Controller/User/Delete.php b/lib/Admin/Controller/User/Delete.php index b2c3d072..5d6ef913 100755 --- a/lib/Admin/Controller/User/Delete.php +++ b/lib/Admin/Controller/User/Delete.php @@ -24,7 +24,7 @@ public function __construct(private UserService $service) } #[Route(path: '/users/{id}/delete', name: Delete::class, methods: ['GET'])] - public function __invoke(string $id) : Response + public function __invoke(string $id): Response { $user = $this->service->get($id); if (!$user instanceof UserInterface) { @@ -34,6 +34,7 @@ public function __invoke(string $id) : Response } $this->service->remove($user); $this->addFlash('info', 'sas.page.user.deleted'); + return new RedirectResponse($this->generateUrl(Main::class)); } } diff --git a/lib/Admin/Controller/User/Download.php b/lib/Admin/Controller/User/Download.php index 83dac6a5..486ec876 100755 --- a/lib/Admin/Controller/User/Download.php +++ b/lib/Admin/Controller/User/Download.php @@ -24,7 +24,7 @@ public function __construct(private UserService $service, private SerializerInte } #[Route(path: '/users/download', name: Download::class, methods: ['GET'])] - public function __invoke() : Response + public function __invoke(): Response { $records = $this->service->total(); if (10000 < $records) { @@ -37,6 +37,7 @@ public function __invoke() : Response $response->headers->set('Content-type', 'text/csv'); $response->headers->set('Content-Disposition', sprintf('attachment; filename="%s_%s.csv"', 'users', date('YmdHis'))); $response->setContent($this->serializer->serialize($this->service->all(), 'csv', ['groups' => 'read'])); + return $response; } } diff --git a/lib/Admin/Controller/User/Get.php b/lib/Admin/Controller/User/Get.php index 2f7d9d9b..1190bddd 100755 --- a/lib/Admin/Controller/User/Get.php +++ b/lib/Admin/Controller/User/Get.php @@ -30,7 +30,7 @@ public function __construct(private UserService $service, private AuditService $ } #[Route(path: '/users/{id}', name: Get::class, methods: ['GET'])] - public function __invoke(string $id) : Response + public function __invoke(string $id): Response { $user = $this->service->get($id); if (!$user instanceof UserInterface) { @@ -42,6 +42,7 @@ public function __invoke(string $id) : Response if ($this->reader->getProvider()->isAuditable(User::class)) { $audit = $this->audit->getAudits($user, $id, 1); } + return $this->renderDetail($audit, new ReflectionClass(User::class)); } } diff --git a/lib/Admin/Controller/User/Main.php b/lib/Admin/Controller/User/Main.php index 83ebeb51..ac5bc9ad 100755 --- a/lib/Admin/Controller/User/Main.php +++ b/lib/Admin/Controller/User/Main.php @@ -28,7 +28,7 @@ public function __construct(private UserService $service, Paginator $paginator) } #[Route(path: '/users', name: Main::class, methods: ['GET', 'POST'])] - public function __invoke(Request $request) : Response + public function __invoke(Request $request): Response { $user = new User(); if ($request->isMethod(Request::METHOD_POST)) { @@ -54,6 +54,7 @@ public function __invoke(Request $request) : Response $form = $this->createForm(UserType::class); } } + return $this->renderList($form, $request, new ReflectionClass(User::class)); } } diff --git a/lib/Admin/Controller/User/Put.php b/lib/Admin/Controller/User/Put.php index ff9bbc17..913d0160 100755 --- a/lib/Admin/Controller/User/Put.php +++ b/lib/Admin/Controller/User/Put.php @@ -25,7 +25,7 @@ public function __construct(private UserService $service) } #[Route(path: '/users/{id}/edit', name: Put::class, methods: ['GET'], priority: 1)] - public function __invoke(Request $request, string $id) : Response + public function __invoke(Request $request, string $id): Response { $user = $this->service->get($id); if (!$user instanceof UserInterface) { @@ -34,6 +34,7 @@ public function __invoke(Request $request, string $id) : Response return new RedirectResponse($this->generateUrl(Main::class, $request->query->all())); } $this->addFlash('id', $user->getId()); + return new RedirectResponse($this->generateUrl(Main::class, $request->query->all())); } } diff --git a/lib/Audit/AuditItem.php b/lib/Audit/AuditItem.php index f70a62e1..7d767b08 100755 --- a/lib/Audit/AuditItem.php +++ b/lib/Audit/AuditItem.php @@ -11,7 +11,7 @@ final class AuditItem { public function __construct( private string $type, - /** + /* * @var array */ private array $data, diff --git a/lib/Entity/ApiClient.php b/lib/Entity/ApiClient.php index 4c42832b..7193459d 100755 --- a/lib/Entity/ApiClient.php +++ b/lib/Entity/ApiClient.php @@ -4,8 +4,6 @@ namespace KejawenLab\ApiSkeleton\Entity; -use Symfony\Component\Validator\Constraints\Length; -use Symfony\Component\Validator\Constraints\NotBlank; use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\CustomIdGenerator; use Doctrine\ORM\Mapping\Entity; @@ -27,7 +25,8 @@ use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Serializer\Annotation\MaxDepth; -use Symfony\Component\Validator\Constraints as Assert; +use Symfony\Component\Validator\Constraints\Length; +use Symfony\Component\Validator\Constraints\NotBlank; /** * @Gedmo\SoftDeleteable(fieldName="deletedAt") diff --git a/lib/Entity/Cron.php b/lib/Entity/Cron.php index 045add4d..9d688933 100755 --- a/lib/Entity/Cron.php +++ b/lib/Entity/Cron.php @@ -4,8 +4,6 @@ namespace KejawenLab\ApiSkeleton\Entity; -use Symfony\Component\Validator\Constraints\Length; -use Symfony\Component\Validator\Constraints\NotBlank; use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\CustomIdGenerator; use Doctrine\ORM\Mapping\Entity; @@ -25,7 +23,8 @@ use Ramsey\Uuid\UuidInterface; use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; use Symfony\Component\Serializer\Annotation\Groups; -use Symfony\Component\Validator\Constraints as Assert; +use Symfony\Component\Validator\Constraints\Length; +use Symfony\Component\Validator\Constraints\NotBlank; /** * @Gedmo\SoftDeleteable(fieldName="deletedAt") diff --git a/lib/Entity/Group.php b/lib/Entity/Group.php index 8e27734b..35b96638 100755 --- a/lib/Entity/Group.php +++ b/lib/Entity/Group.php @@ -4,8 +4,6 @@ namespace KejawenLab\ApiSkeleton\Entity; -use Symfony\Component\Validator\Constraints\Length; -use Symfony\Component\Validator\Constraints\NotBlank; use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\CustomIdGenerator; use Doctrine\ORM\Mapping\Entity; @@ -23,7 +21,8 @@ use Ramsey\Uuid\UuidInterface; use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; use Symfony\Component\Serializer\Annotation\Groups; -use Symfony\Component\Validator\Constraints as Assert; +use Symfony\Component\Validator\Constraints\Length; +use Symfony\Component\Validator\Constraints\NotBlank; /** * @Gedmo\SoftDeleteable(fieldName="deletedAt") diff --git a/lib/Entity/Media.php b/lib/Entity/Media.php index 9b383f52..6cf267a2 100755 --- a/lib/Entity/Media.php +++ b/lib/Entity/Media.php @@ -4,7 +4,6 @@ namespace KejawenLab\ApiSkeleton\Entity; -use Symfony\Component\Validator\Constraints\NotBlank; use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\CustomIdGenerator; use Doctrine\ORM\Mapping\Entity; @@ -20,7 +19,7 @@ use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; use Symfony\Component\HttpFoundation\File\File; use Symfony\Component\Serializer\Annotation\Groups; -use Symfony\Component\Validator\Constraints as Assert; +use Symfony\Component\Validator\Constraints\NotBlank; use Vich\UploaderBundle\Mapping\Annotation as Vich; /** diff --git a/lib/Entity/Menu.php b/lib/Entity/Menu.php index a68a8cdb..a2263bbb 100755 --- a/lib/Entity/Menu.php +++ b/lib/Entity/Menu.php @@ -4,8 +4,6 @@ namespace KejawenLab\ApiSkeleton\Entity; -use Symfony\Component\Validator\Constraints\Length; -use Symfony\Component\Validator\Constraints\NotBlank; use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\CustomIdGenerator; use Doctrine\ORM\Mapping\Entity; @@ -26,7 +24,8 @@ use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Serializer\Annotation\MaxDepth; -use Symfony\Component\Validator\Constraints as Assert; +use Symfony\Component\Validator\Constraints\Length; +use Symfony\Component\Validator\Constraints\NotBlank; /** * @Gedmo\SoftDeleteable(fieldName="deletedAt") diff --git a/lib/Entity/Permission.php b/lib/Entity/Permission.php index f85a6f3a..c8c19eb6 100755 --- a/lib/Entity/Permission.php +++ b/lib/Entity/Permission.php @@ -4,7 +4,6 @@ namespace KejawenLab\ApiSkeleton\Entity; -use Symfony\Component\Validator\Constraints\NotBlank; use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\CustomIdGenerator; use Doctrine\ORM\Mapping\Entity; @@ -23,7 +22,7 @@ use OpenApi\Annotations as OA; use Ramsey\Uuid\UuidInterface; use Symfony\Component\Serializer\Annotation\Groups; -use Symfony\Component\Validator\Constraints as Assert; +use Symfony\Component\Validator\Constraints\NotBlank; /** * @Gedmo\SoftDeleteable(fieldName="deletedAt") diff --git a/lib/Entity/Setting.php b/lib/Entity/Setting.php index 994188e3..03abba14 100755 --- a/lib/Entity/Setting.php +++ b/lib/Entity/Setting.php @@ -4,8 +4,6 @@ namespace KejawenLab\ApiSkeleton\Entity; -use Symfony\Component\Validator\Constraints\Length; -use Symfony\Component\Validator\Constraints\NotBlank; use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\CustomIdGenerator; use Doctrine\ORM\Mapping\Entity; @@ -23,7 +21,8 @@ use Ramsey\Uuid\UuidInterface; use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; use Symfony\Component\Serializer\Annotation\Groups; -use Symfony\Component\Validator\Constraints as Assert; +use Symfony\Component\Validator\Constraints\Length; +use Symfony\Component\Validator\Constraints\NotBlank; /** * @Gedmo\SoftDeleteable(fieldName="deletedAt") diff --git a/lib/Entity/User.php b/lib/Entity/User.php index 0e4b0913..af4f1dd3 100755 --- a/lib/Entity/User.php +++ b/lib/Entity/User.php @@ -4,9 +4,6 @@ namespace KejawenLab\ApiSkeleton\Entity; -use Symfony\Component\Validator\Constraints\NotBlank; -use Symfony\Component\Validator\Constraints\Length; -use Symfony\Component\Validator\Constraints\Email; use DateTimeImmutable; use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\CustomIdGenerator; @@ -28,7 +25,9 @@ use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; use Symfony\Component\HttpFoundation\File\File; use Symfony\Component\Serializer\Annotation\Groups; -use Symfony\Component\Validator\Constraints as Assert; +use Symfony\Component\Validator\Constraints\Email; +use Symfony\Component\Validator\Constraints\Length; +use Symfony\Component\Validator\Constraints\NotBlank; /** * @Gedmo\SoftDeleteable(fieldName="deletedAt") diff --git a/lib/Form/MenuType.php b/lib/Form/MenuType.php index 7dd6bb60..253bf748 100755 --- a/lib/Form/MenuType.php +++ b/lib/Form/MenuType.php @@ -24,7 +24,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void 'required' => false, 'label' => 'sas.form.field.menu.parent', 'class' => Menu::class, - 'choice_label' => fn($menu): string => sprintf('%s - %s', $menu->getCode(), $menu->getName()), + 'choice_label' => fn ($menu): string => sprintf('%s - %s', $menu->getCode(), $menu->getName()), 'attr' => [ 'class' => 'select2', ], diff --git a/lib/Form/UserType.php b/lib/Form/UserType.php index 1e0aff51..c4cc6e99 100755 --- a/lib/Form/UserType.php +++ b/lib/Form/UserType.php @@ -25,7 +25,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void $builder->add('group', EntityType::class, [ 'required' => true, 'class' => Group::class, - 'choice_label' => fn($group): string => sprintf('%s - %s', $group->getCode(), $group->getName()), + 'choice_label' => fn ($group): string => sprintf('%s - %s', $group->getCode(), $group->getName()), 'label' => 'sas.form.field.user.group', 'attr' => [ 'class' => 'select2', @@ -35,7 +35,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void $builder->add('supervisor', EntityType::class, [ 'required' => false, 'class' => User::class, - 'choice_label' => fn($supervisor): string => sprintf('%s (%s)', $supervisor->getFullName(), $supervisor->getUsername()), + 'choice_label' => fn ($supervisor): string => sprintf('%s (%s)', $supervisor->getFullName(), $supervisor->getUsername()), 'label' => 'sas.form.field.user.supervisor', 'attr' => [ 'class' => 'select2', diff --git a/lib/Generator/GeneratorFactory.php b/lib/Generator/GeneratorFactory.php index 29177b02..8868f3f8 100755 --- a/lib/Generator/GeneratorFactory.php +++ b/lib/Generator/GeneratorFactory.php @@ -14,7 +14,7 @@ final class GeneratorFactory { public function __construct( - /** + /* * @var GeneratorInterface[] */ private iterable $generators diff --git a/lib/Pagination/Paginator.php b/lib/Pagination/Paginator.php index 7d4df8e0..a8f17c40 100755 --- a/lib/Pagination/Paginator.php +++ b/lib/Pagination/Paginator.php @@ -26,7 +26,7 @@ final class Paginator public function __construct( SettingService $setting, - /** + /* * @var QueryExtensionInterface[] */ private iterable $queryExtension, @@ -40,6 +40,7 @@ public function __construct( /** * @throws NonUniqueResultException * @throws NoResultException + * * @return array|array|array */ public function paginate(QueryBuilder $queryBuilder, Request $request, string $class): array diff --git a/lib/Repository/AbstractRepository.php b/lib/Repository/AbstractRepository.php index 41b11949..e90f84de 100755 --- a/lib/Repository/AbstractRepository.php +++ b/lib/Repository/AbstractRepository.php @@ -18,7 +18,7 @@ abstract class AbstractRepository extends ServiceEntityRepository implements Pag protected const MICRO_CACHE = 1; /** - * @return null|mixed + * @return mixed|null */ public function find($id, $lockMode = null, $lockVersion = null) { diff --git a/lib/Repository/GroupRepository.php b/lib/Repository/GroupRepository.php index 1820889c..a8276ec3 100755 --- a/lib/Repository/GroupRepository.php +++ b/lib/Repository/GroupRepository.php @@ -25,7 +25,7 @@ public function __construct(ManagerRegistry $registry) } /** - * @return null|mixed + * @return mixed|null */ public function findByCode(string $code) { diff --git a/lib/Repository/MenuRepository.php b/lib/Repository/MenuRepository.php index 09dc4239..7112e057 100755 --- a/lib/Repository/MenuRepository.php +++ b/lib/Repository/MenuRepository.php @@ -4,8 +4,8 @@ namespace KejawenLab\ApiSkeleton\Repository; -use Iterator; use Doctrine\Persistence\ManagerRegistry; +use Iterator; use KejawenLab\ApiSkeleton\Entity\Menu; use KejawenLab\ApiSkeleton\Security\Model\MenuInterface; use KejawenLab\ApiSkeleton\Security\Model\MenuRepositoryInterface; diff --git a/lib/Repository/PasswordHistoryRepository.php b/lib/Repository/PasswordHistoryRepository.php index eff05fc5..7f8fcb0e 100755 --- a/lib/Repository/PasswordHistoryRepository.php +++ b/lib/Repository/PasswordHistoryRepository.php @@ -4,8 +4,8 @@ namespace KejawenLab\ApiSkeleton\Repository; -use Iterator; use Doctrine\Persistence\ManagerRegistry; +use Iterator; use KejawenLab\ApiSkeleton\Entity\PasswordHistory; use KejawenLab\ApiSkeleton\Security\Model\PasswordHistoryRepositoryInterface; use KejawenLab\ApiSkeleton\Security\Model\UserInterface; diff --git a/lib/Repository/UserRepository.php b/lib/Repository/UserRepository.php index c2014a92..806bec56 100755 --- a/lib/Repository/UserRepository.php +++ b/lib/Repository/UserRepository.php @@ -51,7 +51,7 @@ public function isSupervisor(AppUser $user, AppUser $supervisor): bool return true; } - if ($user->getSupervisor() === null) { + if (null === $user->getSupervisor()) { return $user->getGroup()->getCode() === $this->superAdmin; } diff --git a/lib/Security/AdminAuthenticator.php b/lib/Security/AdminAuthenticator.php index aebb3a91..cfb1d959 100644 --- a/lib/Security/AdminAuthenticator.php +++ b/lib/Security/AdminAuthenticator.php @@ -48,7 +48,7 @@ public function authenticate(Request $request): PassportInterface $request->getSession()->set(Security::LAST_USERNAME, $credentials['username']); return new Passport( - new UserBadge($credentials['username'], fn(string $userIdentifier): User => $this->userProviderFactory->loadUserByUsername($userIdentifier)), + new UserBadge($credentials['username'], fn (string $userIdentifier): User => $this->userProviderFactory->loadUserByUsername($userIdentifier)), new PasswordCredentials($credentials['password']), ); } diff --git a/lib/Security/Authorization/Voter.php b/lib/Security/Authorization/Voter.php index c846a941..763c865c 100755 --- a/lib/Security/Authorization/Voter.php +++ b/lib/Security/Authorization/Voter.php @@ -49,6 +49,7 @@ protected function voteOnAttribute(string $attribute, $subject, TokenInterface $ if (!$permission instanceof PermissionInterface) { return false; } + return match ($attribute) { Permission::ADD => $permission->isAddable(), Permission::EDIT => $permission->isEditable(), diff --git a/lib/Security/Service/GroupPermissionService.php b/lib/Security/Service/GroupPermissionService.php index 0cc62c51..5e47bee7 100755 --- a/lib/Security/Service/GroupPermissionService.php +++ b/lib/Security/Service/GroupPermissionService.php @@ -29,7 +29,7 @@ public function initiate(PermissionableInterface $object): void { foreach ($this->menuRepository->findAll() as $menu) { $permission = $this->permissionRepository->findPermission($object, $menu); - if ($permission === null) { + if (null === $permission) { $permission = new $this->class(); } diff --git a/lib/Security/Service/MenuPermissionService.php b/lib/Security/Service/MenuPermissionService.php index ee278a74..018fea20 100755 --- a/lib/Security/Service/MenuPermissionService.php +++ b/lib/Security/Service/MenuPermissionService.php @@ -29,7 +29,7 @@ public function initiate(PermissionableInterface $object): void { foreach ($this->groupRepository->findAll() as $group) { $permission = $this->permissionRepository->findPermission($group, $object); - if ($permission === null) { + if (null === $permission) { $permission = new $this->class(); } diff --git a/lib/Security/Service/MenuService.php b/lib/Security/Service/MenuService.php index 5b863ac6..e265beb2 100755 --- a/lib/Security/Service/MenuService.php +++ b/lib/Security/Service/MenuService.php @@ -55,6 +55,7 @@ public function hasChildMenu(MenuInterface $menu): bool } $childMenus = $this->permissionRepository->findAllowedChildMenusByGroupAndMenu($group, $menu); + return [] !== iterator_to_array($childMenus, false); } diff --git a/lib/Security/Service/PermissionService.php b/lib/Security/Service/PermissionService.php index e2df9ac7..f8f2d769 100755 --- a/lib/Security/Service/PermissionService.php +++ b/lib/Security/Service/PermissionService.php @@ -36,11 +36,11 @@ public function __construct( PermissionRepositoryInterface $repository, AliasHelper $aliasHelper, private MenuRepositoryInterface $menuRepository, - /** + /* * @var PermissionInitiatorInterface[] */ private iterable $initiators, - /** + /* * @var PermissionRemoverInterface[] */ private iterable $removers, @@ -139,7 +139,7 @@ private function buildMenu(MenuInterface $menu, GroupInterface $group): array $tree['childs'][$key] = $this->buildMenu($permission->getMenu(), $permission->getGroup()); } - $key++; + ++$key; } return $tree; diff --git a/lib/Security/Service/UserProviderFactory.php b/lib/Security/Service/UserProviderFactory.php index 18cb578e..f18fca67 100755 --- a/lib/Security/Service/UserProviderFactory.php +++ b/lib/Security/Service/UserProviderFactory.php @@ -18,7 +18,7 @@ final class UserProviderFactory implements UserProviderInterface { public function __construct( - /** + /* * @var Provider[] */ private iterable $providers, diff --git a/lib/Security/Validator/PasswordHistoryValidator.php b/lib/Security/Validator/PasswordHistoryValidator.php index d228684e..16fa8578 100755 --- a/lib/Security/Validator/PasswordHistoryValidator.php +++ b/lib/Security/Validator/PasswordHistoryValidator.php @@ -42,7 +42,7 @@ public function validate($value, Constraint $constraint): void } $token = $this->tokenStorage->getToken(); - if ($token === null) { + if (null === $token) { throw new UnexpectedValueException($token, TokenInterface::class); } diff --git a/lib/Setting/SettingGroupFactory.php b/lib/Setting/SettingGroupFactory.php index b4c02967..3de76a25 100644 --- a/lib/Setting/SettingGroupFactory.php +++ b/lib/Setting/SettingGroupFactory.php @@ -12,12 +12,11 @@ final class SettingGroupFactory { public function __construct( - /** + /* * @var SettingGroupInterface[] */ private iterable $groups - ) - { + ) { } /**