From f2922018cec4ccb79ca2e5f0aa0695e129c53f78 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 2 Oct 2025 15:22:42 +0200
Subject: [PATCH] Fix variable name for correct routing

---
 src/Bundle/ChillEventBundle/Controller/EventController.php  | 2 +-
 .../ChillEventBundle/Controller/ParticipationController.php | 4 ++--
 .../Resources/views/Event/confirm_delete.html.twig          | 2 +-
 .../ChillEventBundle/Resources/views/Event/list.html.twig   | 2 +-
 .../Resources/views/Event/page_list.html.twig               | 2 +-
 .../Resources/views/Participation/edit.html.twig            | 2 +-
 .../Resources/views/Participation/new.html.twig             | 2 +-
 src/Bundle/ChillMainBundle/Controller/ExportController.php  | 1 -
 .../ChillMainBundle/Controller/SavedExportController.php    | 6 +++---
 src/Bundle/ChillMainBundle/Entity/Country.php               | 1 -
 src/Bundle/ChillMainBundle/Entity/Scope.php                 | 1 -
 .../ChillPersonBundle/Entity/Person/ResidentialAddress.php  | 1 -
 src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php      | 1 -
 13 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/Bundle/ChillEventBundle/Controller/EventController.php b/src/Bundle/ChillEventBundle/Controller/EventController.php
index 88788e9e4..780548aa1 100644
--- a/src/Bundle/ChillEventBundle/Controller/EventController.php
+++ b/src/Bundle/ChillEventBundle/Controller/EventController.php
@@ -327,7 +327,7 @@ final class EventController extends AbstractController
 
             $this->addFlash('success', $this->translator->trans('The event was updated'));
 
-            return $this->redirectToRoute('chill_event__event_show', ['id' => $event_id]);
+            return $this->redirectToRoute('chill_event__event_show', ['event_id' => $event_id]);
         }
 
         return $this->render('@ChillEvent/Event/edit.html.twig', [
diff --git a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
index 70148bddd..e8ff1ea44 100644
--- a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
+++ b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
@@ -228,7 +228,7 @@ final class ParticipationController extends AbstractController
             }
 
             return $this->redirectToRoute('chill_event__event_show', [
-                'id' => $participation->getEvent()->getId(),
+                'event_id' => $participation->getEvent()->getId(),
             ]);
         }
 
@@ -442,7 +442,7 @@ final class ParticipationController extends AbstractController
             ));
 
             return $this->redirectToRoute('chill_event__event_show', [
-                'id' => $participation->getEvent()->getId(),
+                'event_id' => $participation->getEvent()->getId(),
             ]);
         }
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/confirm_delete.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/confirm_delete.html.twig
index a7666f149..a38d4aefe 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/confirm_delete.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/confirm_delete.html.twig
@@ -12,7 +12,7 @@
             'title'             : 'Delete event'|trans,
             'confirm_question'  : 'Are you sure you want to remove that event ?'|trans,
             'cancel_route'      : activeRouteKey,
-            'cancel_parameters' : { 'id' : id },
+            'cancel_parameters' : { 'event_id' : id },
             'form'              : delete_form
         }
     ) }}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig
index b376050b4..4bdb1f0f8 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig
@@ -34,7 +34,7 @@
                     <ul class="record_actions">
                         <li>
                             {# {% if is_granted('CHILL_EVENT_SEE_DETAILS', event) %} #}
-                            <a href="{{ path('chill_event__event_show', { 'id' : event.id } ) }}" class="btn btn-view">
+                            <a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="btn btn-view">
                                 {{ 'See'|trans }}
                             </a>
                             {# {% endif %} #}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/page_list.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/page_list.html.twig
index 888c698e7..b8b630307 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/page_list.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/page_list.html.twig
@@ -115,7 +115,7 @@ block js %}
                                 href="{{
                                     chill_path_add_return_path(
                                         'chill_event__event_show',
-                                        { id: e.id }
+                                        { event_id: e.id }
                                     )
                                 }}"
                                 class="btn btn-show"
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
index ab6bbdb37..d1995b625 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
@@ -33,7 +33,7 @@
             {% set returnPath = app.request.get('return_path') %}
             {% set returnLabel = app.request.get('return_label') %}
 
