From da039d0527ebdfb10569b9c5fcd652b4ef2b9c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Thu, 1 Oct 2026 10:06:32 +0200 Subject: [PATCH] fix: resolve the remaining deprecations reported by phpunit --- .../Admin/ApplicationFormSubmission/CallsController.php | 8 ++++++-- .../ApplicationFormSubmission/CreateTeamerController.php | 8 ++++++-- .../Admin/ApplicationFormSubmission/DeleteController.php | 8 ++++++-- .../Admin/ApplicationFormSubmission/DetailController.php | 8 ++++++-- .../SendFollowUpMailController.php | 8 ++++++-- .../SendReceiptMailController.php | 8 ++++++-- src/Service/Cron/SeasonTaskReminderService.php | 4 ++-- 7 files changed, 38 insertions(+), 14 deletions(-) diff --git a/src/Controller/Admin/ApplicationFormSubmission/CallsController.php b/src/Controller/Admin/ApplicationFormSubmission/CallsController.php index 823273a..0747962 100644 --- a/src/Controller/Admin/ApplicationFormSubmission/CallsController.php +++ b/src/Controller/Admin/ApplicationFormSubmission/CallsController.php @@ -8,6 +8,7 @@ use App\Form\ApplicationFormSubmissionCallsType; use App\Model\ApplicationFormSubmissionCallsDto; use Doctrine\ORM\EntityManagerInterface; use Psr\Log\LoggerInterface; +use Symfony\Bridge\Doctrine\Attribute\MapEntity; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -30,8 +31,11 @@ class CallsController extends AbstractController #[Route('/admin/application-form-submission/calls/{uuid}', name: 'app_admin_application_form_submission_calls', methods: ['POST'])] #[IsGranted('ROLE_TEAM_ADMIN')] - public function index(ApplicationFormSubmission $submission, Request $request): Response - { + public function index( + #[MapEntity(mapping: ['uuid' => 'uuid'])] + ApplicationFormSubmission $submission, + Request $request, + ): Response { $callsDto = new ApplicationFormSubmissionCallsDto($submission); $form = $this->createForm(ApplicationFormSubmissionCallsType::class, $callsDto); diff --git a/src/Controller/Admin/ApplicationFormSubmission/CreateTeamerController.php b/src/Controller/Admin/ApplicationFormSubmission/CreateTeamerController.php index 8424369..8b5e945 100644 --- a/src/Controller/Admin/ApplicationFormSubmission/CreateTeamerController.php +++ b/src/Controller/Admin/ApplicationFormSubmission/CreateTeamerController.php @@ -8,6 +8,7 @@ use App\Model\TeamerProvisioningResult; use App\Service\Teamer\TeamerProvisioner; use App\Service\Teamer\TeamerProvisioningException; use Psr\Log\LoggerInterface; +use Symfony\Bridge\Doctrine\Attribute\MapEntity; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -32,8 +33,11 @@ class CreateTeamerController extends AbstractController #[Route('/admin/application-form-submission/create-teamer/{uuid}', name: 'app_admin_application_form_submission_create_teamer')] #[IsGranted('ROLE_TEAM_ADMIN')] - public function index(ApplicationFormSubmission $submission, Request $request): Response - { + public function index( + #[MapEntity(mapping: ['uuid' => 'uuid'])] + ApplicationFormSubmission $submission, + Request $request, + ): Response { if (false === $request->isMethod(Request::METHOD_POST)) { return $this->render('admin/application_form_submission/modal_create_teamer.html.twig', [ 'submission' => $submission, diff --git a/src/Controller/Admin/ApplicationFormSubmission/DeleteController.php b/src/Controller/Admin/ApplicationFormSubmission/DeleteController.php index aa88109..17b2a78 100644 --- a/src/Controller/Admin/ApplicationFormSubmission/DeleteController.php +++ b/src/Controller/Admin/ApplicationFormSubmission/DeleteController.php @@ -7,6 +7,7 @@ use App\Entity\ApplicationFormSubmission; use App\Htmx\HxRedirectResponse; use Doctrine\ORM\EntityManagerInterface; use Psr\Log\LoggerInterface; +use Symfony\Bridge\Doctrine\Attribute\MapEntity; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -30,8 +31,11 @@ class DeleteController extends AbstractController #[Route('/admin/application-form-submission/delete/{uuid}', name: 'app_admin_application_form_submission_delete')] #[IsGranted('ROLE_TEAM_ADMIN')] - public function index(ApplicationFormSubmission $submission, Request $request): Response - { + public function index( + #[MapEntity(mapping: ['uuid' => 'uuid'])] + ApplicationFormSubmission $submission, + Request $request, + ): Response { if (true === $request->isMethod(Request::METHOD_POST)) { $uuid = $submission->getUuid(); diff --git a/src/Controller/Admin/ApplicationFormSubmission/DetailController.php b/src/Controller/Admin/ApplicationFormSubmission/DetailController.php index 2c834d3..af6f687 100644 --- a/src/Controller/Admin/ApplicationFormSubmission/DetailController.php +++ b/src/Controller/Admin/ApplicationFormSubmission/DetailController.php @@ -6,6 +6,7 @@ use App\Controller\Traits\ReturnUrlTrait; use App\Entity\ApplicationFormSubmission; use App\Form\ApplicationFormSubmissionCallsType; use App\Model\ApplicationFormSubmissionCallsDto; +use Symfony\Bridge\Doctrine\Attribute\MapEntity; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -18,8 +19,11 @@ class DetailController extends AbstractController #[Route('/admin/application-form-submission/detail/{uuid}', name: 'app_admin_application_form_submission_detail')] #[IsGranted('ROLE_TEAM_ADMIN')] - public function index(ApplicationFormSubmission $submission, Request $request): Response - { + public function index( + #[MapEntity(mapping: ['uuid' => 'uuid'])] + ApplicationFormSubmission $submission, + Request $request, + ): Response { // Rendered here, taken by CallsController - the form has no validation to fail, so it // never has to come back to this page with errors. $callsForm = $this->createForm( diff --git a/src/Controller/Admin/ApplicationFormSubmission/SendFollowUpMailController.php b/src/Controller/Admin/ApplicationFormSubmission/SendFollowUpMailController.php index 107e3a9..b963b50 100644 --- a/src/Controller/Admin/ApplicationFormSubmission/SendFollowUpMailController.php +++ b/src/Controller/Admin/ApplicationFormSubmission/SendFollowUpMailController.php @@ -5,6 +5,7 @@ namespace App\Controller\Admin\ApplicationFormSubmission; use App\Email\ApplicationFormSubmissionMailer; use App\Entity\ApplicationFormSubmission; use App\Htmx\HxRedirectResponse; +use Symfony\Bridge\Doctrine\Attribute\MapEntity; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -25,8 +26,11 @@ class SendFollowUpMailController extends AbstractController #[Route('/admin/application-form-submission/send-follow-up/{uuid}', name: 'app_admin_application_form_submission_send_follow_up')] #[IsGranted('ROLE_TEAM_ADMIN')] - public function index(ApplicationFormSubmission $submission, Request $request): Response - { + public function index( + #[MapEntity(mapping: ['uuid' => 'uuid'])] + ApplicationFormSubmission $submission, + Request $request, + ): Response { if (true === $request->isMethod(Request::METHOD_POST)) { $this->mailer->sendFollowUp($submission); diff --git a/src/Controller/Admin/ApplicationFormSubmission/SendReceiptMailController.php b/src/Controller/Admin/ApplicationFormSubmission/SendReceiptMailController.php index d2c5569..fada030 100644 --- a/src/Controller/Admin/ApplicationFormSubmission/SendReceiptMailController.php +++ b/src/Controller/Admin/ApplicationFormSubmission/SendReceiptMailController.php @@ -5,6 +5,7 @@ namespace App\Controller\Admin\ApplicationFormSubmission; use App\Email\ApplicationFormSubmissionMailer; use App\Entity\ApplicationFormSubmission; use App\Htmx\HxRedirectResponse; +use Symfony\Bridge\Doctrine\Attribute\MapEntity; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -24,8 +25,11 @@ class SendReceiptMailController extends AbstractController #[Route('/admin/application-form-submission/send-receipt/{uuid}', name: 'app_admin_application_form_submission_send_receipt')] #[IsGranted('ROLE_TEAM_ADMIN')] - public function index(ApplicationFormSubmission $submission, Request $request): Response - { + public function index( + #[MapEntity(mapping: ['uuid' => 'uuid'])] + ApplicationFormSubmission $submission, + Request $request, + ): Response { if (true === $request->isMethod(Request::METHOD_POST)) { $this->mailer->sendReceipt($submission); diff --git a/src/Service/Cron/SeasonTaskReminderService.php b/src/Service/Cron/SeasonTaskReminderService.php index 9c7aab0..2c55b1e 100644 --- a/src/Service/Cron/SeasonTaskReminderService.php +++ b/src/Service/Cron/SeasonTaskReminderService.php @@ -125,8 +125,8 @@ class SeasonTaskReminderService continue; } - $perTeamer[$seasonAssignment->getId()]['assignment'] = $seasonAssignment; - $perTeamer[$seasonAssignment->getId()]['labels'][] = $task->getTask()->label(); + $perTeamer[$seasonAssignment->getUuid()]['assignment'] = $seasonAssignment; + $perTeamer[$seasonAssignment->getUuid()]['labels'][] = $task->getTask()->label(); } $count = 0;