dev: Make Doctrine entities mapping explicit

Reference: https://symfony.com/blog/new-in-symfony-7-1-mapped-route-parameters
Probesys · Jul 4, 2024 · 56f709c · 56f709c
1 parent 6d02919
commit 56f709c
Show file tree

Hide file tree

Showing 24 changed files with 68 additions and 57 deletions.
diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml
@@ -30,7 +30,7 @@ doctrine:
             string_functions:
                 JSON_CONTAINS: App\Doctrine\Functions\JsonContains
         controller_resolver:
-            auto_mapping: true
+            auto_mapping: false
 
 when@test:
     doctrine:

diff --git a/src/Controller/Contracts/AlertsController.php b/src/Controller/Contracts/AlertsController.php
@@ -16,7 +16,7 @@
 
 class AlertsController extends BaseController
 {
-    #[Route('/contracts/{uid}/alerts/edit', name: 'edit contract alerts', methods: ['GET', 'HEAD'])]
+    #[Route('/contracts/{uid:contract}/alerts/edit', name: 'edit contract alerts', methods: ['GET', 'HEAD'])]
     public function edit(
         Contract $contract,
     ): Response {
@@ -32,7 +32,7 @@ public function edit(
         ]);
     }
 
-    #[Route('/contracts/{uid}/alerts/edit', name: 'update contract alerts', methods: ['POST'])]
+    #[Route('/contracts/{uid:contract}/alerts/edit', name: 'update contract alerts', methods: ['POST'])]
     public function update(
         Contract $contract,
         Request $request,

diff --git a/src/Controller/ContractsController.php b/src/Controller/ContractsController.php
@@ -54,7 +54,7 @@ public function index(
         ]);
     }
 
-    #[Route('/contracts/{uid}', name: 'contract', methods: ['GET', 'HEAD'])]
+    #[Route('/contracts/{uid:contract}', name: 'contract', methods: ['GET', 'HEAD'])]
     public function show(Contract $contract): Response
     {
         $organization = $contract->getOrganization();
@@ -67,7 +67,7 @@ public function show(Contract $contract): Response
         ]);
     }
 
-    #[Route('/contracts/{uid}/edit', name: 'edit contract', methods: ['GET', 'HEAD'])]
+    #[Route('/contracts/{uid:contract}/edit', name: 'edit contract', methods: ['GET', 'HEAD'])]
     public function edit(
         Contract $contract,
     ): Response {
@@ -84,7 +84,7 @@ public function edit(
         ]);
     }
 
-    #[Route('/contracts/{uid}/edit', name: 'update contract', methods: ['POST'])]
+    #[Route('/contracts/{uid:contract}/edit', name: 'update contract', methods: ['POST'])]
     public function update(
         Contract $contract,
         Request $request,

diff --git a/src/Controller/MailboxEmailsController.php b/src/Controller/MailboxEmailsController.php
@@ -15,7 +15,7 @@
 
 class MailboxEmailsController extends BaseController
 {
-    #[Route('/mailbox-emails/{uid}/deletion', name: 'delete mailbox email', methods: ['POST'])]
+    #[Route('/mailbox-emails/{uid:mailboxEmail}/deletion', name: 'delete mailbox email', methods: ['POST'])]
     public function delete(
         MailboxEmail $mailboxEmail,
         Request $request,

diff --git a/src/Controller/MailboxesController.php b/src/Controller/MailboxesController.php
@@ -152,7 +152,7 @@ public function create(
         return $this->redirectToRoute('mailboxes');
     }
 
-    #[Route('/mailboxes/{uid}/edit', name: 'edit mailbox', methods: ['GET', 'HEAD'])]
+    #[Route('/mailboxes/{uid:mailbox}/edit', name: 'edit mailbox', methods: ['GET', 'HEAD'])]
     public function edit(Mailbox $mailbox): Response
     {
         $this->denyAccessUnlessGranted('admin:manage:mailboxes');
@@ -169,7 +169,7 @@ public function edit(Mailbox $mailbox): Response
         ]);
     }
 
-    #[Route('/mailboxes/{uid}/edit', name: 'update mailbox', methods: ['POST'])]
+    #[Route('/mailboxes/{uid:mailbox}/edit', name: 'update mailbox', methods: ['POST'])]
     public function update(
         Mailbox $mailbox,
         Request $request,
@@ -264,7 +264,7 @@ public function update(
         ]);
     }
 
