Merge branch 'master' into 'nathan_recherche'

# Conflicts:
#   src/Controller/HashtagController.php
#   templates/home/index.html.twig

src/Controller/HashtagController.php

@@ -19,6 +19,11 @@ class HashtagController extends AbstractController
     #[Route('/hashtag/{name}', name: 'hashtag')]
     public function index($name): Response
     {
+        $session = $this->get('session');
+
+        if (null === $session->get('user')) {
+            return  $this->redirectToRoute('login');
+        }
         $em = $this->getDoctrine()->getManager();
         $repository_hashtag = $em->getRepository(Hashtag::class);
         $hashtag = $repository_hashtag->findOneBy(array("name" => $name));
@@ -26,7 +31,8 @@ class HashtagController extends AbstractController
             $messages = $hashtag->getMessage()->getValues();
             usort($messages, array($this, "cmp_array"));
             return $this->render('hashtag/index.html.twig', [
-                'messages' => $messages
+                'messages' => $messages,
+                'username' => $session->get('user'),
             ]);
         }
         return new Response("Hashtag non existant");

src/Controller/PrivateDiscussionController.php

@@ -47,7 +47,8 @@ class PrivateDiscussionController extends AbstractController
         return $this->render('private_discussion/index.html.twig', [
             'controller_name' => 'PrivateDiscussionController',
             'messages' => $messages,
-            'form' => $form->createView()
+            'form' => $form->createView(),
+            'username' => $session->get('user'),
         ]);
     }
 }

src/Controller/PrivateDiscussionsController.php

@@ -73,7 +73,8 @@ class PrivateDiscussionsController extends AbstractController
         return $this->render('private_discussions/index.html.twig', [
             'controller_name' => 'PrivateDiscussionsController',
             'form' => $form->createView(),
-            'private_discussions' => $private_discussions
+            'private_discussions' => $private_discussions,
+            'username' => $session->get('user'),
         ]);
     }
 }