-            <a href="{{ returnPath |default( path('chill_event__event_show', { 'id' : participation.event.id } )) }}" class="btn btn-cancel">
+            <a href="{{ returnPath |default( path('chill_event__event_show', { 'event_id' : participation.event.id } )) }}" class="btn btn-cancel">
                 {{ returnLabel |default('Back to the event'|trans) }}
             </a>
         </li>
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
index 180b16c59..620bc7995 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
@@ -34,7 +34,7 @@
 
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
-            <a href="{{ path('chill_event__event_show', { 'id' : participation.event.id } ) }}" class="btn btn-cancel">
+            <a href="{{ path('chill_event__event_show', { 'event_id' : participation.event.id } ) }}" class="btn btn-cancel">
                 {{ 'Back to the event'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillMainBundle/Controller/ExportController.php b/src/Bundle/ChillMainBundle/Controller/ExportController.php
index 4c256c20e..957819995 100644
--- a/src/Bundle/ChillMainBundle/Controller/ExportController.php
+++ b/src/Bundle/ChillMainBundle/Controller/ExportController.php
@@ -40,7 +40,6 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Attribute\Route;
diff --git a/src/Bundle/ChillMainBundle/Controller/SavedExportController.php b/src/Bundle/ChillMainBundle/Controller/SavedExportController.php
index d2ba225ed..216f1bccc 100644
--- a/src/Bundle/ChillMainBundle/Controller/SavedExportController.php
+++ b/src/Bundle/ChillMainBundle/Controller/SavedExportController.php
@@ -50,7 +50,7 @@ final readonly class SavedExportController
         private RequestStack $requestStack,
     ) {}
 
-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/exports/saved/{id}/delete', name: 'chill_main_export_saved_delete')]
+    #[Route(path: '/{_locale}/exports/saved/{id}/delete', name: 'chill_main_export_saved_delete')]
     public function delete(#[MapEntity(id: 'id')] SavedExport $savedExport, Request $request): Response
     {
         if (!$this->security->isGranted(SavedExportVoter::DELETE, $savedExport)) {
@@ -186,7 +186,7 @@ final readonly class SavedExportController
         );
     }
 
-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/exports/saved/{id}/edit', name: 'chill_main_export_saved_edit')]
+    #[Route(path: '/{_locale}/exports/saved/{id}/edit', name: 'chill_main_export_saved_edit')]
     public function edit(#[MapEntity(id: 'id')] SavedExport $savedExport, Request $request): Response
     {
         if (!$this->security->isGranted(SavedExportVoter::EDIT, $savedExport)) {
@@ -217,7 +217,7 @@ final readonly class SavedExportController
         );
     }
 
-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/exports/saved/{savedExport}/edit-options/{exportGeneration}', name: 'chill_main_export_saved_options_edit')]
+    #[Route(path: '/{_locale}/exports/saved/{savedExport}/edit-options/{exportGeneration}', name: 'chill_main_export_saved_options_edit')]
     public function updateOptionsFromGeneration(SavedExport $savedExport, ExportGeneration $exportGeneration, Request $request): Response
     {
         if (!$this->security->isGranted(SavedExportVoter::DUPLICATE, $savedExport)) {
diff --git a/src/Bundle/ChillMainBundle/Entity/Country.php b/src/Bundle/ChillMainBundle/Entity/Country.php
index 178871dd0..946733ad3 100644
--- a/src/Bundle/ChillMainBundle/Entity/Country.php
+++ b/src/Bundle/ChillMainBundle/Entity/Country.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Context;
-
 use Symfony\Component\Serializer\Attribute\Groups;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Entity/Scope.php b/src/Bundle/ChillMainBundle/Entity/Scope.php
index af6aadb45..74b47f302 100644
--- a/src/Bundle/ChillMainBundle/Entity/Scope.php
+++ b/src/Bundle/ChillMainBundle/Entity/Scope.php
@@ -15,7 +15,6 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Context;
-
 use Symfony\Component\Serializer\Attribute\DiscriminatorMap;
 use Symfony\Component\Serializer\Attribute\Groups;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php b/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php
index a440c0918..4caa0d404 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php
@@ -18,7 +18,6 @@ use Chill\PersonBundle\Repository\ResidentialAddressRepository;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Context;
-
 use Symfony\Component\Serializer\Attribute\Groups;
 
 #[ORM\Entity(repositoryClass: ResidentialAddressRepository::class)]
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index 2e08672e4..86d7e0f40 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -24,7 +24,6 @@ use Doctrine\Common\Collections\ReadableCollection;
 use Doctrine\ORM\Mapping as ORM;
 use libphonenumber\PhoneNumber;
 use Symfony\Component\Serializer\Attribute\Context;
-
 use Symfony\Component\Serializer\Attribute\DiscriminatorMap;
 use Symfony\Component\Serializer\Attribute\Groups;
 use Symfony\Component\Validator\Constraints as Assert;