-    #[Route('/mailboxes/{uid}/test', name: 'test mailbox', methods: ['POST'])]
+    #[Route('/mailboxes/{uid:mailbox}/test', name: 'test mailbox', methods: ['POST'])]
     public function test(
         Request $request,
         Mailbox $mailbox,
@@ -339,7 +339,7 @@ public function collect(
         return $this->redirectToRoute('mailboxes');
     }
 
-    #[Route('/mailboxes/{uid}/deletion', name: 'delete mailbox', methods: ['POST'])]
+    #[Route('/mailboxes/{uid:mailbox}/deletion', name: 'delete mailbox', methods: ['POST'])]
     public function delete(
         Mailbox $mailbox,
         Request $request,

diff --git a/src/Controller/MessageDocumentsController.php b/src/Controller/MessageDocumentsController.php
@@ -106,7 +106,11 @@ public function create(
         ]);
     }
 
-    #[Route('/messages/documents/{uid}.{extension}', name: 'message document', methods: ['GET', 'HEAD'])]
+    #[Route(
+        '/messages/documents/{uid:messageDocument}.{extension}',
+        name: 'message document',
+        methods: ['GET', 'HEAD']
+    )]
     public function show(
         MessageDocument $messageDocument,
         string $extension,
@@ -170,7 +174,7 @@ public function show(
         );
     }
 
-    #[Route('/messages/documents/{uid}/deletion', name: 'delete message document', methods: ['POST'])]
+    #[Route('/messages/documents/{uid:messageDocument}/deletion', name: 'delete message document', methods: ['POST'])]
     public function delete(
         MessageDocument $messageDocument,
         Request $request,

diff --git a/src/Controller/Organizations/ContractsController.php b/src/Controller/Organizations/ContractsController.php
@@ -19,7 +19,6 @@
 use App\Security\Authorizer;
 use App\Service\ContractTimeAccounting;
 use App\Utils;
-use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
@@ -28,7 +27,7 @@
 
 class ContractsController extends BaseController
 {
-    #[Route('/organizations/{uid}/contracts', name: 'organization contracts', methods: ['GET', 'HEAD'])]
+    #[Route('/organizations/{uid:organization}/contracts', name: 'organization contracts', methods: ['GET', 'HEAD'])]
     public function index(
         Request $request,
         Organization $organization,
@@ -55,7 +54,11 @@ public function index(
         ]);
     }
 
-    #[Route('/organizations/{uid}/contracts/new', name: 'new organization contract', methods: ['GET', 'HEAD'])]
+    #[Route(
+        '/organizations/{uid:organization}/contracts/new',
+        name: 'new organization contract',
+        methods: ['GET', 'HEAD']
+    )]
     public function new(
         Organization $organization,
         Request $request,
@@ -86,7 +89,7 @@ public function new(
         ]);
     }
 
-    #[Route('/organizations/{uid}/contracts/new', name: 'create organization contract', methods: ['POST'])]
+    #[Route('/organizations/{uid:organization}/contracts/new', name: 'create organization contract', methods: ['POST'])]
     public function create(
         Organization $organization,
         Request $request,

diff --git a/src/Controller/Organizations/TicketsController.php b/src/Controller/Organizations/TicketsController.php
@@ -38,7 +38,7 @@
 
 class TicketsController extends BaseController
 {
-    #[Route('/organizations/{uid}/tickets', name: 'organization tickets', methods: ['GET', 'HEAD'])]
+    #[Route('/organizations/{uid:organization}/tickets', name: 'organization tickets', methods: ['GET', 'HEAD'])]
     public function index(
         Organization $organization,
         Request $request,
@@ -119,7 +119,7 @@ public function index(
         ]);
     }
 
-    #[Route('/organizations/{uid}/tickets/new', name: 'new organization ticket', methods: ['GET', 'HEAD'])]
+    #[Route('/organizations/{uid:organization}/tickets/new', name: 'new organization ticket', methods: ['GET', 'HEAD'])]
     public function new(
         Organization $organization,
         ActorsLister $actorsLister,
@@ -152,7 +152,7 @@ public function new(
         ]);
     }
 
