From 0389eb814e2c4003d1a3fd32fe642372263ddd05 Mon Sep 17 00:00:00 2001
From: Aymeric SERRA <aymeric.serra@etu.univ-orleans.fr>
Date: Thu, 9 Feb 2023 15:34:19 +0100
Subject: [PATCH] Remplacement ROLE_INSTRUCTOR en ROLE_INSTRUCTEUR

---
 config/packages/security.yaml         | 8 ++++----
 src/Controller/AtelierController.php  | 8 ++++----
 src/Form/UserType.php                 | 2 +-
 templates/components/navbar.html.twig | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/packages/security.yaml b/config/packages/security.yaml
index d6ee356..5beaf40 100644
--- a/config/packages/security.yaml
+++ b/config/packages/security.yaml
@@ -10,8 +10,8 @@ security:
                 class: App\Entity\User
                 property: email
     role_hierarchy:
-        ROLE_ADMINISTRATEUR: [ROLE_INSTRUCTOR, ROLE_APPRENTI, ROLE_USER]
-        ROLE_INSTRUCTOR: ROLE_USER
+        ROLE_ADMINISTRATEUR: [ ROLE_INSTRUCTEUR, ROLE_APPRENTI, ROLE_USER ]
+        ROLE_INSTRUCTEUR: ROLE_USER
         ROLE_APPRENTI: ROLE_USER
     firewalls:
         dev:
@@ -35,8 +35,8 @@ security:
     # Easy way to control access for large sections of your site
     # Note: Only the *first* access control that matches will be used
     access_control:
-        # - { path: ^/admin, roles: ROLE_ADMIN }
-        # - { path: ^/profile, roles: ROLE_USER }
+    # - { path: ^/admin, roles: ROLE_ADMIN }
+    # - { path: ^/profile, roles: ROLE_USER }
 
 when@test:
     security:
diff --git a/src/Controller/AtelierController.php b/src/Controller/AtelierController.php
index 0c99ca8..bb860ce 100644
--- a/src/Controller/AtelierController.php
+++ b/src/Controller/AtelierController.php
@@ -24,7 +24,7 @@ class AtelierController extends AbstractController
         ]);
     }
 
-    #[IsGranted('ROLE_INSTRUCTOR')]
+    #[IsGranted('ROLE_INSTRUCTEUR')]
     #[Route('/byme', name: 'app_atelier_by_me', methods: ['GET'])]
     public function index_created_by_user(AtelierRepository $atelierRepository, MarkdownAtelier $markdown): Response
     {
@@ -44,7 +44,7 @@ class AtelierController extends AbstractController
         ]);
     }
 
-    #[IsGranted('ROLE_INSTRUCTOR')]
+    #[IsGranted('ROLE_INSTRUCTEUR')]
     #[Route('/new', name: 'app_atelier_new', methods: ['GET', 'POST'])]
     public function new(Request $request, AtelierRepository $atelierRepository): Response
     {
@@ -74,7 +74,7 @@ class AtelierController extends AbstractController
         ]);
     }
 
-    #[IsGranted('ROLE_INSTRUCTOR')]
+    #[IsGranted('ROLE_INSTRUCTEUR')]
     #[Route('/{id}/edit', name: 'app_atelier_edit', methods: ['GET', 'POST'])]
     public function edit(Request $request, Atelier $atelier, AtelierRepository $atelierRepository): Response
     {
@@ -97,7 +97,7 @@ class AtelierController extends AbstractController
         ]);
     }
 
-    #[IsGranted('ROLE_INSTRUCTOR')]
+    #[IsGranted('ROLE_INSTRUCTEUR')]
     #[Route('/{id}', name: 'app_atelier_delete', methods: ['POST'])]
     public function delete(Request $request, Atelier $atelier, AtelierRepository $atelierRepository): Response
     {
diff --git a/src/Form/UserType.php b/src/Form/UserType.php
index 49ed12b..02f7926 100644
--- a/src/Form/UserType.php
+++ b/src/Form/UserType.php
@@ -19,7 +19,7 @@ class UserType extends AbstractType
             ->add('roles', ChoiceType::class, [
                'choices' => [
                    'Apprenti' => 'ROLE_APPRENTI',
-                   'Instructeur' => 'ROLE_INSTRUCTOR',
+                   'Instructeur' => 'ROLE_INSTRUCTEUR',
                    'Admin' => 'ROLE_ADMINISTRATEUR'
                ],
                 'required' => true,
diff --git a/templates/components/navbar.html.twig b/templates/components/navbar.html.twig
index b0d18df..31c43b8 100644
--- a/templates/components/navbar.html.twig
+++ b/templates/components/navbar.html.twig
@@ -14,7 +14,7 @@
                     <a class="nav-link" href="{{ path('app_atelier_index') }}">Atelier</a>
                 </li>
 
-                {% if app.user and is_granted('ROLE_INSTRUCTOR') %}
+                {% if app.user and is_granted('ROLE_INSTRUCTEUR') %}
                     <li class="nav-item">
                         <a class="nav-link" href="{{ path('app_atelier_by_me') }}">Mes Ateliers</a>
                     </li>