From 235de976a5796a733b597c3a241fe84204aab774 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Mon, 19 Dec 2022 18:35:10 +0100 Subject: [PATCH] upgrade murph --- config/packages/doctrine.yaml | 4 +- src/Controller/ConferenceAdminController.php | 32 ++------ src/Controller/DashboardAdminController.php | 8 +- src/Controller/DebriefingAdminController.php | 32 ++------ .../EstablishmentAdminController.php | 36 +++------ .../EstablishmentGroupAdminController.php | 32 ++------ .../ExpenseReportAdminController.php | 44 +++-------- .../InterventionAdminController.php | 32 ++------ src/Controller/ProjectAdminController.php | 32 ++------ src/Controller/SpeakerAdminController.php | 32 ++------ src/Controller/TeamContactAdminController.php | 32 ++------ src/Controller/ThemeTypeAdminController.php | 32 ++------ src/Controller/ToolAdminController.php | 32 ++------ src/Entity/AddressTrait.php | 12 +-- src/Entity/Conference.php | 50 ++++--------- src/Entity/Debriefing.php | 40 +++------- src/Entity/Establishment.php | 24 ++---- src/Entity/EstablishmentGroup.php | 26 ++----- src/Entity/Event.php | 40 +++------- src/Entity/ExpenseReport.php | 54 ++++---------- src/Entity/Intervention.php | 74 +++++-------------- src/Entity/Page/EntityPage.php | 4 +- src/Entity/Page/SimplePage.php | 4 +- src/Entity/Project.php | 44 +++-------- src/Entity/Speaker.php | 48 ++++-------- src/Entity/TeamContact.php | 24 ++---- src/Entity/ThemeType.php | 24 ++---- src/Entity/Tool.php | 20 ++--- src/Entity/User.php | 60 +++++---------- 29 files changed, 249 insertions(+), 679 deletions(-) diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index c54a4a2..98560ee 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -12,13 +12,13 @@ doctrine: mappings: App\Core\Entity: is_bundle: false - type: annotation + type: attribute dir: '%kernel.project_dir%/vendor/murph/murph-core/src/core/Entity' prefix: 'App\Core\Entity' alias: App\Core\Entity App\Entity: is_bundle: false - type: annotation + type: attribute dir: '%kernel.project_dir%/src/Entity' prefix: 'App\Entity' alias: App\Entity diff --git a/src/Controller/ConferenceAdminController.php b/src/Controller/ConferenceAdminController.php index eadbae4..172c77b 100644 --- a/src/Controller/ConferenceAdminController.php +++ b/src/Controller/ConferenceAdminController.php @@ -19,65 +19,49 @@ use Symfony\Component\Routing\Annotation\Route; class ConferenceAdminController extends CrudController { - /** - * @Route("/admin/conference/{page}", name="admin_conference_index", methods={"GET"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/conference/{page}', name: 'admin_conference_index', methods: ['GET'], requirements: ['page' => '\d+'])] public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response { return $this->doIndex($page, $query, $request, $session); } - /** - * @Route("/admin/conference/new", name="admin_conference_new", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/conference/new', name: 'admin_conference_new', methods: ['GET', 'POST'])] public function new(Factory $factory, EntityManager $entityManager, Request $request): Response { return $this->doNew($factory->create(), $entityManager, $request); } - /** - * @Route("/admin/conference/show/{entity}", name="admin_conference_show", methods={"GET"}) - */ + #[Route(path: '/admin/conference/show/{entity}', name: 'admin_conference_show', methods: ['GET'])] public function show(Entity $entity): Response { return $this->doShow($entity); } - /** - * @Route("/admin/conference/filter", name="admin_conference_filter", methods={"GET"}) - */ + #[Route(path: '/admin/conference/filter', name: 'admin_conference_filter', methods: ['GET'])] public function filter(Session $session): Response { return $this->doFilter($session); } - /** - * @Route("/admin/conference/edit/{entity}", name="admin_conference_edit", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/conference/edit/{entity}', name: 'admin_conference_edit', methods: ['GET', 'POST'])] public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doEdit($entity, $entityManager, $request); } - /** - * @Route("/admin/conference/sort/{page}", name="admin_conference_sort", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/conference/sort/{page}', name: 'admin_conference_sort', methods: ['POST'], requirements: ['page' => '\d+'])] public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doSort($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/conference/batch/{page}", name="admin_conference_batch", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/conference/batch/{page}', name: 'admin_conference_batch', methods: ['POST'], requirements: ['page' => '\d+'])] public function batch(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doBatch($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/conference/delete/{entity}", name="admin_conference_delete", methods={"DELETE"}) - */ + #[Route(path: '/admin/conference/delete/{entity}', name: 'admin_conference_delete', methods: ['DELETE'])] public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doDelete($entity, $entityManager, $request); diff --git a/src/Controller/DashboardAdminController.php b/src/Controller/DashboardAdminController.php index 72eca0a..2ad1eee 100644 --- a/src/Controller/DashboardAdminController.php +++ b/src/Controller/DashboardAdminController.php @@ -9,9 +9,7 @@ use App\Repository\InterventionRepositoryQuery; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; -/** - * @Route("/admin") - */ +#[Route(path: '/admin')] class DashboardAdminController extends BaseController { protected DebriefingRepositoryQuery $debriefingQuery; @@ -28,9 +26,7 @@ class DashboardAdminController extends BaseController $this->interventionQuery = $interventionQuery; } - /** - * @Route("/", name="admin_dashboard_index") - */ + #[Route(path: '/', name: 'admin_dashboard_index')] public function index(): Response { return $this->render('admin/dashboard.html.twig', [ diff --git a/src/Controller/DebriefingAdminController.php b/src/Controller/DebriefingAdminController.php index 703b56f..24fd6c9 100644 --- a/src/Controller/DebriefingAdminController.php +++ b/src/Controller/DebriefingAdminController.php @@ -18,65 +18,49 @@ use Symfony\Component\Routing\Annotation\Route; class DebriefingAdminController extends CrudController { - /** - * @Route("/admin/debriefing/{page}", name="admin_debriefing_index", methods={"GET"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/debriefing/{page}', name: 'admin_debriefing_index', methods: ['GET'], requirements: ['page' => '\d+'])] public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response { return $this->doIndex($page, $query, $request, $session); } - /** - * @Route("/admin/debriefing/new", name="admin_debriefing_new", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/debriefing/new', name: 'admin_debriefing_new', methods: ['GET', 'POST'])] public function new(Factory $factory, EntityManager $entityManager, Request $request): Response { return $this->doNew($factory->create(), $entityManager, $request); } - /** - * @Route("/admin/debriefing/show/{entity}", name="admin_debriefing_show", methods={"GET"}) - */ + #[Route(path: '/admin/debriefing/show/{entity}', name: 'admin_debriefing_show', methods: ['GET'])] public function show(Entity $entity): Response { return $this->doShow($entity); } - /** - * @Route("/admin/debriefing/filter", name="admin_debriefing_filter", methods={"GET"}) - */ + #[Route(path: '/admin/debriefing/filter', name: 'admin_debriefing_filter', methods: ['GET'])] public function filter(Session $session): Response { return $this->doFilter($session); } - /** - * @Route("/admin/debriefing/edit/{entity}", name="admin_debriefing_edit", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/debriefing/edit/{entity}', name: 'admin_debriefing_edit', methods: ['GET', 'POST'])] public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doEdit($entity, $entityManager, $request); } - /** - * @Route("/admin/debriefing/sort/{page}", name="admin_debriefing_sort", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/debriefing/sort/{page}', name: 'admin_debriefing_sort', methods: ['POST'], requirements: ['page' => '\d+'])] public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doSort($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/debriefing/batch/{page}", name="admin_debriefing_batch", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/debriefing/batch/{page}', name: 'admin_debriefing_batch', methods: ['POST'], requirements: ['page' => '\d+'])] public function batch(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doBatch($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/debriefing/delete/{entity}", name="admin_debriefing_delete", methods={"DELETE"}) - */ + #[Route(path: '/admin/debriefing/delete/{entity}', name: 'admin_debriefing_delete', methods: ['DELETE'])] public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doDelete($entity, $entityManager, $request); diff --git a/src/Controller/EstablishmentAdminController.php b/src/Controller/EstablishmentAdminController.php index 3ba8abd..581b077 100644 --- a/src/Controller/EstablishmentAdminController.php +++ b/src/Controller/EstablishmentAdminController.php @@ -20,49 +20,37 @@ use Symfony\Contracts\HttpClient\HttpClientInterface; class EstablishmentAdminController extends CrudController { - /** - * @Route("/admin/establishment/{page}", name="admin_establishment_index", methods={"GET"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/establishment/{page}', name: 'admin_establishment_index', methods: ['GET'], requirements: ['page' => '\d+'])] public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response { return $this->doIndex($page, $query, $request, $session); } - /** - * @Route("/admin/establishment/new", name="admin_establishment_new", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/establishment/new', name: 'admin_establishment_new', methods: ['GET', 'POST'])] public function new(Factory $factory, EntityManager $entityManager, Request $request): Response { return $this->doNew($factory->create(), $entityManager, $request); } - /** - * @Route("/admin/establishment/show/{entity}", name="admin_establishment_show", methods={"GET"}) - */ + #[Route(path: '/admin/establishment/show/{entity}', name: 'admin_establishment_show', methods: ['GET'])] public function show(Entity $entity): Response { return $this->doShow($entity); } - /** - * @Route("/admin/establishment/filter", name="admin_establishment_filter", methods={"GET"}) - */ + #[Route(path: '/admin/establishment/filter', name: 'admin_establishment_filter', methods: ['GET'])] public function filter(Session $session): Response { return $this->doFilter($session); } - /** - * @Route("/admin/establishment/edit/{entity}", name="admin_establishment_edit", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/establishment/edit/{entity}', name: 'admin_establishment_edit', methods: ['GET', 'POST'])] public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doEdit($entity, $entityManager, $request); } - /** - * @Route("/admin/establishment/address", name="admin_establishment_address", methods={"GET"}, options={"expose"=true}) - */ + #[Route(path: '/admin/establishment/address', name: 'admin_establishment_address', methods: ['GET'], options: ['expose' => true])] public function address(Request $request, HttpClientInterface $client): Response { $url = 'https://api-adresse.data.gouv.fr/search/?'; @@ -76,25 +64,19 @@ class EstablishmentAdminController extends CrudController return $this->json($response->toArray()); } - /** - * @Route("/admin/establishment/sort/{page}", name="admin_establishment_sort", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/establishment/sort/{page}', name: 'admin_establishment_sort', methods: ['POST'], requirements: ['page' => '\d+'])] public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doSort($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/establishment/batch/{page}", name="admin_establishment_batch", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/establishment/batch/{page}', name: 'admin_establishment_batch', methods: ['POST'], requirements: ['page' => '\d+'])] public function batch(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doBatch($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/establishment/delete/{entity}", name="admin_establishment_delete", methods={"DELETE"}) - */ + #[Route(path: '/admin/establishment/delete/{entity}', name: 'admin_establishment_delete', methods: ['DELETE'])] public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doDelete($entity, $entityManager, $request); diff --git a/src/Controller/EstablishmentGroupAdminController.php b/src/Controller/EstablishmentGroupAdminController.php index 8a10416..fde1a28 100644 --- a/src/Controller/EstablishmentGroupAdminController.php +++ b/src/Controller/EstablishmentGroupAdminController.php @@ -18,65 +18,49 @@ use Symfony\Component\Routing\Annotation\Route; class EstablishmentGroupAdminController extends CrudController { - /** - * @Route("/admin/establishment_group/{page}", name="admin_establishment_group_index", methods={"GET"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/establishment_group/{page}', name: 'admin_establishment_group_index', methods: ['GET'], requirements: ['page' => '\d+'])] public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response { return $this->doIndex($page, $query, $request, $session); } - /** - * @Route("/admin/establishment_group/new", name="admin_establishment_group_new", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/establishment_group/new', name: 'admin_establishment_group_new', methods: ['GET', 'POST'])] public function new(Factory $factory, EntityManager $entityManager, Request $request): Response { return $this->doNew($factory->create(), $entityManager, $request); } - /** - * @Route("/admin/establishment_group/show/{entity}", name="admin_establishment_group_show", methods={"GET"}) - */ + #[Route(path: '/admin/establishment_group/show/{entity}', name: 'admin_establishment_group_show', methods: ['GET'])] public function show(Entity $entity): Response { return $this->doShow($entity); } - /** - * @Route("/admin/establishment_group/filter", name="admin_establishment_group_filter", methods={"GET"}) - */ + #[Route(path: '/admin/establishment_group/filter', name: 'admin_establishment_group_filter', methods: ['GET'])] public function filter(Session $session): Response { return $this->doFilter($session); } - /** - * @Route("/admin/establishment_group/edit/{entity}", name="admin_establishment_group_edit", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/establishment_group/edit/{entity}', name: 'admin_establishment_group_edit', methods: ['GET', 'POST'])] public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doEdit($entity, $entityManager, $request); } - /** - * @Route("/admin/establishment_group/sort/{page}", name="admin_establishment_group_sort", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/establishment_group/sort/{page}', name: 'admin_establishment_group_sort', methods: ['POST'], requirements: ['page' => '\d+'])] public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doSort($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/establishment_group/batch/{page}", name="admin_establishment_group_batch", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/establishment_group/batch/{page}', name: 'admin_establishment_group_batch', methods: ['POST'], requirements: ['page' => '\d+'])] public function batch(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doBatch($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/establishment_group/delete/{entity}", name="admin_establishment_group_delete", methods={"DELETE"}) - */ + #[Route(path: '/admin/establishment_group/delete/{entity}', name: 'admin_establishment_group_delete', methods: ['DELETE'])] public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doDelete($entity, $entityManager, $request); diff --git a/src/Controller/ExpenseReportAdminController.php b/src/Controller/ExpenseReportAdminController.php index 4f5b2c5..fda7149 100644 --- a/src/Controller/ExpenseReportAdminController.php +++ b/src/Controller/ExpenseReportAdminController.php @@ -33,9 +33,7 @@ class ExpenseReportAdminController extends CrudController $this->fs = $fs; } - /** - * @Route("/admin/expense_report/{page}", name="admin_expense_report_index", methods={"GET"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/expense_report/{page}', name: 'admin_expense_report_index', methods: ['GET'], requirements: ['page' => '\d+'])] public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response { if (!$this->isGranted('ROLE_TREASURER')) { @@ -45,17 +43,13 @@ class ExpenseReportAdminController extends CrudController return $this->doIndex($page, $query, $request, $session); } - /** - * @Route("/admin/expense_report/new", name="admin_expense_report_new", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/expense_report/new', name: 'admin_expense_report_new', methods: ['GET', 'POST'])] public function new(Factory $factory, EntityManager $entityManager, Request $request): Response { return $this->doNew($factory->create($this->getUser()), $entityManager, $request); } - /** - * @Route("/admin/expense_report/show/{entity}", name="admin_expense_report_show", methods={"GET"}) - */ + #[Route(path: '/admin/expense_report/show/{entity}', name: 'admin_expense_report_show', methods: ['GET'])] public function show(Entity $entity): Response { if (!$this->isGranted('ROLE_TREASURER')) { @@ -67,17 +61,13 @@ class ExpenseReportAdminController extends CrudController return $this->doShow($entity); } - /** - * @Route("/admin/expense_report/filter", name="admin_expense_report_filter", methods={"GET"}) - */ + #[Route(path: '/admin/expense_report/filter', name: 'admin_expense_report_filter', methods: ['GET'])] public function filter(Session $session): Response { return $this->doFilter($session); } - /** - * @Route("/admin/expense_report/edit/{entity}", name="admin_expense_report_edit", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/expense_report/edit/{entity}', name: 'admin_expense_report_edit', methods: ['GET', 'POST'])] public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response { if (!$this->isGranted('ROLE_TREASURER')) { @@ -152,9 +142,7 @@ class ExpenseReportAdminController extends CrudController return $this->doEdit($entity, $entityManager, $request, [$this, 'beforeUpdate']); } - /** - * @Route("/admin/expense_report/request_payment/{entity}/{token}", name="admin_expense_report_request_payment", methods={"POST"}) - */ + #[Route(path: '/admin/expense_report/request_payment/{entity}/{token}', name: 'admin_expense_report_request_payment', methods: ['POST'])] public function requestPayment( Entity $entity, string $token, @@ -196,9 +184,7 @@ class ExpenseReportAdminController extends CrudController ]); } - /** - * @Route("/admin/expense_report/paid/{entity}/{token}", name="admin_expense_report_paid", methods={"POST"}) - */ + #[Route(path: '/admin/expense_report/paid/{entity}/{token}', name: 'admin_expense_report_paid', methods: ['POST'])] public function paid( Entity $entity, string $token, @@ -243,9 +229,7 @@ class ExpenseReportAdminController extends CrudController ]); } - /** - * @Route("/admin/expense_report/missing_proofs/{entity}/{token}", name="admin_expense_report_missing_proofs", methods={"POST"}) - */ + #[Route(path: '/admin/expense_report/missing_proofs/{entity}/{token}', name: 'admin_expense_report_missing_proofs', methods: ['POST'])] public function missingProofs( Entity $entity, string $token, @@ -312,17 +296,13 @@ class ExpenseReportAdminController extends CrudController $entity->setBills($bills); } - /** - * @Route("/admin/expense_report/sort/{page}", name="admin_expense_report_sort", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/expense_report/sort/{page}', name: 'admin_expense_report_sort', methods: ['POST'], requirements: ['page' => '\d+'])] public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doSort($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/expense_report/batch/{page}", name="admin_expense_report_batch", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/expense_report/batch/{page}', name: 'admin_expense_report_batch', methods: ['POST'], requirements: ['page' => '\d+'])] public function batch(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { if (!$this->isGranted('ROLE_TREASURER')) { @@ -332,9 +312,7 @@ class ExpenseReportAdminController extends CrudController return $this->doBatch($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/expense_report/delete/{entity}", name="admin_expense_report_delete", methods={"DELETE"}) - */ + #[Route(path: '/admin/expense_report/delete/{entity}', name: 'admin_expense_report_delete', methods: ['DELETE'])] public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response { if (!$this->isGranted('ROLE_TREASURER')) { diff --git a/src/Controller/InterventionAdminController.php b/src/Controller/InterventionAdminController.php index 53cdf15..771c8ee 100644 --- a/src/Controller/InterventionAdminController.php +++ b/src/Controller/InterventionAdminController.php @@ -19,65 +19,49 @@ use Symfony\Component\Routing\Annotation\Route; class InterventionAdminController extends CrudController { - /** - * @Route("/admin/intervention/{page}", name="admin_intervention_index", methods={"GET"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/intervention/{page}', name: 'admin_intervention_index', methods: ['GET'], requirements: ['page' => '\d+'])] public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response { return $this->doIndex($page, $query, $request, $session); } - /** - * @Route("/admin/intervention/new", name="admin_intervention_new", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/intervention/new', name: 'admin_intervention_new', methods: ['GET', 'POST'])] public function new(Factory $factory, EntityManager $entityManager, Request $request): Response { return $this->doNew($factory->create(), $entityManager, $request); } - /** - * @Route("/admin/intervention/show/{entity}", name="admin_intervention_show", methods={"GET"}) - */ + #[Route(path: '/admin/intervention/show/{entity}', name: 'admin_intervention_show', methods: ['GET'])] public function show(Entity $entity): Response { return $this->doShow($entity); } - /** - * @Route("/admin/intervention/filter", name="admin_intervention_filter", methods={"GET"}) - */ + #[Route(path: '/admin/intervention/filter', name: 'admin_intervention_filter', methods: ['GET'])] public function filter(Session $session): Response { return $this->doFilter($session); } - /** - * @Route("/admin/intervention/edit/{entity}", name="admin_intervention_edit", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/intervention/edit/{entity}', name: 'admin_intervention_edit', methods: ['GET', 'POST'])] public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doEdit($entity, $entityManager, $request); } - /** - * @Route("/admin/intervention/sort/{page}", name="admin_intervention_sort", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/intervention/sort/{page}', name: 'admin_intervention_sort', methods: ['POST'], requirements: ['page' => '\d+'])] public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doSort($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/intervention/batch/{page}", name="admin_intervention_batch", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/intervention/batch/{page}', name: 'admin_intervention_batch', methods: ['POST'], requirements: ['page' => '\d+'])] public function batch(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doBatch($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/intervention/delete/{entity}", name="admin_intervention_delete", methods={"DELETE"}) - */ + #[Route(path: '/admin/intervention/delete/{entity}', name: 'admin_intervention_delete', methods: ['DELETE'])] public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doDelete($entity, $entityManager, $request); diff --git a/src/Controller/ProjectAdminController.php b/src/Controller/ProjectAdminController.php index dd6d909..858791c 100644 --- a/src/Controller/ProjectAdminController.php +++ b/src/Controller/ProjectAdminController.php @@ -19,65 +19,49 @@ use Symfony\Component\Routing\Annotation\Route; class ProjectAdminController extends CrudController { - /** - * @Route("/admin/project/{page}", name="admin_project_index", methods={"GET"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/project/{page}', name: 'admin_project_index', methods: ['GET'], requirements: ['page' => '\d+'])] public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response { return $this->doIndex($page, $query, $request, $session); } - /** - * @Route("/admin/project/new", name="admin_project_new", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/project/new', name: 'admin_project_new', methods: ['GET', 'POST'])] public function new(Factory $factory, EntityManager $entityManager, Request $request): Response { return $this->doNew($factory->create(), $entityManager, $request); } - /** - * @Route("/admin/project/show/{entity}", name="admin_project_show", methods={"GET"}, options={"expose":true}) - */ + #[Route(path: '/admin/project/show/{entity}', name: 'admin_project_show', methods: ['GET'], options: ['expose' => true])] public function show(Entity $entity): Response { return $this->doShow($entity); } - /** - * @Route("/admin/project/filter", name="admin_project_filter", methods={"GET"}) - */ + #[Route(path: '/admin/project/filter', name: 'admin_project_filter', methods: ['GET'])] public function filter(Session $session): Response { return $this->doFilter($session); } - /** - * @Route("/admin/project/edit/{entity}", name="admin_project_edit", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/project/edit/{entity}', name: 'admin_project_edit', methods: ['GET', 'POST'])] public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doEdit($entity, $entityManager, $request); } - /** - * @Route("/admin/project/sort/{page}", name="admin_project_sort", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/project/sort/{page}', name: 'admin_project_sort', methods: ['POST'], requirements: ['page' => '\d+'])] public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doSort($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/project/batch/{page}", name="admin_project_batch", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/project/batch/{page}', name: 'admin_project_batch', methods: ['POST'], requirements: ['page' => '\d+'])] public function batch(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doBatch($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/project/delete/{entity}", name="admin_project_delete", methods={"DELETE"}) - */ + #[Route(path: '/admin/project/delete/{entity}', name: 'admin_project_delete', methods: ['DELETE'])] public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doDelete($entity, $entityManager, $request); diff --git a/src/Controller/SpeakerAdminController.php b/src/Controller/SpeakerAdminController.php index ae502d9..54fd471 100644 --- a/src/Controller/SpeakerAdminController.php +++ b/src/Controller/SpeakerAdminController.php @@ -19,17 +19,13 @@ use Symfony\Component\Routing\Annotation\Route; class SpeakerAdminController extends CrudController { - /** - * @Route("/admin/speaker/{page}", name="admin_speaker_index", methods={"GET"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/speaker/{page}', name: 'admin_speaker_index', methods: ['GET'], requirements: ['page' => '\d+'])] public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response { return $this->doIndex($page, $query, $request, $session); } - /** - * @Route("/admin/speaker/new", name="admin_speaker_new", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/speaker/new', name: 'admin_speaker_new', methods: ['GET', 'POST'])] public function new(Factory $factory, EntityManager $entityManager, Request $request, OpenSSL $openSSL): Response { return $this->doNew($factory->create(), $entityManager, $request, function (Entity $entity) use ($openSSL) { @@ -37,25 +33,19 @@ class SpeakerAdminController extends CrudController }); } - /** - * @Route("/admin/speaker/show/{entity}", name="admin_speaker_show", methods={"GET"}, options={"expose":true}) - */ + #[Route(path: '/admin/speaker/show/{entity}', name: 'admin_speaker_show', methods: ['GET'], options: ['expose' => true])] public function show(Entity $entity): Response { return $this->doShow($entity); } - /** - * @Route("/admin/speaker/filter", name="admin_speaker_filter", methods={"GET"}) - */ + #[Route(path: '/admin/speaker/filter', name: 'admin_speaker_filter', methods: ['GET'])] public function filter(Session $session): Response { return $this->doFilter($session); } - /** - * @Route("/admin/speaker/edit/{entity}", name="admin_speaker_edit", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/speaker/edit/{entity}', name: 'admin_speaker_edit', methods: ['GET', 'POST'])] public function edit(Entity $entity, EntityManager $entityManager, Request $request, OpenSSL $openSSL): Response { $openSSL->decryptEntity($entity); @@ -70,25 +60,19 @@ class SpeakerAdminController extends CrudController }); } - /** - * @Route("/admin/speaker/sort/{page}", name="admin_speaker_sort", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/speaker/sort/{page}', name: 'admin_speaker_sort', methods: ['POST'], requirements: ['page' => '\d+'])] public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doSort($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/speaker/batch/{page}", name="admin_speaker_batch", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/speaker/batch/{page}', name: 'admin_speaker_batch', methods: ['POST'], requirements: ['page' => '\d+'])] public function batch(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doBatch($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/speaker/delete/{entity}", name="admin_speaker_delete", methods={"DELETE"}) - */ + #[Route(path: '/admin/speaker/delete/{entity}', name: 'admin_speaker_delete', methods: ['DELETE'])] public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doDelete($entity, $entityManager, $request); diff --git a/src/Controller/TeamContactAdminController.php b/src/Controller/TeamContactAdminController.php index cc2c350..10bee6c 100644 --- a/src/Controller/TeamContactAdminController.php +++ b/src/Controller/TeamContactAdminController.php @@ -18,65 +18,49 @@ use Symfony\Component\Routing\Annotation\Route; class TeamContactAdminController extends CrudController { - /** - * @Route("/admin/team_contact/{page}", name="admin_team_contact_index", methods={"GET"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/team_contact/{page}', name: 'admin_team_contact_index', methods: ['GET'], requirements: ['page' => '\d+'])] public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response { return $this->doIndex($page, $query, $request, $session); } - /** - * @Route("/admin/team_contact/new", name="admin_team_contact_new", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/team_contact/new', name: 'admin_team_contact_new', methods: ['GET', 'POST'])] public function new(Factory $factory, EntityManager $entityManager, Request $request): Response { return $this->doNew($factory->create(), $entityManager, $request); } - /** - * @Route("/admin/team_contact/show/{entity}", name="admin_team_contact_show", methods={"GET"}) - */ + #[Route(path: '/admin/team_contact/show/{entity}', name: 'admin_team_contact_show', methods: ['GET'])] public function show(Entity $entity): Response { return $this->doShow($entity); } - /** - * @Route("/admin/team_contact/filter", name="admin_team_contact_filter", methods={"GET"}) - */ + #[Route(path: '/admin/team_contact/filter', name: 'admin_team_contact_filter', methods: ['GET'])] public function filter(Session $session): Response { return $this->doFilter($session); } - /** - * @Route("/admin/team_contact/edit/{entity}", name="admin_team_contact_edit", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/team_contact/edit/{entity}', name: 'admin_team_contact_edit', methods: ['GET', 'POST'])] public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doEdit($entity, $entityManager, $request); } - /** - * @Route("/admin/team_contact/sort/{page}", name="admin_team_contact_sort", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/team_contact/sort/{page}', name: 'admin_team_contact_sort', methods: ['POST'], requirements: ['page' => '\d+'])] public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doSort($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/team_contact/batch/{page}", name="admin_team_contact_batch", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/team_contact/batch/{page}', name: 'admin_team_contact_batch', methods: ['POST'], requirements: ['page' => '\d+'])] public function batch(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doBatch($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/team_contact/delete/{entity}", name="admin_team_contact_delete", methods={"DELETE"}) - */ + #[Route(path: '/admin/team_contact/delete/{entity}', name: 'admin_team_contact_delete', methods: ['DELETE'])] public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doDelete($entity, $entityManager, $request); diff --git a/src/Controller/ThemeTypeAdminController.php b/src/Controller/ThemeTypeAdminController.php index 774d96a..f18ee9f 100644 --- a/src/Controller/ThemeTypeAdminController.php +++ b/src/Controller/ThemeTypeAdminController.php @@ -18,65 +18,49 @@ use Symfony\Component\Routing\Annotation\Route; class ThemeTypeAdminController extends CrudController { - /** - * @Route("/admin/theme_type/{page}", name="admin_theme_type_index", methods={"GET"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/theme_type/{page}', name: 'admin_theme_type_index', methods: ['GET'], requirements: ['page' => '\d+'])] public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response { return $this->doIndex($page, $query, $request, $session); } - /** - * @Route("/admin/theme_type/new", name="admin_theme_type_new", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/theme_type/new', name: 'admin_theme_type_new', methods: ['GET', 'POST'])] public function new(Factory $factory, EntityManager $entityManager, Request $request): Response { return $this->doNew($factory->create(), $entityManager, $request); } - /** - * @Route("/admin/theme_type/show/{entity}", name="admin_theme_type_show", methods={"GET"}) - */ + #[Route(path: '/admin/theme_type/show/{entity}', name: 'admin_theme_type_show', methods: ['GET'])] public function show(Entity $entity): Response { return $this->doShow($entity); } - /** - * @Route("/admin/theme_type/filter", name="admin_theme_type_filter", methods={"GET"}) - */ + #[Route(path: '/admin/theme_type/filter', name: 'admin_theme_type_filter', methods: ['GET'])] public function filter(Session $session): Response { return $this->doFilter($session); } - /** - * @Route("/admin/theme_type/edit/{entity}", name="admin_theme_type_edit", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/theme_type/edit/{entity}', name: 'admin_theme_type_edit', methods: ['GET', 'POST'])] public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doEdit($entity, $entityManager, $request); } - /** - * @Route("/admin/theme_type/sort/{page}", name="admin_theme_type_sort", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/theme_type/sort/{page}', name: 'admin_theme_type_sort', methods: ['POST'], requirements: ['page' => '\d+'])] public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doSort($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/theme_type/batch/{page}", name="admin_theme_type_batch", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/theme_type/batch/{page}', name: 'admin_theme_type_batch', methods: ['POST'], requirements: ['page' => '\d+'])] public function batch(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doBatch($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/theme_type/delete/{entity}", name="admin_theme_type_delete", methods={"DELETE"}) - */ + #[Route(path: '/admin/theme_type/delete/{entity}', name: 'admin_theme_type_delete', methods: ['DELETE'])] public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doDelete($entity, $entityManager, $request); diff --git a/src/Controller/ToolAdminController.php b/src/Controller/ToolAdminController.php index 5d0c163..5a7b3a2 100644 --- a/src/Controller/ToolAdminController.php +++ b/src/Controller/ToolAdminController.php @@ -18,65 +18,49 @@ use Symfony\Component\Routing\Annotation\Route; class ToolAdminController extends CrudController { - /** - * @Route("/admin/tool/{page}", name="admin_tool_index", methods={"GET"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/tool/{page}', name: 'admin_tool_index', methods: ['GET'], requirements: ['page' => '\d+'])] public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response { return $this->doIndex($page, $query, $request, $session); } - /** - * @Route("/admin/tool/new", name="admin_tool_new", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/tool/new', name: 'admin_tool_new', methods: ['GET', 'POST'])] public function new(Factory $factory, EntityManager $entityManager, Request $request): Response { return $this->doNew($factory->create(), $entityManager, $request); } - /** - * @Route("/admin/tool/show/{entity}", name="admin_tool_show", methods={"GET"}) - */ + #[Route(path: '/admin/tool/show/{entity}', name: 'admin_tool_show', methods: ['GET'])] public function show(Entity $entity): Response { return $this->doShow($entity); } - /** - * @Route("/admin/tool/filter", name="admin_tool_filter", methods={"GET"}) - */ + #[Route(path: '/admin/tool/filter', name: 'admin_tool_filter', methods: ['GET'])] public function filter(Session $session): Response { return $this->doFilter($session); } - /** - * @Route("/admin/tool/edit/{entity}", name="admin_tool_edit", methods={"GET", "POST"}) - */ + #[Route(path: '/admin/tool/edit/{entity}', name: 'admin_tool_edit', methods: ['GET', 'POST'])] public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doEdit($entity, $entityManager, $request); } - /** - * @Route("/admin/tool/sort/{page}", name="admin_tool_sort", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/tool/sort/{page}', name: 'admin_tool_sort', methods: ['POST'], requirements: ['page' => '\d+'])] public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doSort($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/tool/batch/{page}", name="admin_tool_batch", methods={"POST"}, requirements={"page":"\d+"}) - */ + #[Route(path: '/admin/tool/batch/{page}', name: 'admin_tool_batch', methods: ['POST'], requirements: ['page' => '\d+'])] public function batch(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response { return $this->doBatch($page, $query, $entityManager, $request, $session); } - /** - * @Route("/admin/tool/delete/{entity}", name="admin_tool_delete", methods={"DELETE"}) - */ + #[Route(path: '/admin/tool/delete/{entity}', name: 'admin_tool_delete', methods: ['DELETE'])] public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response { return $this->doDelete($entity, $entityManager, $request); diff --git a/src/Entity/AddressTrait.php b/src/Entity/AddressTrait.php index a58f9d3..eb2ff7e 100644 --- a/src/Entity/AddressTrait.php +++ b/src/Entity/AddressTrait.php @@ -7,19 +7,13 @@ use Doctrine\ORM\Mapping as ORM; trait AddressTrait { - /** - * @ORM\Column(type="string", length=255) - */ + #[ORM\Column(type: 'string', length: 255)] protected $address; - /** - * @ORM\Column(type="string", length=10) - */ + #[ORM\Column(type: 'string', length: 10)] protected $zipCode; - /** - * @ORM\Column(type="string", length=100) - */ + #[ORM\Column(type: 'string', length: 100)] protected $city; public function getAddress(): ?string diff --git a/src/Entity/Conference.php b/src/Entity/Conference.php index 5814813..1bacea6 100644 --- a/src/Entity/Conference.php +++ b/src/Entity/Conference.php @@ -8,62 +8,40 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -/** - * @ORM\Entity(repositoryClass=ConferenceRepository::class) - */ +#[ORM\Entity(repositoryClass: ConferenceRepository::class)] class Conference implements EntityInterface { - /** - * @ORM\Id - * @ORM\GeneratedValue - * @ORM\Column(type="integer") - */ + #[ORM\Id] + #[ORM\GeneratedValue] + #[ORM\Column(type: 'integer')] protected $id; - /** - * @ORM\Column(type="string", length=255) - */ + #[ORM\Column(type: 'string', length: 255)] protected $label; - /** - * @ORM\Column(type="integer") - */ + #[ORM\Column(type: 'integer')] protected $persons; - /** - * @ORM\ManyToOne(targetEntity=ThemeType::class, inversedBy="conferences", cascade={"persist", "remove"}) - * @ORM\JoinColumn(nullable=false) - */ + #[ORM\ManyToOne(targetEntity: ThemeType::class, inversedBy: 'conferences', cascade: ['persist', 'remove'])] + #[ORM\JoinColumn(nullable: false)] protected $themeType; - /** - * @ORM\Column(type="text", nullable=true) - */ + #[ORM\Column(type: 'text', nullable: true)] protected $content; - /** - * @ORM\Column(type="text", nullable=true) - */ + #[ORM\Column(type: 'text', nullable: true)] protected $comment; - /** - * @ORM\Column(type="text", nullable=true) - */ + #[ORM\Column(type: 'text', nullable: true)] protected $feedback; - /** - * @ORM\Column(type="date", nullable=true) - */ + #[ORM\Column(type: 'date', nullable: true)] protected $date; - /** - * @ORM\Column(type="float", nullable=true) - */ + #[ORM\Column(type: 'float', nullable: true)] protected $price; - /** - * @ORM\ManyToMany(targetEntity=Speaker::class, inversedBy="conferences") - */ + #[ORM\ManyToMany(targetEntity: Speaker::class, inversedBy: 'conferences')] protected $speakers; public function __construct() diff --git a/src/Entity/Debriefing.php b/src/Entity/Debriefing.php index 1676bf9..af1386f 100644 --- a/src/Entity/Debriefing.php +++ b/src/Entity/Debriefing.php @@ -8,51 +8,33 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -/** - * @ORM\Entity(repositoryClass=DebriefingRepository::class) - */ +#[ORM\Entity(repositoryClass: DebriefingRepository::class)] class Debriefing implements EntityInterface { - /** - * @ORM\Id - * @ORM\GeneratedValue - * @ORM\Column(type="integer") - */ + #[ORM\Id] + #[ORM\GeneratedValue] + #[ORM\Column(type: 'integer')] protected $id; - /** - * @ORM\Column(type="string", length=255) - */ + #[ORM\Column(type: 'string', length: 255)] protected $topic; - /** - * @ORM\Column(type="date") - */ + #[ORM\Column(type: 'date')] protected $date; - /** - * @ORM\ManyToMany(targetEntity=Project::class, inversedBy="debriefings") - */ + #[ORM\ManyToMany(targetEntity: Project::class, inversedBy: 'debriefings')] protected $projects; - /** - * @ORM\Column(type="text", nullable=true) - */ + #[ORM\Column(type: 'text', nullable: true)] protected $internalContributors; - /** - * @ORM\Column(type="text", nullable=true) - */ + #[ORM\Column(type: 'text', nullable: true)] protected $externalContributors; - /** - * @ORM\Column(type="text", nullable=true) - */ + #[ORM\Column(type: 'text', nullable: true)] protected $content; - /** - * @ORM\Column(type="array") - */ + #[ORM\Column(type: 'array')] protected $files = []; public function __construct() diff --git a/src/Entity/Establishment.php b/src/Entity/Establishment.php index 0e759f6..26658f8 100644 --- a/src/Entity/Establishment.php +++ b/src/Entity/Establishment.php @@ -8,33 +8,23 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -/** - * @ORM\Entity(repositoryClass=EstablishmentRepository::class) - */ +#[ORM\Entity(repositoryClass: EstablishmentRepository::class)] class Establishment implements EntityInterface { - /** - * @ORM\Id - * @ORM\GeneratedValue - * @ORM\Column(type="integer") - */ + #[ORM\Id] + #[ORM\GeneratedValue] + #[ORM\Column(type: 'integer')] protected $id; - /** - * @ORM\Column(type="string", length=255) - */ + #[ORM\Column(type: 'string', length: 255)] protected $name; use AddressTrait; - /** - * @ORM\OneToMany(targetEntity=EstablishmentGroup::class, mappedBy="establishment", orphanRemoval=true, cascade={"persist", "remove"}) - */ + #[ORM\OneToMany(targetEntity: EstablishmentGroup::class, mappedBy: 'establishment', orphanRemoval: true, cascade: ['persist', 'remove'])] protected $establishmentGroups; - /** - * @ORM\ManyToMany(targetEntity=Project::class, mappedBy="establishments") - */ + #[ORM\ManyToMany(targetEntity: Project::class, mappedBy: 'establishments')] protected $projects; public function __construct() diff --git a/src/Entity/EstablishmentGroup.php b/src/Entity/EstablishmentGroup.php index 1237c4b..64b86a2 100644 --- a/src/Entity/EstablishmentGroup.php +++ b/src/Entity/EstablishmentGroup.php @@ -8,32 +8,22 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -/** - * @ORM\Entity(repositoryClass=EstablishmentGroupRepository::class) - */ +#[ORM\Entity(repositoryClass: EstablishmentGroupRepository::class)] class EstablishmentGroup implements EntityInterface { - /** - * @ORM\Id - * @ORM\GeneratedValue - * @ORM\Column(type="integer") - */ + #[ORM\Id] + #[ORM\GeneratedValue] + #[ORM\Column(type: 'integer')] protected $id; - /** - * @ORM\Column(type="string", length=255) - */ + #[ORM\Column(type: 'string', length: 255)] protected $label; - /** - * @ORM\ManyToOne(targetEntity=Establishment::class, inversedBy="establishmentGroups") - * @ORM\JoinColumn(nullable=false) - */ + #[ORM\ManyToOne(targetEntity: Establishment::class, inversedBy: 'establishmentGroups')] + #[ORM\JoinColumn(nullable: false)] protected $establishment; - /** - * @ORM\ManyToMany(targetEntity=Intervention::class, mappedBy="establishmentGroups") - */ + #[ORM\ManyToMany(targetEntity: Intervention::class, mappedBy: 'establishmentGroups')] protected $interventions; public function __construct() diff --git a/src/Entity/Event.php b/src/Entity/Event.php index 39dafa2..3b585b7 100644 --- a/src/Entity/Event.php +++ b/src/Entity/Event.php @@ -8,51 +8,33 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -/** - * @ORM\Entity(repositoryClass=EventRepository::class) - */ +#[ORM\Entity(repositoryClass: EventRepository::class)] class Event implements EntityInterface { - /** - * @ORM\Id - * @ORM\GeneratedValue - * @ORM\Column(type="integer") - */ + #[ORM\Id] + #[ORM\GeneratedValue] + #[ORM\Column(type: 'integer')] protected $id; - /** - * @ORM\Column(type="string", length=40) - */ + #[ORM\Column(type: 'string', length: 40)] protected $uid; - /** - * @ORM\Column(type="string", length=255, nullable=true) - */ + #[ORM\Column(type: 'string', length: 255, nullable: true)] protected $summary; - /** - * @ORM\Column(type="text", nullable=true) - */ + #[ORM\Column(type: 'text', nullable: true)] protected $description; - /** - * @ORM\Column(type="datetime", nullable=true) - */ + #[ORM\Column(type: 'datetime', nullable: true)] protected $startAt; - /** - * @ORM\Column(type="datetime", nullable=true) - */ + #[ORM\Column(type: 'datetime', nullable: true)] protected $finishAt; - /** - * @ORM\ManyToMany(targetEntity=Speaker::class, inversedBy="events") - */ + #[ORM\ManyToMany(targetEntity: Speaker::class, inversedBy: 'events')] protected $speakers; - /** - * @ORM\ManyToMany(targetEntity=Project::class, inversedBy="events") - */ + #[ORM\ManyToMany(targetEntity: Project::class, inversedBy: 'events')] protected $projects; public function __construct() diff --git a/src/Entity/ExpenseReport.php b/src/Entity/ExpenseReport.php index 171fc3f..cedf78a 100644 --- a/src/Entity/ExpenseReport.php +++ b/src/Entity/ExpenseReport.php @@ -6,67 +6,43 @@ use App\Core\Entity\EntityInterface; use App\Repository\ExpenseReportRepository; use Doctrine\ORM\Mapping as ORM; -/** - * @ORM\Entity(repositoryClass=ExpenseReportRepository::class) - */ +#[ORM\Entity(repositoryClass: ExpenseReportRepository::class)] class ExpenseReport implements EntityInterface { - /** - * @ORM\Id - * @ORM\GeneratedValue - * @ORM\Column(type="integer") - */ + #[ORM\Id] + #[ORM\GeneratedValue] + #[ORM\Column(type: 'integer')] protected $id; - /** - * @ORM\ManyToOne(targetEntity=User::class, inversedBy="expenseReports") - * @ORM\JoinColumn(nullable=false) - */ + #[ORM\ManyToOne(targetEntity: User::class, inversedBy: 'expenseReports')] + #[ORM\JoinColumn(nullable: false)] protected $user; - /** - * @ORM\Column(type="array") - */ + #[ORM\Column(type: 'array')] protected $moves = []; - /** - * @ORM\Column(type="array") - */ + #[ORM\Column(type: 'array')] protected $variousPayments = []; - /** - * @ORM\Column(type="datetime", nullable=true) - */ + #[ORM\Column(type: 'datetime', nullable: true)] protected $paidAt; - /** - * @ORM\Column(type="array") - */ + #[ORM\Column(type: 'array')] protected $bills = []; - /** - * @ORM\Column(type="date") - */ + #[ORM\Column(type: 'date')] protected $dateFrom; - /** - * @ORM\Column(type="date") - */ + #[ORM\Column(type: 'date')] protected $dateTo; - /** - * @ORM\Column(type="float") - */ + #[ORM\Column(type: 'float')] protected $scalePerKilometer; - /** - * @ORM\Column(type="boolean", options={"default"=0}) - */ + #[ORM\Column(type: 'boolean', options: ['default' => 0])] protected $isRequestedPayment = false; - /** - * @ORM\Column(type="boolean", options={"default"=0}) - */ + #[ORM\Column(type: 'boolean', options: ['default' => 0])] protected $isPaid = false; public function getId(): ?int diff --git a/src/Entity/Intervention.php b/src/Entity/Intervention.php index f03398e..6636b80 100644 --- a/src/Entity/Intervention.php +++ b/src/Entity/Intervention.php @@ -8,92 +8,58 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -/** - * @ORM\Entity(repositoryClass=InterventionRepository::class) - */ +#[ORM\Entity(repositoryClass: InterventionRepository::class)] class Intervention implements EntityInterface { - /** - * @ORM\Id - * @ORM\GeneratedValue - * @ORM\Column(type="integer") - */ + #[ORM\Id] + #[ORM\GeneratedValue] + #[ORM\Column(type: 'integer')] protected $id; - /** - * @ORM\ManyToMany(targetEntity=Speaker::class, inversedBy="interventions") - */ + #[ORM\ManyToMany(targetEntity: Speaker::class, inversedBy: 'interventions')] protected $speakers; - /** - * @ORM\Column(type="string", length=255, nullable=true) - */ + #[ORM\Column(type: 'string', length: 255, nullable: true)] protected $activityReference; - /** - * @ORM\Column(type="date", nullable=true) - */ + #[ORM\Column(type: 'date', nullable: true)] protected $date; - /** - * @ORM\Column(type="integer", nullable=true) - */ + #[ORM\Column(type: 'integer', nullable: true)] protected $groups; - /** - * @ORM\Column(type="string", length=255, nullable=true) - */ + #[ORM\Column(type: 'string', length: 255, nullable: true)] protected $levels; - /** - * @ORM\Column(type="text", nullable=true) - */ + #[ORM\Column(type: 'text', nullable: true)] protected $themes; - /** - * @ORM\Column(type="text", nullable=true) - */ + #[ORM\Column(type: 'text', nullable: true)] protected $content; - /** - * @ORM\ManyToMany(targetEntity=Tool::class, inversedBy="interventions") - */ + #[ORM\ManyToMany(targetEntity: Tool::class, inversedBy: 'interventions')] protected $tools; - /** - * @ORM\Column(type="text", nullable=true) - */ + #[ORM\Column(type: 'text', nullable: true)] protected $toolsDetails; - /** - * @ORM\Column(type="text", nullable=true) - */ + #[ORM\Column(type: 'text', nullable: true)] protected $feedback; - /** - * @ORM\Column(type="text", nullable=true) - */ + #[ORM\Column(type: 'text', nullable: true)] protected $vigilantPoints; - /** - * @ORM\ManyToOne(targetEntity=ThemeType::class, inversedBy="interventions") - * @ORM\JoinColumn(nullable=false) - */ + #[ORM\ManyToOne(targetEntity: ThemeType::class, inversedBy: 'interventions')] + #[ORM\JoinColumn(nullable: false)] protected $themeType; - /** - * @ORM\Column(type="text", nullable=true) - */ + #[ORM\Column(type: 'text', nullable: true)] protected $comment; - /** - * @ORM\ManyToMany(targetEntity=EstablishmentGroup::class, inversedBy="interventions") - */ + #[ORM\ManyToMany(targetEntity: EstablishmentGroup::class, inversedBy: 'interventions')] protected $establishmentGroups; - /** - * @ORM\Column(type="float", nullable=true) - */ + #[ORM\Column(type: 'float', nullable: true)] protected $price; public function __construct() diff --git a/src/Entity/Page/EntityPage.php b/src/Entity/Page/EntityPage.php index b340bd9..8404eac 100644 --- a/src/Entity/Page/EntityPage.php +++ b/src/Entity/Page/EntityPage.php @@ -8,9 +8,7 @@ use App\Core\Form\Site\Page as Block; use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Form\FormBuilderInterface; -/** - * @ORM\Entity - */ +#[ORM\Entity] class EntityPage extends Page { public function buildForm(FormBuilderInterface $builder, array $options) diff --git a/src/Entity/Page/SimplePage.php b/src/Entity/Page/SimplePage.php index 97aaba0..9d438cd 100644 --- a/src/Entity/Page/SimplePage.php +++ b/src/Entity/Page/SimplePage.php @@ -11,9 +11,7 @@ use App\Core\Form\Site\Page\TextBlockType; use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Form\FormBuilderInterface; -/** - * @ORM\Entity - */ +#[ORM\Entity] class SimplePage extends Page { public function buildForm(FormBuilderInterface $builder, array $options) diff --git a/src/Entity/Project.php b/src/Entity/Project.php index deae1b9..7749b8c 100644 --- a/src/Entity/Project.php +++ b/src/Entity/Project.php @@ -8,56 +8,36 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -/** - * @ORM\Entity(repositoryClass=ProjectRepository::class) - */ +#[ORM\Entity(repositoryClass: ProjectRepository::class)] class Project implements EntityInterface { - /** - * @ORM\Id - * @ORM\GeneratedValue - * @ORM\Column(type="integer") - */ + #[ORM\Id] + #[ORM\GeneratedValue] + #[ORM\Column(type: 'integer')] protected $id; - /** - * @ORM\Column(type="string", length=255) - */ + #[ORM\Column(type: 'string', length: 255)] protected $label; - /** - * @ORM\ManyToMany(targetEntity=Establishment::class, inversedBy="projects") - */ + #[ORM\ManyToMany(targetEntity: Establishment::class, inversedBy: 'projects')] protected $establishments; - /** - * @ORM\Column(type="text", nullable=true) - */ + #[ORM\Column(type: 'text', nullable: true)] protected $description; - /** - * @ORM\Column(type="text", nullable=true) - */ + #[ORM\Column(type: 'text', nullable: true)] protected $client; - /** - * @ORM\Column(type="array") - */ + #[ORM\Column(type: 'array')] protected $files = []; - /** - * @ORM\ManyToMany(targetEntity=Debriefing::class, mappedBy="projects") - */ + #[ORM\ManyToMany(targetEntity: Debriefing::class, mappedBy: 'projects')] protected $debriefings; - /** - * @ORM\ManyToMany(targetEntity=Event::class, mappedBy="projects") - */ + #[ORM\ManyToMany(targetEntity: Event::class, mappedBy: 'projects')] protected $events; - /** - * @ORM\Column(type="float", nullable=true) - */ + #[ORM\Column(type: 'float', nullable: true)] protected $price; public function __construct() diff --git a/src/Entity/Speaker.php b/src/Entity/Speaker.php index 610b3bd..3f295f1 100644 --- a/src/Entity/Speaker.php +++ b/src/Entity/Speaker.php @@ -9,61 +9,39 @@ use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; use App\Security\EncryptedEntityInterface; -/** - * @ORM\Entity(repositoryClass=SpeakerRepository::class) - */ +#[ORM\Entity(repositoryClass: SpeakerRepository::class)] class Speaker implements EntityInterface, EncryptedEntityInterface { - /** - * @ORM\Id - * @ORM\GeneratedValue - * @ORM\Column(type="integer") - */ + #[ORM\Id] + #[ORM\GeneratedValue] + #[ORM\Column(type: 'integer')] protected $id; - /** - * @ORM\Column(type="string", length=255) - */ + #[ORM\Column(type: 'string', length: 255)] protected $name; - /** - * @ORM\ManyToMany(targetEntity=Intervention::class, mappedBy="speakers", cascade={"persist"}) - */ + #[ORM\ManyToMany(targetEntity: Intervention::class, mappedBy: 'speakers', cascade: ['persist'])] protected $interventions; - /** - * @ORM\Column(type="string", length=255, nullable=true) - */ + #[ORM\Column(type: 'string', length: 255, nullable: true)] protected $caldavHost; - /** - * @ORM\Column(type="string", length=255, nullable=true) - */ + #[ORM\Column(type: 'string', length: 255, nullable: true)] protected $caldavUsername; - /** - * @ORM\Column(type="blob", nullable=true) - */ + #[ORM\Column(type: 'blob', nullable: true)] protected $caldavPassword; - /** - * @ORM\Column(type="string", length=255, nullable=true) - */ + #[ORM\Column(type: 'string', length: 255, nullable: true)] protected $caldavCalendarUri; - /** - * @ORM\ManyToMany(targetEntity=Event::class, mappedBy="speakers") - */ + #[ORM\ManyToMany(targetEntity: Event::class, mappedBy: 'speakers')] protected $events; - /** - * @ORM\Column(type="string", length=30, nullable=true) - */ + #[ORM\Column(type: 'string', length: 30, nullable: true)] protected $color; - /** - * @ORM\ManyToMany(targetEntity=Conference::class, mappedBy="speakers") - */ + #[ORM\ManyToMany(targetEntity: Conference::class, mappedBy: 'speakers')] protected $conferences; public function __construct() diff --git a/src/Entity/TeamContact.php b/src/Entity/TeamContact.php index 211fd82..284a3ae 100644 --- a/src/Entity/TeamContact.php +++ b/src/Entity/TeamContact.php @@ -6,31 +6,21 @@ use App\Repository\TeamContactRepository; use Doctrine\ORM\Mapping as ORM; use App\Core\Entity\EntityInterface; -/** - * @ORM\Entity(repositoryClass=TeamContactRepository::class) - */ +#[ORM\Entity(repositoryClass: TeamContactRepository::class)] class TeamContact implements EntityInterface { - /** - * @ORM\Id - * @ORM\GeneratedValue - * @ORM\Column(type="integer") - */ + #[ORM\Id] + #[ORM\GeneratedValue] + #[ORM\Column(type: 'integer')] protected $id; - /** - * @ORM\Column(type="string", length=255) - */ + #[ORM\Column(type: 'string', length: 255)] protected $name; - /** - * @ORM\Column(type="array") - */ + #[ORM\Column(type: 'array')] protected $phones = []; - /** - * @ORM\Column(type="array") - */ + #[ORM\Column(type: 'array')] protected $emails = []; public function getId(): ?int diff --git a/src/Entity/ThemeType.php b/src/Entity/ThemeType.php index af1f5dc..1c98970 100644 --- a/src/Entity/ThemeType.php +++ b/src/Entity/ThemeType.php @@ -8,31 +8,21 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -/** - * @ORM\Entity(repositoryClass=ThemeTypeRepository::class) - */ +#[ORM\Entity(repositoryClass: ThemeTypeRepository::class)] class ThemeType implements EntityInterface { - /** - * @ORM\Id - * @ORM\GeneratedValue - * @ORM\Column(type="integer") - */ + #[ORM\Id] + #[ORM\GeneratedValue] + #[ORM\Column(type: 'integer')] protected $id; - /** - * @ORM\Column(type="string", length=255) - */ + #[ORM\Column(type: 'string', length: 255)] protected $label; - /** - * @ORM\OneToMany(targetEntity=Conference::class, mappedBy="themeType", orphanRemoval=true) - */ + #[ORM\OneToMany(targetEntity: Conference::class, mappedBy: 'themeType', orphanRemoval: true)] protected $conferences; - /** - * @ORM\OneToMany(targetEntity=Intervention::class, mappedBy="themeType", orphanRemoval=true) - */ + #[ORM\OneToMany(targetEntity: Intervention::class, mappedBy: 'themeType', orphanRemoval: true)] protected $interventions; public function __construct() diff --git a/src/Entity/Tool.php b/src/Entity/Tool.php index b1f2c6f..1c46597 100644 --- a/src/Entity/Tool.php +++ b/src/Entity/Tool.php @@ -8,26 +8,18 @@ use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; use App\Core\Entity\EntityInterface; -/** - * @ORM\Entity(repositoryClass=ToolRepository::class) - */ +#[ORM\Entity(repositoryClass: ToolRepository::class)] class Tool implements EntityInterface { - /** - * @ORM\Id - * @ORM\GeneratedValue - * @ORM\Column(type="integer") - */ + #[ORM\Id] + #[ORM\GeneratedValue] + #[ORM\Column(type: 'integer')] protected $id; - /** - * @ORM\Column(type="string", length=255) - */ + #[ORM\Column(type: 'string', length: 255)] protected $label; - /** - * @ORM\ManyToMany(targetEntity=Intervention::class, mappedBy="tools", cascade={"persist", "remove"}) - */ + #[ORM\ManyToMany(targetEntity: Intervention::class, mappedBy: 'tools', cascade: ['persist', 'remove'])] protected $interventions; public function __construct() diff --git a/src/Entity/User.php b/src/Entity/User.php index a1a06bd..8e2df86 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -12,79 +12,53 @@ use Scheb\TwoFactorBundle\Model\Google\TwoFactorInterface; use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface; use Symfony\Component\Security\Core\User\UserInterface; -/** - * @ORM\Entity(repositoryClass=UserRepository::class) - * @ORM\HasLifecycleCallbacks() - */ +#[ORM\Entity(repositoryClass: UserRepository::class)] +#[ORM\HasLifecycleCallbacks] class User implements PasswordAuthenticatedUserInterface, UserInterface, TwoFactorInterface, EntityInterface { use Timestampable; - /** - * @ORM\Id - * @ORM\GeneratedValue - * @ORM\Column(type="integer") - */ + #[ORM\Id] + #[ORM\GeneratedValue] + #[ORM\Column(type: 'integer')] protected $id; - /** - * @ORM\Column(type="string", length=180, unique=true) - */ + #[ORM\Column(type: 'string', length: 180, unique: true)] protected $email; - /** - * @ORM\Column(type="json") - */ + #[ORM\Column(type: 'json')] protected $roles = []; /** * @var string The hashed password - * @ORM\Column(type="string") */ + #[ORM\Column(type: 'string')] protected $password; - /** - * @ORM\Column(type="string", length=255, nullable=true) - */ + #[ORM\Column(type: 'string', length: 255, nullable: true)] protected $displayName; - /** - * @ORM\Column(type="string", length=255, nullable=true) - */ + #[ORM\Column(type: 'string', length: 255, nullable: true)] protected $totpSecret; - /** - * @ORM\Column(type="datetime", nullable=true) - */ + #[ORM\Column(type: 'datetime', nullable: true)] protected $passwordRequestedAt; - /** - * @ORM\Column(type="string", length=255, nullable=true) - */ + #[ORM\Column(type: 'string', length: 255, nullable: true)] protected $confirmationToken; - /** - * @ORM\Column(type="boolean", options={"default"=0}) - */ + #[ORM\Column(type: 'boolean', options: ['default' => 0])] protected $isAdmin; - /** - * @ORM\Column(type="boolean", options={"default"=0}) - */ + #[ORM\Column(type: 'boolean', options: ['default' => 0])] protected $isWriter; - /** - * @ORM\Column(type="boolean", nullable=true) - */ + #[ORM\Column(type: 'boolean', nullable: true)] protected $isManager; - /** - * @ORM\Column(type="boolean", nullable=true) - */ + #[ORM\Column(type: 'boolean', nullable: true)] protected $isTreasurer; - /** - * @ORM\OneToMany(targetEntity=ExpenseReport::class, mappedBy="user", orphanRemoval=true) - */ + #[ORM\OneToMany(targetEntity: ExpenseReport::class, mappedBy: 'user', orphanRemoval: true)] protected $expenseReports; public function __construct()