-    #[Route('/organizations/{uid}/tickets/new', name: 'create organization ticket', methods: ['POST'])]
+    #[Route('/organizations/{uid:organization}/tickets/new', name: 'create organization ticket', methods: ['POST'])]
     public function create(
         Organization $organization,
         Request $request,

diff --git a/src/Controller/Organizations/UsersController.php b/src/Controller/Organizations/UsersController.php
@@ -14,7 +14,7 @@
 
 class UsersController extends BaseController
 {
-    #[Route('/organizations/{uid}/users', name: 'organization users', methods: ['GET', 'HEAD'])]
+    #[Route('/organizations/{uid:organization}/users', name: 'organization users', methods: ['GET', 'HEAD'])]
     public function index(
         Organization $organization,
         ActorsLister $actorsLister,

diff --git a/src/Controller/OrganizationsController.php b/src/Controller/OrganizationsController.php
@@ -77,7 +77,7 @@ public function create(
         return $this->redirectToRoute('organizations');
     }
 
-    #[Route('/organizations/{uid}', name: 'organization', methods: ['GET', 'HEAD'])]
+    #[Route('/organizations/{uid:organization}', name: 'organization', methods: ['GET', 'HEAD'])]
     public function show(
         Organization $organization,
         Authorizer $authorizer,
@@ -89,7 +89,7 @@ public function show(
         ]);
     }
 
-    #[Route('/organizations/{uid}/settings', name: 'organization settings', methods: ['GET', 'HEAD'])]
+    #[Route('/organizations/{uid:organization}/settings', name: 'organization settings', methods: ['GET', 'HEAD'])]
     public function settings(Organization $organization): Response
     {
         $this->denyAccessUnlessGranted('orga:manage', $organization);
@@ -102,7 +102,7 @@ public function settings(Organization $organization): Response
         ]);
     }
 
-    #[Route('/organizations/{uid}/settings', name: 'update organization', methods: ['POST'])]
+    #[Route('/organizations/{uid:organization}/settings', name: 'update organization', methods: ['POST'])]
     public function update(
         Organization $organization,
         Request $request,
@@ -133,7 +133,7 @@ public function update(
         ]);
     }
 
-    #[Route('/organizations/{uid}/deletion', name: 'delete organization', methods: ['POST'])]
+    #[Route('/organizations/{uid:organization}/deletion', name: 'delete organization', methods: ['POST'])]
     public function delete(
         Organization $organization,
         Request $request,

diff --git a/src/Controller/RolesController.php b/src/Controller/RolesController.php
@@ -163,7 +163,7 @@ public function create(
         return $this->redirectToRoute('roles');
     }
 
-    #[Route('/roles/{uid}/edit', name: 'edit role', methods: ['GET', 'HEAD'])]
+    #[Route('/roles/{uid:role}/edit', name: 'edit role', methods: ['GET', 'HEAD'])]
     public function edit(Role $role): Response
     {
         $this->denyAccessUnlessGranted('admin:manage:roles');
@@ -182,7 +182,7 @@ public function edit(Role $role): Response
         ]);
     }
 
-    #[Route('/roles/{uid}/edit', name: 'update role', methods: ['POST'])]
+    #[Route('/roles/{uid:role}/edit', name: 'update role', methods: ['POST'])]
     public function update(
         Role $role,
         Request $request,
@@ -266,7 +266,7 @@ public function update(
         return $this->redirectToRoute('roles');
     }
 
-    #[Route('/roles/{uid}/deletion', name: 'delete role', methods: ['POST'])]
+    #[Route('/roles/{uid:role}/deletion', name: 'delete role', methods: ['POST'])]
     public function delete(
         Role $role,
         Request $request,

diff --git a/src/Controller/Teams/AgentsController.php b/src/Controller/Teams/AgentsController.php
@@ -22,7 +22,7 @@
 
 class AgentsController extends BaseController
 {
-    #[Route('/teams/{uid}/agents/new', name: 'new team agent', methods: ['GET', 'HEAD'])]
+    #[Route('/teams/{uid:team}/agents/new', name: 'new team agent', methods: ['GET', 'HEAD'])]
     public function new(
         Team $team,
         ActorsLister $actorsLister,
@@ -41,7 +41,7 @@ public function new(
         ]);
     }
 
-    #[Route('/teams/{uid}/agents/new', name: 'add team agent', methods: ['POST'])]
+    #[Route('/teams/{uid:team}/agents/new', name: 'add team agent', methods: ['POST'])]
     public function add(
         Team $team,
         Request $request,
@@ -103,7 +103,7 @@ public function add(
         ]);
     }
 
-    #[Route('/teams/{uid}/agents/deletion', name: 'remove team agent', methods: ['POST'])]
+    #[Route('/teams/{uid:team}/agents/deletion', name: 'remove team agent', methods: ['POST'])]
     public function remove(
         Team $team,
         Request $request,

diff --git a/src/Controller/Teams/AuthorizationsController.php b/src/Controller/Teams/AuthorizationsController.php
@@ -23,7 +23,7 @@
 
 class AuthorizationsController extends BaseController
 {
-    #[Route('/teams/{uid}/authorizations/new', name: 'new team authorization', methods: ['GET', 'HEAD'])]
+    #[Route('/teams/{uid:team}/authorizations/new', name: 'new team authorization', methods: ['GET', 'HEAD'])]
     public function new(
         Team $team,
         OrganizationRepository $organizationRepository,
@@ -47,7 +47,7 @@ public function new(
         ]);
     }
 
-    #[Route('/teams/{uid}/authorizations/new', name: 'create team authorization', methods: ['POST'])]
+    #[Route('/teams/{uid:team}/authorizations/new', name: 'create team authorization', methods: ['POST'])]
     public function create(
         Team $team,
         Request $request,
@@ -108,7 +108,11 @@ public function create(
         ]);
     }
 
-    #[Route('/team-authorizations/{uid}/deletion', name: 'delete team authorization', methods: ['POST'])]
+    #[Route(
+        '/team-authorizations/{uid:teamAuthorization}/deletion',
+        name: 'delete team authorization',
+        methods: ['POST']
+    )]
     public function delete(
         TeamAuthorization $teamAuthorization,
         Request $request,

diff --git a/src/Controller/TeamsController.php b/src/Controller/TeamsController.php
@@ -71,7 +71,7 @@ public function create(
         ]);
     }
 
