Merge branch 'develop' into features/background

assets/controllers/collapser-controller.js

@@ -1,4 +1,4 @@
-import { Controller } from "@stimulus/core";
+import { Controller } from '@hotwired/stimulus';
 
 export default class extends Controller {
     static targets = ['collapse', 'button']

assets/controllers/hello_controller.js

@@ -1,4 +1,4 @@
-import { Controller } from 'stimulus';
+import { Controller } from '@hotwired/stimulus';
 
 /*
  * This is an example Stimulus controller!

assets/controllers/toast_controller.js

@@ -1,4 +1,4 @@
-import { Controller } from "stimulus";
+import { Controller } from '@hotwired/stimulus';
 import { Toast } from 'bootstrap';
 
 export default class extends Controller {

config/packages/security.yaml

@@ -31,6 +31,7 @@ security:
             #        - App\Security\LoginFormAuthenticator
             remember_me:
                 secret: '%kernel.secret%'
+                samesite: 'lax'
             logout:
                 path: app_logout
                 target: app_login

package.json

@@ -1,8 +1,9 @@
 {
     "devDependencies": {
+        "@hotwired/stimulus": "^3.0",
         "@popperjs/core": "^2.10.2",
-        "@symfony/stimulus-bridge": "^2.0.0",
-        "@symfony/webpack-encore": "^1.0.0",
+        "@symfony/stimulus-bridge": "^3.2.1",
+        "@symfony/webpack-encore": "^2.1.0",
         "bootstrap": "^5.1.3",
         "bootstrap-star-rating": "^4.1.2",
         "core-js": "^3.0.0",
@@ -12,7 +13,7 @@
         "regenerator-runtime": "^0.13.2",
         "sass": "^1.43.3",
         "sass-loader": "^12.2.0",
-        "stimulus": "^2.0.0",
+        "stimulus": "^3.0.1",
         "webpack-notifier": "^1.6.0"
     },
     "license": "UNLICENSED",

src/Controller/GenreController.php

@@ -42,8 +42,8 @@ class GenreController extends AbstractController
 			return $this->redirectToRoute('genre_liste');
 		}
 
-		return $this->render('genre/ajouter.html.twig', array(
-			'form'	=>	$form->createView(),
+		return $this->renderForm('genre/ajouter.html.twig', array(
+			'form'	=>	$form,
 		));
 	}
 
@@ -63,8 +63,8 @@ class GenreController extends AbstractController
 			return $this->redirectToRoute('genre_liste');
 		}
 
-		return $this->render('genre/modifier.html.twig', array(
-			'form'	=> $form->createView(),
+		return $this->renderForm('genre/modifier.html.twig', array(
+			'form'	=> $form,
             'genre'   =>  $genre,
             'films' => $films
 		));
@@ -84,9 +84,9 @@ class GenreController extends AbstractController
             return $this->redirectToRoute('genre_liste');
         }
 
-		return $this->render('genre/supprimer.html.twig', array(
+		return $this->renderForm('genre/supprimer.html.twig', array(
 			'genre'  =>  $genre,
-            'form'  =>  $form->createView()
+            'form'  =>  $form
 		));
 	}
 

src/Controller/ProfilController.php

@@ -29,8 +29,8 @@ class ProfilController extends AbstractController
         }
 
 
-        return $this->render('profil/monprofil.html.twig', array (
-            'form'  =>  $form->createView()
+        return $this->renderForm('profil/monprofil.html.twig', array (
+            'form'  =>  $form
         ));
     }
 
@@ -49,8 +49,8 @@ class ProfilController extends AbstractController
             $this->addFlash('success', "Les préférences ont été modifiées");
         }
 
-        return $this->render('profil/mespreferences.html.twig', [
-            'form'  =>  $form->createView()
+        return $this->renderForm('profil/mespreferences.html.twig', [
+            'form'  =>  $form
         ]);
     }
 

src/Controller/RealisateurController.php

@@ -41,8 +41,8 @@ class RealisateurController extends AbstractController
 			return $this->redirectToRoute('realisateur_liste');
 		}
 
-		return $this->render('realisateur/ajouter.html.twig', array(
-			'form'	=>	$form->createView()
+		return $this->renderForm('realisateur/ajouter.html.twig', array(
+			'form'	=>	$form
 		));
 	}
 
@@ -61,8 +61,8 @@ class RealisateurController extends AbstractController
 			return $this->redirectToRoute('realisateur_liste');
 		}
 
-		return $this->render('realisateur/modifier.html.twig', array(
-			'form'	=> $form->createView(),
+		return $this->renderForm('realisateur/modifier.html.twig', array(
+			'form'	=> $form,
             'realisateur'   =>  $realisateur
 		));
 	}
@@ -82,9 +82,9 @@ class RealisateurController extends AbstractController
             return $this->redirectToRoute('realisateur_liste');
         }
 
-		return $this->render('realisateur/supprimer.html.twig', array(
+		return $this->renderForm('realisateur/supprimer.html.twig', array(
 			'realisateur'  =>  $realisateur,
-            'form'  =>  $form->createView()
+            'form'  =>  $form
 		));
 	}
 

src/Controller/SecurityController.php

@@ -62,8 +62,8 @@ class SecurityController extends AbstractController
             $this->addFlash('success', 'L\'utilisateur a été ajouté');
             return $this->redirectToRoute('admin_index');
         }
-        return $this->render('security/createuser.html.twig', array (
-            'form'  => $form->createView()
+        return $this->renderForm('security/createuser.html.twig', array (
+            'form'  => $form
         ));
     }
 
@@ -80,8 +80,8 @@ class SecurityController extends AbstractController
             $this->addFlash('success', 'L\'utilisateur a été modifié');
             return $this->redirectToRoute('admin_index');
         }
-        return $this->render('security/createuser.html.twig', array (
-            'form'  => $form->createView()
+        return $this->renderForm('security/createuser.html.twig', array (
+            'form'  => $form
         ));
     }
 
@@ -100,9 +100,9 @@ class SecurityController extends AbstractController
             return $this->redirectToRoute('admin_index');
         }
         
-        return $this->render('profil/preferences.html.twig', [
+        return $this->renderForm('profil/preferences.html.twig', [
             'user'  => $options->getUser(),
-            'form'  => $form->createView()
+            'form'  => $form
         ]);
     }
 
@@ -130,9 +130,9 @@ class SecurityController extends AbstractController
             $this->addFlash("success", "L'utilisateur a bien été supprimé");
             return $this->redirectToRoute('admin_index');
         }
-        return $this->render('security/supprimeruser.html.twig', array (
+        return $this->renderForm('security/supprimeruser.html.twig', array (
             'user'  =>  $user,
-            'form'  =>  $form->createView()
+            'form'  =>  $form
         ));
     }
 
@@ -156,8 +156,8 @@ class SecurityController extends AbstractController
             return $this->redirectToRoute('app_login');
         }
 
-        return $this->render('security/register.html.twig', array(
-            'form'  => $form->createView()
+        return $this->renderForm('security/register.html.twig', array(
+            'form'  => $form
         ));
     }
 
@@ -189,8 +189,8 @@ class SecurityController extends AbstractController
                 $this->addFlash('warning', "Cet email n'existe pas");
             }
         }
-        return $this->render('security/chercheruserpourpassword.html.twig', array (
-            'form'  =>  $form->createView()
+        return $this->renderForm('security/chercheruserpourpassword.html.twig', array (
+            'form'  =>  $form
         ));
     }
 
@@ -208,8 +208,8 @@ class SecurityController extends AbstractController
                     $this->addFlash('success', 'Mot de passe changé, veuillez vous connecter');
                     return $this->redirectToRoute('videotheque_liste');
                 }
-                return $this->render('security/password.html.twig', array(
-                    'form' => $form->createView()
+                return $this->renderForm('security/password.html.twig', array(
+                    'form' => $form
                 ));
             }
         }

src/Controller/VideothequeController.php

@@ -92,8 +92,8 @@ class VideothequeController extends AbstractController
 			return $this->redirectToRoute('videotheque_voirfilm', array('id'=>$film->getId()));
 		}
 
-		return $this->render('videotheque/ajouter.html.twig', array(
-			'form'	=>	$form->createView(),
+		return $this->renderForm('videotheque/ajouter.html.twig', array(
+			'form'	=>	$form,
 		));
 	}
 
@@ -111,8 +111,8 @@ class VideothequeController extends AbstractController
 			return $this->redirectToRoute('videotheque_voirfilm',array('id'=>$film->getId()));
 		}
 
-		return $this->render('videotheque/modifier.html.twig', array(
-			'form'	=> $form->createView(),
+		return $this->renderForm('videotheque/modifier.html.twig', array(
+			'form'	=> $form,
 		));
 	}
 
@@ -131,9 +131,9 @@ class VideothequeController extends AbstractController
             return $this->redirectToRoute('videotheque_liste');
         }
 
-		return $this->render('videotheque/supprimer.html.twig', array(
+		return $this->renderForm('videotheque/supprimer.html.twig', array(
 			'film'  =>  $film,
-            'form'  =>  $form->createView()
+            'form'  =>  $form
 		));
 	}
 
@@ -161,9 +161,9 @@ class VideothequeController extends AbstractController
             $form = $this->createForm(CommentaireType::class, null);
         }
         
-        return $this->render('videotheque/voirfilm.html.twig', array(
+        return $this->renderForm('videotheque/voirfilm.html.twig', array(
             'film' => $film,
-            'form'  =>  $form->createView()
+            'form'  =>  $form
         ));
     }
 

templates/navbar.html.twig

@@ -74,21 +74,20 @@
                 <a href="#" class="nav-link" data-bs-toggle="modal" data-bs-target="#modalWindow"><i class="fa fa-info-circle fa-lg text-light nav-link" aria-hidden="true"></i></a>
             <li>
         </ul>
+        {% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}
         <ul class="navbar-nav">
             <li class="nav-item dropdown">
                 <a class="nav-link dropdown-toggle" href="#" id="navbarHelpDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     <i class="fa fa-question-circle fa-lg"></i>
                 </a>
-                {% if is_granted('IS_AUTHENTICATED_REMEMBERED') %}
                     <div class="dropdown-menu dropdown-menu-end p-4" aria-labelledby="navbarHelpDropdown" style="width: 400px;">
                             <p><i class="fa fa-bookmark fa-lg text-primary"></i> : Films que l'on souhaite voir. On les retrouve dans "Liste de mes films"</p>
                             <p><i class="fa fa-eye fa-lg text-success"></i> : Film qu'on a vu</p>
                             <p><i class="fa fa-eye-slash fa-lg text-secondary"></i> : Film qu'on n'a pas vu</p>
                     </div>
-                {% endif %}
             </li>
-
         </ul>
+        {% endif %}
         <ul class="navbar-nav">
             <li class="nav-item dropdown">
                 <a class="nav-link dropdown-toggle" href="#" id="navbarBellDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">