-    #[Route('/teams/{uid}', name: 'team', methods: ['GET', 'HEAD'])]
+    #[Route('/teams/{uid:team}', name: 'team', methods: ['GET', 'HEAD'])]
     public function show(
         Team $team,
         UserSorter $userSorter,
@@ -92,7 +92,7 @@ public function show(
         ]);
     }
 
-    #[Route('/teams/{uid}/edit', name: 'edit team', methods: ['GET', 'HEAD'])]
+    #[Route('/teams/{uid:team}/edit', name: 'edit team', methods: ['GET', 'HEAD'])]
     public function edit(Team $team): Response
     {
         $this->denyAccessUnlessGranted('admin:manage:agents');
@@ -105,7 +105,7 @@ public function edit(Team $team): Response
         ]);
     }
 
-    #[Route('/teams/{uid}/edit', name: 'update team', methods: ['POST'])]
+    #[Route('/teams/{uid:team}/edit', name: 'update team', methods: ['POST'])]
     public function update(
         Team $team,
         Request $request,
@@ -131,7 +131,7 @@ public function update(
         ]);
     }
 
-    #[Route('/teams/{uid}/deletion', name: 'delete team', methods: ['POST'])]
+    #[Route('/teams/{uid:team}/deletion', name: 'delete team', methods: ['POST'])]
     public function delete(
         Team $team,
         Request $request,

diff --git a/src/Controller/Tickets/ActorsController.php b/src/Controller/Tickets/ActorsController.php
@@ -25,7 +25,7 @@
 
 class ActorsController extends BaseController
 {
-    #[Route('/tickets/{uid}/actors/edit', name: 'edit ticket actors', methods: ['GET', 'HEAD'])]
+    #[Route('/tickets/{uid:ticket}/actors/edit', name: 'edit ticket actors', methods: ['GET', 'HEAD'])]
     public function edit(
         Ticket $ticket,
         ActorsLister $actorsLister,
@@ -62,7 +62,7 @@ public function edit(
         ]);
     }
 
-    #[Route('/tickets/{uid}/actors/edit', name: 'update ticket actors', methods: ['POST'])]
+    #[Route('/tickets/{uid:ticket}/actors/edit', name: 'update ticket actors', methods: ['POST'])]
     public function update(
         Ticket $ticket,
         Request $request,

diff --git a/src/Controller/Tickets/ContractsController.php b/src/Controller/Tickets/ContractsController.php
@@ -22,7 +22,7 @@
 
 class ContractsController extends BaseController
 {
-    #[Route('/tickets/{uid}/contracts/edit', name: 'edit ticket contracts', methods: ['GET', 'HEAD'])]
+    #[Route('/tickets/{uid:ticket}/contracts/edit', name: 'edit ticket contracts', methods: ['GET', 'HEAD'])]
     public function edit(
         Ticket $ticket,
         ContractRepository $contractRepository,
@@ -47,7 +47,7 @@ public function edit(
         ]);
     }
 
-    #[Route('/tickets/{uid}/contracts/edit', name: 'update ticket contracts', methods: ['POST'])]
+    #[Route('/tickets/{uid:ticket}/contracts/edit', name: 'update ticket contracts', methods: ['POST'])]
     public function update(
         Ticket $ticket,
         Request $request,

diff --git a/src/Controller/Tickets/MessagesController.php b/src/Controller/Tickets/MessagesController.php
@@ -33,7 +33,7 @@
 
 class MessagesController extends BaseController
 {
-    #[Route('/tickets/{uid}/messages/new', name: 'create ticket message', methods: ['POST'])]
+    #[Route('/tickets/{uid:ticket}/messages/new', name: 'create ticket message', methods: ['POST'])]
     public function create(
         Ticket $ticket,
         Request $request,