11 files changed, 261 insertions, 332 deletions

diff --git a/src/controller/ArticleController.php b/src/controller/ArticleController.php
index 2364c50..7019f5c 100644
--- a/src/controller/ArticleController.php
+++ b/src/controller/ArticleController.php
@@ -8,10 +8,12 @@ use App\Entity\Article;
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 
 class ArticleController
 {
-        static public function fetch(EntityManager $entityManager, Request $request): void
+        static public function fetch(EntityManager $entityManager, Request $request): JsonResponse
         {
                 if($request->query->has('id') && !empty($request->query->get('id')) && $request->query->has('last_article')){
                         $id = (int)$request->get('id'); // type et nettoie
@@ -29,6 +31,9 @@ class ArticleController
                                 elseif($parent_block->getName() === 'news_block'){
                                         $builder_name = 'NewBuilder';
                                 }
+                                else{
+                                        return new JsonResponse(['success' => false, 'error' => 'server side error'], JsonResponse::HTTP_INTERNAL_SERVER_ERROR);
+                                }
 
                                 $html = '';
                                 foreach($bulk_data as $article){
@@ -36,24 +41,20 @@ class ArticleController
                                         $html .= $builder->render();
                                 }
 
-                                echo json_encode(['success' => true, 'html' => $html, 'truncated' => $get_articles_return[1]]);
-                                die;
+                                return new JsonResponse(['success' => true, 'html' => $html, 'truncated' => $get_articles_return[1]]);
                         }
                         else{
-                                echo json_encode(['success' => false, 'error' => 'mauvais type de bloc']);
-                                die;
+                                return new JsonResponse(['success' => false, 'error' => 'server side error']);
                         }
                 }
                 else{
-                        echo json_encode(['success' => false, 'error' => 'la requête ne comporte pas les paramètres attendus']);
-                        die;
+                        return new JsonResponse(['success' => false, 'error' => 'bad parameters']);
                 }
         }
 
-        static public function editorSubmit(EntityManager $entityManager, array $json): void
+        static public function editorSubmit(EntityManager $entityManager, array $json): JsonResponse
         {
-                if(json_last_error() === JSON_ERROR_NONE)
-            {
+                if(json_last_error() === JSON_ERROR_NONE){
                 $id = $json['id'];
                 if(in_array($id[0], ['t', 'p', 'i', 'd'])){
                         $id = substr($id, 1);
@@ -76,8 +77,7 @@ class ArticleController
                 if($json['id'][0] === 'n'){ // ici $id est un bloc
                         $section_id = (int)substr($id, 1); // id du bloc <section>
                         if(!$model->findNodeById($section_id)){ // erreur mauvais id
-                                echo json_encode(['success' => false, 'error' => 'article_not_saved, bad id']);
-                                die;
+                                return new JsonResponse(['success' => false, 'error' => 'article_not_saved, bad id']);
                         }
                         $model->makeSectionNode();
                         $section = $model->getNode();
@@ -85,8 +85,7 @@ class ArticleController
                         // ajout d'une news
                         if(is_array($content)){
                                 if($section->getPage()->getEndOfPath() !== $json['from']){ // erreur mauvais from
-                                        echo json_encode(['success' => false, 'error' => 'article_not_saved, bad from']);
-                                        die;
+                                        return new JsonResponse(['success' => false, 'error' => 'article_not_saved, bad from']);
                                 }
 
                         $date = new \DateTime($content['d'] . ':' . (new \DateTime)->format('s')); // l'input type="datetime-local" ne donne pas les secondes, on les ajoute: 'hh:mm' . ':ss'
@@ -112,14 +111,12 @@ class ArticleController
                         $entityManager->persist($article_node);
                         $entityManager->flush();
                         
-                        echo json_encode(['success' => true, 'article_id' => $article_node->getId()]);
-                        die;
+                        return new JsonResponse(['success' => true, 'article_id' => $article_node->getId()]);
                 }
                 // modification article
                 //else{}
 
-                if($model->makeArticleNode($id)) // une entrée est trouvée
-                {
+                if($model->makeArticleNode($id)){ // une entrée est trouvée
                         $node = $model->getArticleNode();
                         switch($json['id'][0]){
                                         case 'i':
@@ -132,54 +129,74 @@ class ArticleController
                                                 $node->getArticle()->setTitle($content); // html de l'éditeur
                                                 break;
                                         case 'd':
-                                                echo json_encode(['success' => false, 'message' => 'l\'action editor_submit ne supporte pas les dates, utiliser date_submit.']);
-                                                die;
+                                                return new JsonResponse(['success' => false, 'message' => 'l\'action editor_submit ne supporte pas les dates, utiliser date_submit.']);
                                         default: // modif article simple (id sans lettre devant)
                                                 $node->getArticle()->setContent($content);
                                 }
                         $entityManager->flush();
-                        echo json_encode(['success' => true]);
+                        return new JsonResponse(['success' => true]);
                 }
-                else
-                {
-                        echo json_encode(['success' => false, 'message' => 'article non identifié']);
+                else{
+                        return new JsonResponse(['success' => false, 'message' => 'article non identifié']);
                 }
             }
             else{
-                echo json_encode(['success' => false, 'message' => 'Erreur de décodage JSON']);
+                return new JsonResponse(['success' => false, 'message' => 'Erreur de décodage JSON']);
             }
-            die;
         }
 
-        static public function deleteArticle(EntityManager $entityManager, array $data): Response // $data peut être un $_GET ou du JSON
+        static public function deleteArticle(EntityManager $entityManager, Request $request): Response
         {
                 $model = new Model($entityManager);
-                if(!$model->makeArticleNode($data['id'], true)){
-                        return new Response(
-                        '{"success": false, "message": "Erreur: pas d\'article à supprimer"}',
-                Response::HTTP_INTERNAL_SERVER_ERROR); // 500
+
+                if($request->headers->get('Content-Type') === 'application/json'){
+                        $id = json_decode($request->getContent(), true)['id'];
+                }
+                elseif($request->headers->get('Content-Type') === 'application/x-www-form-urlencoded'){
+                        $id = $request->query->get('id');
+                }
+                // ni JSON ni form, c'est quoi? un POST vide?
+                else{
+                        return new Response('la méthode deleteArticle ne peut être appelée de cette manière');
                 }
-            $article = $model->getArticleNode();
-                $section = $model->getNode();
 
-            $entityManager->remove($article);
-            $section->removeChild($article);
-            $section->sortChildren(true); // régénère les positions
+                if(!$model->makeArticleNode($id, true)){
+                        $params = ['false', "Erreur 500 pas d\'article à supprimer"];
+                }
+                else{
+                        $article = $model->getArticleNode();
+                        $section = $model->getNode();
+
+                    $entityManager->remove($article);
+                    $section->removeChild($article);
+                    $section->sortChildren(true); // régénère les positions
+
+                    try{
+                        $entityManager->flush();
+                        $params = ['true', 'Article supprimé avec succès'];
+                    }
+                    catch(Exception $e){
+                        $params = ['false', 'Erreur 500 ' . $e->getMessage()];
+                    }
+                }
 
-            try{
-                $entityManager->flush();
-                return new Response(
-                        '{"success": true, "message": "Article supprimé avec succès"}',
-                Response::HTTP_OK); // 200
-            }
-            catch(Exception $e){
-                return new Response(
-                        '{"success": false, "message": "Erreur: ' . $e->getMessage() . '"}',
-                Response::HTTP_INTERNAL_SERVER_ERROR); // 500
+                if($request->headers->get('Content-Type') === 'application/json'){
+                return new JsonResponse(
+                        ['success' => $params[0], 'message' => $params[1]],
+                        $params[0] ? JsonResponse::HTTP_OK : JsonResponse::HTTP_INTERNAL_SERVER_ERROR
+                );
             }
+            elseif($request->headers->get('Content-Type') === 'application/x-www-form-urlencoded'){
+                $url = new URL(['page' => $request->query->get('from') ?? '', 'success' => $params[0], 'message' => $params[1]]);
+                        return new RedirectResponse((string)$url);
+                }
+                else{
+                        // cas inaccesible
+                        throw new Exception('la méthode deleteArticle ne peut être appelée de cette manière');
+                }
         }
 
-        static public function switchPositions(EntityManager $entityManager, array $json): void
+        static public function switchPositions(EntityManager $entityManager, array $json): JsonResponse
         {
                 $model = new Model($entityManager);
                 $model->makeArticleNode($json['id1'], true);
@@ -202,11 +219,10 @@ class ArticleController
             $article2->setPosition($tmp);
             $entityManager->flush();
 
-                echo json_encode(['success' => true]);
-                die;
+                return new JsonResponse(['success' => true]);
         }
 
-        static public function dateSubmit(EntityManager $entityManager, array $json): void
+        static public function dateSubmit(EntityManager $entityManager, array $json): JsonResponse
         {
                 $id = substr($json['id'], 1);
                 $date = new DateTime($json['date']);
@@ -217,7 +233,6 @@ class ArticleController
                 $node->getArticle()->setDateTime($date);
                 $entityManager->flush();
                 
-                echo json_encode(['success' => true]);
-                die;
+                return new JsonResponse(['success' => true]);
         }
 }
\ No newline at end of file
diff --git a/src/controller/CalendarController.php b/src/controller/CalendarController.php
index b60ff11..1a62afa 100644
--- a/src/controller/CalendarController.php
+++ b/src/controller/CalendarController.php
@@ -5,10 +5,11 @@ declare(strict_types=1);
 
 use Doctrine\ORM\EntityManager;
 use App\Entity\Event;
+use Symfony\Component\HttpFoundation\JsonResponse;
 
 class CalendarController
 {
-        static public function getData(EntityManager $entityManager): void
+        static public function getData(EntityManager $entityManager): JsonResponse
         {
             // bornes début et fin du calendrier affiché à l'heure locale
             // noter que la vue "planning" est similaire à la vue "semaine"
@@ -33,50 +34,41 @@ class CalendarController
                 $events[] = $event->toArray();
             }
 
-            header('Content-Type: application/json');
-            echo json_encode($events);
-            die;
+            return new JsonResponse($events);
         }
 
-        static public function newEvent(array $json, EntityManager $entityManager):void
+        static public function newEvent(array $json, EntityManager $entityManager): JsonResponse
         {
                 try{
                 $event = new Event($json);
             }
             catch(InvalidArgumentException $e){
-                echo json_encode(['success' => false, 'error' => $e->getMessage()]);
-                http_response_code(400);
-                die;
+                return new JsonResponse(['success' => false, 'error' => $e->getMessage()], JsonResponse::HTTP_BAD_REQUEST); // code 400
             }
             $entityManager->persist($event);
             $entityManager->flush();
                 
-                echo json_encode(['success' => true, 'id' => $event->getId()]);
-                die;
+                return new JsonResponse(['success' => true, 'id' => $event->getId()]);
         }
-        static public function updateEvent(array $json, EntityManager $entityManager):void
+        static public function updateEvent(array $json, EntityManager $entityManager): JsonResponse
         {
                 $event = $entityManager->find('App\Entity\Event', (int)$json['id']);
             try{
                 $event->securedUpdateFromJSON($json);
             }
             catch(InvalidArgumentException $e){
-                echo json_encode(['success' => false, 'error' => $e->getMessage()]);
-                http_response_code(400);
-                die;
+                return new JsonResponse(['success' => false, 'error' => $e->getMessage()], JsonResponse::HTTP_BAD_REQUEST); // code 400
             }
             $entityManager->flush();
 
-                echo json_encode(['success' => true]);
-                die;
+                return new JsonResponse(['success' => true]);
         }
-        static public function removeEvent(array $json, EntityManager $entityManager):void
+        static public function removeEvent(array $json, EntityManager $entityManager): JsonResponse
         {
                 $event = $entityManager->find('App\Entity\Event', (int)$json['id']);
             $entityManager->remove($event);
             $entityManager->flush();
 
-                echo json_encode(['success' => true]);
-                die;
+                return new JsonResponse(['success' => true]);
         }
 }
\ No newline at end of file
diff --git a/src/controller/ContactFormController.php b/src/controller/ContactFormController.php
index 468b732..6b89161 100644
--- a/src/controller/ContactFormController.php
+++ b/src/controller/ContactFormController.php
@@ -4,28 +4,27 @@
 declare(strict_types=1);
 
 use Doctrine\ORM\EntityManager;
+use Symfony\Component\HttpFoundation\JsonResponse;
 
 class ContactFormController
 {
-        static public function keepEmails(EntityManager $entityManager, array $json): void
+        static public function keepEmails(EntityManager $entityManager, array $json): JsonResponse
         {
                 $form_data = $entityManager->find('App\Entity\NodeData', $json['id']);
                 $form_data->updateData('keep_emails', $json['checked'] ? true : false);
                 $entityManager->persist($form_data);
                 $entityManager->flush();
-                echo json_encode(['success' => true, 'checked' => $json['checked']]);
-                die;
+                return new JsonResponse(['success' => true, 'checked' => $json['checked']]);
         }
-        static public function setEmailsRetentionPeriod(EntityManager $entityManager, array $json): void
+        static public function setEmailsRetentionPeriod(EntityManager $entityManager, array $json): JsonResponse
         {
                 $form_data = $entityManager->find('App\Entity\NodeData', $json['id']);
                 $form_data->updateData($json['field'], (int)$json['months']);
                 $entityManager->persist($form_data);
                 $entityManager->flush();
-                echo json_encode(['success' => true, 'months' => $json['months']]);
-                die;
+                return new JsonResponse(['success' => true, 'months' => $json['months']]);
         }
-        static public function setEmailParam(EntityManager $entityManager, array $json): void
+        static public function setEmailParam(EntityManager $entityManager, array $json): JsonResponse
         {
                 $form = new FormValidation($json, 'email_params');
                 
@@ -41,16 +40,15 @@ class ContactFormController
                 }
 
                 if(empty($error)){
-                        echo json_encode(['success' => true]);
+                        return new JsonResponse(['success' => true]);
                 }
                 else{
-                        echo json_encode(['success' => false, 'error' => $error]);
+                        return new JsonResponse(['success' => false, 'error' => $error]);
                 }
-                die;
         }
 
         // les deux méthodes suivantes sont "factorisables", elles ne se distinguent que par la gestion ou non du formulaire rempli par le visiteur
-        static public function sendVisitorEmail(EntityManager $entityManager, array $json): void
+        static public function sendVisitorEmail(EntityManager $entityManager, array $json): JsonResponse
         {
                 $form = new FormValidation($json, 'email_send');
 
@@ -59,9 +57,7 @@ class ContactFormController
                         // destinataire = e-mail par défaut dans config.ini OU choisi par l'utilisateur
                         $form_data = $entityManager->find('App\Entity\NodeData', $json['id']);
                         if($form_data === null){
-                                http_response_code(500);
-                                echo json_encode(['success' => false, 'error' => 'server_error']);
-                                die;
+                                return new JsonResponse(['success' => false, 'error' => 'server_error'], JsonResponse::HTTP_INTERNAL_SERVER_ERROR); // code 500
                         }
                         
                         if(!EmailService::send($entityManager, $form_data, false, $form->getField('name'), $form->getField('email'), $form->getField('message'))){
@@ -73,45 +69,39 @@ class ContactFormController
                 }
 
                 if(empty($error)){
-                        echo json_encode(['success' => true]);
+                        return new JsonResponse(['success' => true]);
                 }
                 else{
-                        echo json_encode(['success' => false, 'error' => $error]);
+                        return new JsonResponse(['success' => false, 'error' => $error]);
                 }
-                die;
         }
-        static public function sendTestEmail(EntityManager $entityManager, array $json): void
+        static public function sendTestEmail(EntityManager $entityManager, array $json): JsonResponse
         {
                 // destinataire = e-mail par défaut dans config.ini OU choisi par l'utilisateur
                 $form_data = $entityManager->find('App\Entity\NodeData', $json['id']);
                 if($form_data === null){
-                        http_response_code(500);
-                        echo json_encode(['success' => false, 'error' => 'server_error']);
-                        die;
+                        return new JsonResponse(['success' => false, 'error' => 'server_error'], JsonResponse::HTTP_INTERNAL_SERVER_ERROR);
                 }
 
                 if(EmailService::send($entityManager, $form_data, true, 'nom du visiteur', 'adresse@du_visiteur.fr', "TEST d'un envoi d'e-mail depuis le site web")){
-                        echo json_encode(['success' => true]);
+                        return new JsonResponse(['success' => true]);
                 }
                 else{
-                        echo json_encode(['success' => false, 'error' => 'email_not_sent']);
+                        return new JsonResponse(['success' => false, 'error' => 'email_not_sent']);
                 }
-                die;
         }
-        static public function deleteEmail(EntityManager $entityManager, array $json): void
+        static public function deleteEmail(EntityManager $entityManager, array $json): JsonResponse
         {
                 $email = $entityManager->find('App\Entity\Email', $json['id']);
                 $entityManager->remove($email);
                 $entityManager->flush();
-                echo json_encode(['success' => true]);
-                die;
+                return new JsonResponse(['success' => true]);
         }
-        static public function toggleSensitiveEmail(EntityManager $entityManager, array $json): void
+        static public function toggleSensitiveEmail(EntityManager $entityManager, array $json): JsonResponse
         {
                 $email = $entityManager->find('App\Entity\Email', $json['id']);
                 $email->makeSensitive($json['checked']);
                 $entityManager->flush();
-                echo json_encode(['success' => true, 'checked' => $json['checked'], 'deletion_date' => $email->getDeletionDate()->format('d/m/Y')]);
-                die;
+                return new JsonResponse(['success' => true, 'checked' => $json['checked'], 'deletion_date' => $email->getDeletionDate()->format('d/m/Y')]);
         }
 }
\ No newline at end of file
diff --git a/src/controller/FileUploadController.php b/src/controller/FileUploadController.php
index f53f5c2..3cd5e6b 100644
--- a/src/controller/FileUploadController.php
+++ b/src/controller/FileUploadController.php
@@ -3,9 +3,11 @@
 
 declare(strict_types=1);
 
+use Symfony\Component\HttpFoundation\JsonResponse;
+
 class FileUploadController
 {
-        static public function checkFileDownload(array $file): bool
+        static private function checkFileDownload(array $file): bool
         {
                 $extensions_white_list = ['pdf', 'rtf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'odt', 'ods', 'odp']; // = extensions_white_list côté javascript
                 $mime_type_white_list = ['application/pdf', 'application/rtf', 'text/rtf', 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/vnd.ms-powerpoint', 'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'application/vnd.oasis.opendocument.text', 'application/vnd.oasis.opendocument.spreadsheet', 'application/vnd.oasis.opendocument.presentation'];
@@ -32,7 +34,7 @@ class FileUploadController
             return in_array($real_type, $mime_type_white_list, true);
         }
 
-        static public function fileUploadTinyMce(): void
+        static public function fileUploadTinyMce(): JsonResponse
         {
                 if(isset($_FILES['file'])){
                 $dest = 'user_data/media/';
@@ -46,22 +48,18 @@ class FileUploadController
                 
                 if(self::checkFileDownload($_FILES['file'])){
                         if(move_uploaded_file($_FILES['file']['tmp_name'], $file_path)){
-                                        echo json_encode(['location' => $file_path]);
+                                        return new JsonResponse(['location' => $file_path]);
                                 }
                                 else{
-                                        http_response_code(500);
-                                        echo json_encode(['message' => 'Erreur enregistrement du fichier.']);
+                                        return new JsonResponse(['message' => 'Erreur enregistrement du fichier.'], JsonResponse::HTTP_INTERNAL_SERVER_ERROR); // code 500
                                 }
                 }
                 else{
-                        http_response_code(400);
-                                echo json_encode(['message' => 'Erreur 400: fichier non valide.']);
+                                return new JsonResponse(['message' => 'Erreur 400: fichier non valide.'], JsonResponse::HTTP_BAD_REQUEST); // code 400
                         }
             }
             else{
-                http_response_code(400);
-                echo json_encode(['message' => 'Erreur 400: Bad Request']);
+                return new JsonResponse(['message' => 'Erreur 400: Bad Request'], JsonResponse::HTTP_BAD_REQUEST); // code 400
             }
-            die;
         }
 }
\ No newline at end of file
diff --git a/src/controller/HeadFootController.php b/src/controller/HeadFootController.php
index df6d022..72487d8 100644
--- a/src/controller/HeadFootController.php
+++ b/src/controller/HeadFootController.php
@@ -7,15 +7,15 @@ use App\Entity\NodeData;
 use App\Entity\Asset;
 use App\Entity\AssetEmployment;
 use Doctrine\ORM\EntityManager;
+use Symfony\Component\HttpFoundation\JsonResponse;
 
 class HeadFootController
 {
-        static public function setTextData(EntityManager $entityManager, string $request_params, array $json): void
+        static public function setTextData(EntityManager $entityManager, string $request_params, array $json): JsonResponse
         {
                 $params_array = explode('_', $request_params); // header_title, header_description, footer_name, footer_address, footer_email
                 if(count($params_array) !== 2){
-                        echo json_encode(['success' => false]);
-                        die;
+                        return new JsonResponse(['success' => false]);
                 }
 
                 $model = new Model($entityManager);
@@ -34,18 +34,16 @@ class HeadFootController
                         }
 
                         $entityManager->flush();
-                        echo json_encode(['success' => true]);
+                        return new JsonResponse(['success' => true]);
                 }
                 else{
-                        echo json_encode(['success' => false]);
+                        return new JsonResponse(['success' => false]);
                 }
-                die;
         }
-        static public function uploadAsset(EntityManager $entityManager, string $request_params): void
+        static public function uploadAsset(EntityManager $entityManager, string $request_params): JsonResponse
         {
                 if(empty($_FILES)){
-                        http_response_code(400);
-                        echo json_encode(['success' => false]);
+                        return new JsonResponse(['success' => false], JsonResponse::HTTP_BAD_REQUEST); // code 400
                 }
                 else{
                         if(!is_dir(Asset::USER_PATH)){
@@ -81,9 +79,8 @@ class HeadFootController
                         }
 
                         /* -- écriture du fichier sur le disque -- */
-                        if(!ImageUploadController::imagickCleanAndWriteImage(file_get_contents($file['tmp_name']), Asset::USER_PATH . $name, $extension)){ // recréer l’image pour la nettoyer
-                                http_response_code(500);
-                    echo json_encode(['success' => false, 'message' => "Erreur de l'enregistrement de l'image: problème de permission ou format non valide.", 'format' => $extension]);
+                        if(!ImageUploadController::imagickCleanAndWriteImage(file_get_contents($file['tmp_name']), Asset::USER_PATH . $name)){ // recréer l’image pour la nettoyer
+                    return new JsonResponse(['success' => false, 'message' => "Erreur de l'enregistrement de l'image: problème de permission ou format non valide.", 'format' => $extension], JsonResponse::HTTP_INTERNAL_SERVER_ERROR); // code 500
                         }
                         else{
                                 $params_array = explode('_', $request_params); // head_favicon, header_logo, header_background, footer_logo
@@ -111,23 +108,20 @@ class HeadFootController
                                                 $entityManager->persist($asset);
                                         }
                                         $entityManager->flush();
-                                        echo json_encode(['success' => true, 'location' => Asset::USER_PATH . $name, 'mime_type' => $mime_type]);
+                                        return new JsonResponse(['success' => true, 'location' => Asset::USER_PATH . $name, 'mime_type' => $mime_type]);
                                 }
                                 else{
-                                        http_response_code(500);
-                                        echo json_encode(['success' => false, 'message' => "Erreur noeud non trouvé, c'est pas du tout normal!"]);
+                                        return new JsonResponse(['success' => false, 'message' => "Erreur noeud non trouvé, c'est pas du tout normal!"], JsonResponse::HTTP_INTERNAL_SERVER_ERROR); // code 500
                                 }
                         }
                 }
-                die;
         }
 
-        static public function displaySocialNetwork(EntityManager $entityManager, string $request_params, array $json): void
+        static public function displaySocialNetwork(EntityManager $entityManager, string $request_params, array $json): JsonResponse
         {
                 $params_array = explode('_', $request_params);
                 if(count($params_array) !== 2){
-                        echo json_encode(['success' => false]);
-                        die;
+                        return new JsonResponse(['success' => false]);
                 }
 
                 $model = new Model($entityManager);
@@ -138,11 +132,10 @@ class HeadFootController
                         $node_data->updateData('social_show', $social_show);
 
                         $entityManager->flush();
-                        echo json_encode(['success' => true, 'checked' => $json['checked']]);
+                        return new JsonResponse(['success' => true, 'checked' => $json['checked']]);
                 }
                 else{
-                        echo json_encode(['success' => false]);
+                        return new JsonResponse(['success' => false]);
                 }
-                die;
         }
 }
\ No newline at end of file
diff --git a/src/controller/ImageUploadController.php b/src/controller/ImageUploadController.php
index ddd99ae..af9a553 100644
--- a/src/controller/ImageUploadController.php
+++ b/src/controller/ImageUploadController.php
@@ -3,6 +3,8 @@
 
 declare(strict_types=1);
 
+use Symfony\Component\HttpFoundation\JsonResponse;
+
 class ImageUploadController
 {
         const ALLOWED_EXTENSIONS = ['jpg', 'jpeg', 'png', 'gif', 'webp', 'tiff', 'tif'];
@@ -78,16 +80,13 @@ class ImageUploadController
         }
 
         // téléchargement par le plugin (bouton "insérer une image")
-        static public function imageUploadTinyMce(): void
+        static public function imageUploadTinyMce(): JsonResponse
         {
                 if(!isset($_FILES['file'])){
-                        http_response_code(400);
-                echo json_encode(['message' => 'Erreur 400: Bad Request']);
+                return new JsonResponse(['message' => 'Erreur 400: Bad Request'], JsonResponse::HTTP_BAD_REQUEST); // code 400
             }
             if(!is_uploaded_file($_FILES['file']['tmp_name'])) {
-            http_response_code(400);
-            echo json_encode(['message' => "Le fichier n'a pas été téléchargé correctement."]);
-            die;
+            return new JsonResponse(['message' => "Le fichier n'a pas été téléchargé correctement."], JsonResponse::HTTP_BAD_REQUEST); // code 400
         }
 
         $dest = 'user_data/images/';
@@ -113,35 +112,29 @@ class ImageUploadController
         //
 
         if(self::imagickCleanAndWriteImage($image_data, $local_path)){ // recréer l’image pour la nettoyer
-            echo json_encode(['location' => $local_path]); // renvoyer l'URL de l'image téléchargée
+            return new JsonResponse(['location' => $local_path]); // renvoyer l'URL de l'image téléchargée
         }
         else{
-            http_response_code(500);
-            echo json_encode(['message' => 'Erreur image non valide']);
+            return new JsonResponse(['message' => 'Erreur image non valide'], JsonResponse::HTTP_INTERNAL_SERVER_ERROR); // code 500
         }
-            die;
         }
 
         // collage de HTML => recherche de balises <img>, téléchargement côté serveur et renvoi de l'adresse sur le serveur 
-        static public function uploadImageHtml(): void
+        static public function uploadImageHtml(): JsonResponse
         {
                 $json = json_decode(file_get_contents('php://input'), true);
             
             if(!isset($json['image_url'])){
-                http_response_code(400);
-            echo json_encode(['message' => "Erreur 400: Bad Request"]);
-            die;
+            return new JsonResponse(['message' => "Erreur 400: Bad Request"], JsonResponse::HTTP_BAD_REQUEST); // code 400
             }
 
         $image_data = self::curlDownloadImage($json['image_url']); // téléchargement de l’image par le serveur avec cURL au lieu de file_get_contents
         if(!$image_data){
-            http_response_code(400);
-            echo json_encode(['message' => "Erreur, le serveur n'a pas réussi à télécharger l'image."]);
-            die;
+            return new JsonResponse(['message' => "Erreur, le serveur n'a pas réussi à télécharger l'image."], JsonResponse::HTTP_BAD_REQUEST); // code 400
         }
 
         $dest = 'user_data/images/';
-        if(!is_dir($dest)) { // Vérifier si le répertoire existe, sinon le créer
+        if(!is_dir($dest)){ // Vérifier si le répertoire existe, sinon le créer
             mkdir($dest, 0755, true);
         }
         
@@ -154,17 +147,15 @@ class ImageUploadController
         $local_path = uniqid($dest . $name . '_') . '.' . $extension;
         
         if(self::imagickCleanAndWriteImage($image_data, $local_path)){ // recréer l’image pour la nettoyer
-            echo json_encode(['location' => $local_path]); // nouvelle adresse
+            return new JsonResponse(['location' => $local_path]); // nouvelle adresse
         }
         else{
-            http_response_code(500);
-            echo json_encode(['message' => 'Erreur image non valide', 'format' => $extension]);
+            return new JsonResponse(['message' => 'Erreur image non valide', 'format' => $extension], JsonResponse::HTTP_INTERNAL_SERVER_ERROR); // code 500
         }
-            die;
         }
 
         // collage simple d'une image (base64 dans le presse-papier) non encapsulée dans du HTML
-        static public function uploadImageBase64(): void
+        static public function uploadImageBase64(): JsonResponse
         {
                 $json = json_decode(file_get_contents('php://input'), true);
             $dest = 'user_data/images/';
@@ -175,9 +166,7 @@ class ImageUploadController
 
             // détection de data:image/ et de ;base64, et capture du format dans $type
             if(!isset($json['image_base64']) || !preg_match('/^data:image\/(\w+);base64,/', $json['image_base64'], $type)){
-                http_response_code(400);
-                echo json_encode(['message' => 'Données image base64 manquantes ou invalides']);
-                die;
+                return new JsonResponse(['message' => 'Données image base64 manquantes ou invalides'], JsonResponse::HTTP_BAD_REQUEST); // code 400
             }
 
             $extension = strtolower($type[1]); // dans (\w+)
@@ -188,19 +177,15 @@ class ImageUploadController
             $name = 'pasted_image'; 
             $image_data = base64_decode(substr($json['image_base64'], strpos($json['image_base64'], ',') + 1)); // découpe la chaine à la virgule puis convertit en binaire
             if($image_data === false){
-                http_response_code(400);
-                echo json_encode(['message' => 'Décodage base64 invalide']);
-                die;
+                return new JsonResponse(['message' => 'Décodage base64 invalide'], JsonResponse::HTTP_BAD_REQUEST); // code 400
             }
             $local_path = uniqid($dest . $name . '_') . '.' . $extension;
 
             if(self::imagickCleanAndWriteImage($image_data, $local_path)){
-                echo json_encode(['location' => $local_path]);
+                return new JsonResponse(['location' => $local_path]);
             }
             else{
-                http_response_code(500);
-                echo json_encode(['message' => 'Erreur image non valide', 'format' => $extension]);
+                return new JsonResponse(['message' => 'Erreur image non valide', 'format' => $extension], JsonResponse::HTTP_INTERNAL_SERVER_ERROR); // code 500
             }
-            die;
         }
 }
\ No newline at end of file
diff --git a/src/controller/MaintenanceController.php b/src/controller/MaintenanceController.php
index 98f2e60..1f8fadd 100644
--- a/src/controller/MaintenanceController.php
+++ b/src/controller/MaintenanceController.php
@@ -6,17 +6,18 @@ declare(strict_types=1);
 use Doctrine\ORM\EntityManager;
 use App\Entity\log;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
 class MaintenanceController
 {
-        static public function getLogs(EntityManager $entityManager): void
+        static public function getLogs(EntityManager $entityManager): JsonResponse
         {
                 $data = $entityManager->getRepository(Log::class)->findAll();
                 if(empty($data)){
-                        echo json_encode(['success' => false]);
+                        return new JsonResponse(['success' => false]);
                 }
                 else{
                         $view = '<h4>Table ' . TABLE_PREFIX . 'log de la base de données</h4>
@@ -35,24 +36,22 @@ class MaintenanceController
                 </tr>';
             }
             $view .= '</tbody></table>';
-                        echo json_encode(['success' => true, 'view' => $view]);
+                        return new JsonResponse(['success' => true, 'view' => $view]);
                 }
-                die;
         }
-        static public function eraseLogs(EntityManager $entityManager): void
+        static public function eraseLogs(EntityManager $entityManager): JsonResponse
         {
                 try{
                         $table = $entityManager->getClassMetadata(Log::class)->getTableName();
                         $entityManager->getConnection()->executeStatement("TRUNCATE TABLE {$table}"); // SQL donné à DBAL
-                        echo json_encode(['success' => true]);
+                        return new JsonResponse(['success' => true]);
                 }
                 catch(Exception $e){
-                        echo json_encode(['success' => false]);
+                        return new JsonResponse(['success' => false, 'error' => $e->getMessage()]);
                 }
-                die;
         }
 
-        static public function getLastDump(EntityManager $entityManager): void
+        static public function getLastDump(EntityManager $entityManager): BinaryFileResponse|RedirectResponse
         {
                 try{
                         $backup_list = Backup::getBackupList();
@@ -75,10 +74,9 @@ class MaintenanceController
                         $_SESSION['flash_message'] = $e->getMessage();
                         $response = new RedirectResponse((string) new URL(['page' => 'maintenance']));
                 }
-                $response->send();
-                die;
+                return $response;
         }
-        static public function getAllMedia(): void
+        static public function getAllMedia(): BinaryFileResponse|RedirectResponse
         {
                 try{
                         $file_path = '../var/' . UserDataService::createZip('all_media.zip', ['user_data/assets', 'user_data/images', 'user_data/media']);
@@ -89,12 +87,11 @@ class MaintenanceController
                         $_SESSION['flash_message'] = $e->getMessage();
                         $response = new RedirectResponse((string) new URL(['page' => 'maintenance']));
                 }
-                $response->send();
-                die;
+                return $response;
         }
 
         // parce qu'il faut un contrôleur
-        static public function handleBackupSelection(EntityManager $entityManager, Request $request): void
+        static public function handleBackupSelection(EntityManager $entityManager, Request $request): RedirectResponse
         {
                 $selected_file = $request->request->get('selected_sql');
                 $url = new URL;
@@ -114,12 +111,10 @@ class MaintenanceController
                 $_SESSION['flash_message'] = "Une erreur s'est produite: " . $e->getMessage();
             }
 
-            $response = new RedirectResponse((string)$url);
-            $response->send();
-            die;
+            return new RedirectResponse((string)$url);
         }
 
-        static public function downloadSQL(EntityManager $entityManager, Request $request): void
+        static public function downloadSQL(EntityManager $entityManager, Request $request): RedirectResponse
         {
         $uploaded_file = $request->files->get('uploaded_sql');
         $date = new DateTime;
@@ -147,8 +142,6 @@ class MaintenanceController
                 $_SESSION['flash_message'] = "Une erreur s'est produite: " . $e->getMessage();
             }
 
-            $response = new RedirectResponse((string)$url);
-            $response->send();
-            die;
+            return new RedirectResponse((string)$url);
         }
 }
\ No newline at end of file
diff --git a/src/controller/MenuAndPathsController.php b/src/controller/MenuAndPathsController.php
index 799f14b..9bd6ad1 100644
--- a/src/controller/MenuAndPathsController.php
+++ b/src/controller/MenuAndPathsController.php
@@ -5,10 +5,12 @@ declare(strict_types=1);
 
 use App\Entity\Page;
 use Doctrine\ORM\EntityManager;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 
 class MenuAndPathsController
 {
-    static public function newUrlMenuEntry(EntityManager $entityManager): void
+    static public function newUrlMenuEntry(EntityManager $entityManager): RedirectResponse
     {
         Model::$menu = new Menu($entityManager);
         $previous_page = Model::$menu->findPageById((int)$_POST["location"]); // (int) à cause de declare(strict_types=1);
@@ -16,8 +18,8 @@ class MenuAndPathsController
 
         $url_input = trim($_POST["url_input"]); // faire htmlspecialchars à l'affichage
         if(!filter_var($url_input, FILTER_VALIDATE_URL) || !str_starts_with($url_input, 'http')){
-            header("Location: " . new URL(['page' => $_GET['from'], 'error' => 'invalide_url']));
-            die;
+            // utiliser une flash error
+            return new RedirectResponse((string)new URL(['page' => $_GET['from'], 'error' => 'invalide_url']));
         }
 
         $page = new Page(
@@ -38,24 +40,23 @@ class MenuAndPathsController
 
         $entityManager->persist($page);
         $entityManager->flush();
-        header("Location: " . new URL(['page' => $_GET['from']]));
-        die;
+        return new RedirectResponse((string)new URL(['page' => $_GET['from']]));
     }
 
     // on pourrait utiliser FormValidation ici
-    static public function editUrl(EntityManager $entityManager, array $json): void
+    static public function editUrl(EntityManager $entityManager, array $json): JsonResponse
     {
         $url_data = trim($json['input_data']); // garder htmlspecialchars pour l'affichage
         $page = $entityManager->find('App\Entity\Page', $json['id']);
 
         if(!$page){
-            echo json_encode(['success' => false, 'message' => "id invalide"]);
+            return new JsonResponse(['success' => false, 'message' => "id invalide"]);
         }
         elseif(!in_array($json['field'], ['url_name', 'url_content'])){
-            echo json_encode(['success' => false, 'message' => "champ invalide"]);
+            return new JsonResponse(['success' => false, 'message' => "champ invalide"]);
         }
         elseif($json['field'] === 'url_content' && (!filter_var($url_data, FILTER_VALIDATE_URL) || !str_starts_with($url_data, 'http'))){
-            echo json_encode(['success' => false, 'message' => "la chaîne envoyée n'est pas une URL valide"]);
+            return new JsonResponse(['success' => false, 'message' => "la chaîne envoyée n'est pas une URL valide"]);
         }
         else{
             if($json['field'] === 'url_name'){
@@ -65,12 +66,11 @@ class MenuAndPathsController
                 $page->setEndOfPath($url_data);
             }
             $entityManager->flush();
-            echo json_encode(['success' => true, 'url_data' => $url_data]);
+            return new JsonResponse(['success' => true, 'url_data' => $url_data]);
         }
-        die;
     }
 
-    static public function deleteUrlMenuEntry(EntityManager $entityManager): void
+    static public function deleteUrlMenuEntry(EntityManager $entityManager): RedirectResponse
     {
         Model::$menu = new Menu($entityManager);
         $page = Model::$menu->findPageById((int)$_POST["delete"]);
@@ -84,11 +84,10 @@ class MenuAndPathsController
 
         $entityManager->remove($page); // suppression en BDD
         $entityManager->flush();
-        header("Location: " . new URL(['page' => $_GET['from']]));
-        die;
+        return new RedirectResponse((string)new URL(['page' => $_GET['from']]));
     }
 
-        static public function MoveOneLevelUp(EntityManager $entityManager, array $json): void
+        static public function MoveOneLevelUp(EntityManager $entityManager, array $json): JsonResponse
         {
                 $id = $json['id'];
                 $page = Model::$menu->findPageById((int)$id);
@@ -96,8 +95,7 @@ class MenuAndPathsController
         $parent = $page->getParent(); // peut être null
         if($parent === null){
             // 1er niveau: ne rien faire
-            echo json_encode(['success' => false]);
-            die;
+            return new JsonResponse(['success' => false, 'message' => 'nothing to do']);
         }
         // BDD
         else{
@@ -130,12 +128,11 @@ class MenuAndPathsController
             $parent->removeChild($page);
             $nav_builder = new NavBuilder();
                 $menu_builder = new MenuBuilder(null, false);
-                        echo json_encode(['success' => true, 'nav' => $nav_builder->render(), 'menu_buttons' => $menu_builder->render()]);
-                        die;
+                        return new JsonResponse(['success' => true, 'nav' => $nav_builder->render(), 'menu_buttons' => $menu_builder->render()]);
         }
         }
 
-        static public function MoveOneLevelDown(EntityManager $entityManager, array $json): void
+        static public function MoveOneLevelDown(EntityManager $entityManager, array $json): JsonResponse
         {
                 $id = $json['id'];
                 $page = Model::$menu->findPageById((int)$id);
@@ -152,8 +149,7 @@ class MenuAndPathsController
                 if($child->getPosition() === $page->getPosition() - 1){
                     // refus si $parent est une adresse, ça va casser le lien, exemple: index.php?page=chemin/http://un_site_web.fr/vers/ici
                     if(str_starts_with($child->getEndOfPath(), 'http')){
-                        echo json_encode(['success' => false, 'error' => 'new_parent_is_a_link']);
-                        die;
+                        return new JsonResponse(['success' => false, 'error' => 'new_parent_is_a_link']);
                     }
 
                     $page->setParent($child);
@@ -171,11 +167,10 @@ class MenuAndPathsController
         $nav_builder = new NavBuilder();
                 $menu_builder = new MenuBuilder(null, false);
 
-                echo json_encode(['success' => true, 'nav' => $nav_builder->render(), 'menu_buttons' => $menu_builder->render()]);
-                die;
+                return new JsonResponse(['success' => true, 'nav' => $nav_builder->render(), 'menu_buttons' => $menu_builder->render()]);
         }
 
-        static public function SwitchPositions(EntityManager $entityManager, array $json): void
+        static public function SwitchPositions(EntityManager $entityManager, array $json): JsonResponse
         {
                 $id1 = $json['id1'];
         $id2 = $json['id2'];
@@ -196,15 +191,14 @@ class MenuAndPathsController
                 
                 // nouveau menu
                 $nav_builder = new NavBuilder();
-                echo json_encode(['success' => true, 'nav' => $nav_builder->render()]);
+                return new JsonResponse(['success' => true, 'nav' => $nav_builder->render()]);
         }
         else{
-                echo json_encode(['success' => false]);
+                return new JsonResponse(['success' => false]);
         }
-            die;
         }
 
-        static public function displayInMenu(EntityManager $entityManager, array $json): void
+        static public function displayInMenu(EntityManager $entityManager, array $json): JsonResponse
         {
                 $id = $json['id'];
                 $checked = $json['checked'];
@@ -216,11 +210,10 @@ class MenuAndPathsController
 
                         // nouveau menu
                         $nav_builder = new NavBuilder();
-                        echo json_encode(['success' => true, 'nav' => $nav_builder->render()]);
+                        return new JsonResponse(['success' => true, 'nav' => $nav_builder->render()]);
                 }
                 else{
-                        echo json_encode(['success' => false]);
+                        return new JsonResponse(['success' => false]);
                 }
-                die;
         }
 }
\ No newline at end of file
diff --git a/src/controller/PageManagementController.php b/src/controller/PageManagementController.php
index 8c4092f..a43f36c 100644
--- a/src/controller/PageManagementController.php
+++ b/src/controller/PageManagementController.php
@@ -8,25 +8,28 @@ use App\Entity\Node;
 use App\Entity\NodeData;
 //use App\Entity\Image;
 use Doctrine\ORM\EntityManager;
+use Symfony\Component\HttpFoundation\InputBag;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
 
 class PageManagementController
 {
         /* -- partie page -- */
-        static public function setPageTitle(EntityManager $entityManager, array $json): void
+        static public function setPageTitle(EntityManager $entityManager, array $json): JsonResponse
         {
                 $page = $entityManager->find('App\Entity\Page', $json['page_id']);
                 $page->setPageName(htmlspecialchars($json['title']));
                 $entityManager->flush();
-                echo json_encode(['success' => true, 'title' => $page->getPageName()]);
-                die;
+                return new JsonResponse(['success' => true, 'title' => $page->getPageName()]);
         }
 
-        static public function updatePageMenuPath(EntityManager $entityManager): void
+        static public function updatePageMenuPath(EntityManager $entityManager, string $page_menu_path): RedirectResponse
         {
             Model::$menu = new Menu($entityManager);
             Model::$page_path = new Path();
             $page = Model::$page_path->getLast();
-            $path = htmlspecialchars($_POST['page_menu_path']);
+            $path = htmlspecialchars($page_menu_path);
 
             // mise en snake_case: filtre caractères non-alphanumériques, minuscule, doublons d'underscore, trim des underscores
             $path = trim(preg_replace('/_+/', '_', strtolower(preg_replace('/[^a-zA-Z0-9]/', '_', $path))), '_');
@@ -37,30 +40,28 @@ class PageManagementController
                 }
             }
             $entityManager->flush();
-            header("Location: " . new URL(['page' => $page->getPagePath(), 'mode' => 'page_modif']));
-            die;
+            return new RedirectResponse((string)new URL(['page' => $page->getPagePath(), 'mode' => 'page_modif']));
         }
 
-        static public function setPageDescription(EntityManager $entityManager, array $json): void
+        static public function setPageDescription(EntityManager $entityManager, array $json): JsonResponse
         {
                 $page = $entityManager->find('App\Entity\Page', $json['page_id']);
                 $page->setDescription(htmlspecialchars($json['description']));
                 $entityManager->flush();
-                echo json_encode(['success' => true, 'description' => $page->getDescription()]);
-                die;
+                return new JsonResponse(['success' => true, 'description' => $page->getDescription()]);
         }
 
-        static public function newPage(EntityManager $entityManager, array $post): void
+        static public function newPage(EntityManager $entityManager, InputBag $post): RedirectResponse
         {
             // titre et chemin
             Model::$menu = new Menu($entityManager);
-            $previous_page = Model::$menu->findPageById((int)$post["page_location"]); // (int) à cause de declare(strict_types=1);
+            $previous_page = Model::$menu->findPageById((int)$post->get("page_location")); // (int) à cause de declare(strict_types=1);
             $parent = $previous_page->getParent();
 
             $page = new Page(
-                trim(htmlspecialchars($post["page_name"])),
-                trim(htmlspecialchars($post["page_name_path"])),
-                trim(htmlspecialchars($post["page_description"])),
+                trim(htmlspecialchars($post->get("page_name"))),
+                trim(htmlspecialchars($post->get("page_name_path"))),
+                trim(htmlspecialchars($post->get("page_description"))),
                 true, true, false,
                 $previous_page->getPosition(),
                 $parent); // peut et DOIT être null si on est au 1er niveau
@@ -80,14 +81,13 @@ class PageManagementController
             $entityManager->flush();
 
             // page créée, direction la page en mode modification pour ajouter des blocs
-            header("Location: " . new URL(['page' => $page->getPagePath(), 'mode' => 'page_modif']));
-            die;
+            return new RedirectResponse((string)new URL(['page' => $page->getPagePath(), 'mode' => 'page_modif']));
         }
 
-        static public function deletePage(EntityManager $entityManager): void
+        static public function deletePage(EntityManager $entityManager, string $page_id): RedirectResponse
         {
                 $menu = new Menu($entityManager);
-                $page = $menu->findPageById((int)$_POST['page_id']);
+                $page = $menu->findPageById((int)$page_id);
                 $url = new URL;
 
                 // test dernière page
@@ -115,13 +115,12 @@ class PageManagementController
                     $next_page = $menu->getChildren()->isEmpty() ? $next_page = $page->getChildren()[0] : $menu->getChildren()[0];
                     $url->addParams(['page' => $next_page->getEndOfPath()]);
                 }
-                
-            header("Location: " . $url);
-            die;
+
+                return new RedirectResponse((string)$url);
         }
 
         /* partie "blocs" */
-        static public function addBloc(EntityManager $entityManager): void
+        static public function addBloc(EntityManager $entityManager, Request $request): RedirectResponse
         {
             $model = new Model($entityManager);
             $model->makeMenuAndPaths(); // on a besoin de page_path qui dépend de menu
@@ -131,31 +130,30 @@ class PageManagementController
             $main = $model->getNode();
             $position = count($main->getChildren()) + 1; // position dans la fraterie
 
-            if(!in_array($_POST["bloc_select"], array_keys(Blocks::$blocks), true)) // 3è param: contrôle du type
-            {
-                header("Location: " . new URL(['page' => $_GET['page'], 'error' => 'bad_bloc_type']));
-                die;
+            if(!in_array($request->request->get("bloc_select"), array_keys(Blocks::$blocks), true)){ // 3è param: contrôle du type
+                // utiliser une flash error
+                return new RedirectResponse((string)new URL(['page' => $request->query->get('page'), 'error' => 'bad_bloc_type']));
             }
 
-            if(in_array($_POST["bloc_select"], ['calendar', 'form'])){
-                $page->addCSS($_POST["bloc_select"]);
-                if($_POST["bloc_select"] === 'form'){
-                    $page->addJS($_POST["bloc_select"]);
+            if(in_array($request->request->get("bloc_select"), ['calendar', 'form'])){
+                $page->addCSS($request->request->get("bloc_select"));
+                if($request->request->get("bloc_select") === 'form'){
+                    $page->addJS($request->request->get("bloc_select"));
                 }
                 $entityManager->persist($page);
             }
 
-            $block = new Node($_POST["bloc_select"], $position, $main, $page);
-            $data = new NodeData(['title' => trim(htmlspecialchars($_POST["bloc_title"]))], $block);
+            $block = new Node($request->request->get("bloc_select"), $position, $main, $page);
+            $data = new NodeData(['title' => trim(htmlspecialchars($request->request->get("bloc_title")))], $block);
 
             // valeurs par défaut
-            if($_POST["bloc_select"] === 'post_block'){
+            if($request->request->get("bloc_select") === 'post_block'){
                 $data->setPresentation('fullwidth');
             }
-            elseif($_POST["bloc_select"] === 'news_block'){
+            elseif($request->request->get("bloc_select") === 'news_block'){
                 $data->setPresentation('grid');
             }
-            elseif($_POST["bloc_select"] === 'galery'){
+            elseif($request->request->get("bloc_select") === 'galery'){
                 $data->setPresentation('mosaic'); // un jour on mettra carousel
             }
             // else = null par défaut
@@ -163,11 +161,10 @@ class PageManagementController
             $entityManager->persist($block);
             $entityManager->persist($data);
             $entityManager->flush();
-            header("Location: " . new URL(['page' => $_GET['page'], 'mode' => 'page_modif']));
-            die;
+            return new RedirectResponse((string)new URL(['page' => $request->query->get('page'), 'mode' => 'page_modif']));
         }
 
-        static public function deleteBloc(EntityManager $entityManager): void
+        static public function deleteBloc(EntityManager $entityManager, Request $request): RedirectResponse
         {
             $model = new Model($entityManager);
             $model->makeMenuAndPaths();
@@ -179,7 +176,7 @@ class PageManagementController
             $type = '';
             $nb_same_type = 0;
             foreach($main->getChildren() as $child){
-                if($child->getId() === (int)$_POST['delete_bloc_id']){
+                if($child->getId() === (int)$request->request->get('delete_bloc_id')){
                     $block = $child;
                     $type = $block->getName();
                 }
@@ -207,11 +204,10 @@ class PageManagementController
                 $entityManager->flush();
             }
 
-            header("Location: " . new URL(['page' => $_GET['page'], 'mode' => 'page_modif']));
-            die;
+            return new RedirectResponse((string)new URL(['page' => $request->query->get('page'), 'mode' => 'page_modif']));
         }
         
-        static public function renameBloc(EntityManager $entityManager, array $json): void
+        static public function renameBloc(EntityManager $entityManager, array $json): JsonResponse
         {
                 if(isset($json['bloc_title']) && $json['bloc_title'] !== null && isset($json['bloc_id']) && is_int($json['bloc_id'])){
             $model = new Model($entityManager);
@@ -223,17 +219,16 @@ class PageManagementController
             $model->getNode()->getNodeData()->updateData('title', htmlspecialchars($json['bloc_title']));
 
             $entityManager->flush();
-            echo json_encode(['success' => true, 'title' => $data['title']]);
+            return new JsonResponse(['success' => true, 'title' => $data['title']]);
         }
         else{
-                        echo json_encode(['success' => false]);
+                        return new JsonResponse(['success' => false]);
                 }
-                die;
         }
 
-        static public function SwitchBlocsPositions(EntityManager $entityManager, array $json): void
+        static public function SwitchBlocsPositions(EntityManager $entityManager, array $json, string $page): JsonResponse
         {
-                if(isset($json['id1']) && is_int($json['id1']) && isset($json['id2']) && is_int($json['id2']) && isset($_GET['page'])){
+                if(isset($json['id1']) && is_int($json['id1']) && isset($json['id2']) && is_int($json['id2']) && isset($page)){
                 $model = new Model($entityManager);
                 $model->makeMenuAndPaths(); // true pour $model->findItsChildren();
                 $model->findUniqueNodeByName('main');
@@ -262,15 +257,14 @@ class PageManagementController
                 $bloc2->setPosition($tmp);
 
                 $entityManager->flush();
-            echo json_encode(['success' => true]);
+            return new JsonResponse(['success' => true]);
         }
         else{
-                        echo json_encode(['success' => false]);
+                        return new JsonResponse(['success' => false]);
                 }
-                die;
         }
 
-        static public function changeArticlesOrder(EntityManager $entityManager, array $json): void
+        static public function changeArticlesOrder(EntityManager $entityManager, array $json): JsonResponse
         {
                 if(isset($json['id']) && isset($json['chrono_order'])){
                         $model = new Model($entityManager);
@@ -289,15 +283,14 @@ class PageManagementController
                         $model->getNode()->getNodeData()->setChronoOrder($chrono_order);
                         $entityManager->flush();
                         
-                        echo json_encode(['success' => true, 'chrono_order' => $json['chrono_order']]);
+                        return new JsonResponse(['success' => true, 'chrono_order' => $json['chrono_order']]);
                 }
                 else{
-                        echo json_encode(['success' => false]);
+                        return new JsonResponse(['success' => false]);
                 }
-                die;
         }
 
-        static public function changePresentation(EntityManager $entityManager, array $json): void
+        static public function changePresentation(EntityManager $entityManager, array $json): JsonResponse
         {
                 if(isset($json['id']) && isset($json['presentation'])){
                         $model = new Model($entityManager);
@@ -311,18 +304,17 @@ class PageManagementController
                                 if($json['presentation'] === 'grid'){
                                         $response_data['cols_min_width'] = $model->getNode()->getNodeData()->getColsMinWidth();
                                 }
-                                echo json_encode($response_data);
+                                return new JsonResponse($response_data);
                         }
                         else{
-                                echo json_encode(['success' => false]);
+                                return new JsonResponse(['success' => false]);
                         }
                 }
                 else{
-                        echo json_encode(['success' => false]);
+                        return new JsonResponse(['success' => false]);
                 }
-                die;
         }
-        static public function changeColsMinWidth(EntityManager $entityManager, array $json): void
+        static public function changeColsMinWidth(EntityManager $entityManager, array $json): JsonResponse
         {
                 if(isset($json['id']) && isset($json['cols_min_width'])){
                         $model = new Model($entityManager);
@@ -330,14 +322,13 @@ class PageManagementController
                         $model->getNode()->getNodeData()->setColsMinWidth((int)$json['cols_min_width']); // attention conversion?
 
                         $entityManager->flush();
-                        echo json_encode(['success' => true, 'cols_min_width' => $json['cols_min_width']]);
+                        return new JsonResponse(['success' => true, 'cols_min_width' => $json['cols_min_width']]);
                 }
                 else{
-                        echo json_encode(['success' => false]);
+                        return new JsonResponse(['success' => false]);
                 }
-                die;
         }
-        static public function changePaginationLimit(EntityManager $entityManager, array $json): void
+        static public function changePaginationLimit(EntityManager $entityManager, array $json): JsonResponse
         {
                 if(isset($json['id']) && isset($json['pagination_limit'])){
                         $model = new Model($entityManager);
@@ -347,11 +338,10 @@ class PageManagementController
 
                         $entityManager->flush();
 
-                        echo json_encode(['success' => true, 'old_limit' => $old_limit, 'new_limit' => $json['pagination_limit']]);
+                        return new JsonResponse(['success' => true, 'old_limit' => $old_limit, 'new_limit' => $json['pagination_limit']]);
                 }
                 else{
-                        echo json_encode(['success' => false]);
+                        return new JsonResponse(['success' => false]);
                 }
-                die;
         }
 }
\ No newline at end of file
diff --git a/src/controller/UserController.php b/src/controller/UserController.php
index 9de2fb8..ddba33a 100644
--- a/src/controller/UserController.php
+++ b/src/controller/UserController.php
@@ -16,27 +16,12 @@ declare(strict_types=1);
 use Doctrine\ORM\EntityManager;
 use App\Entity\User;
 use App\Entity\Log;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 
 class UserController
 {
         // account
-        static public function existUsers(EntityManager $entityManager): bool
-        {
-            if(!$entityManager // table vide
-                ->createQuery("SELECT u FROM App\Entity\User u")
-                ->setMaxResults(1)
-                ->getOneOrNullResult())
-                {
-                        unset($_SESSION['user']);
-                        return false;
-                }
-                else{
-                        return true;
-                }
-        }
-
-        // account
-        static public function createAdminUser(EntityManager $entityManager)
+        static public function createAdminUser(EntityManager $entityManager): RedirectResponse
         {
                 unset($_SESSION['user']);
 
@@ -58,20 +43,18 @@ class UserController
                         $url->addParams(['error' => $error]);
                 }
 
-                header('Location: ' . $url);
-                die;
+                return new RedirectResponse((string)$url);
         }
 
         // account
         //static public function createUser(EntityManager $entityManager){}
 
         // auth
-        static public function connect(EntityManager $entityManager): void
+        static public function connect(EntityManager $entityManager): RedirectResponse
         {
-                if(IS_ADMIN) // déjà connecté?
-                {
-                        header('Location: ' . new URL);
-                        die;
+                $url = new URL;
+                if(IS_ADMIN){ // déjà connecté?
+                        return new RedirectResponse((string)$url);
                 }
                 unset($_SESSION['user']);
 
@@ -101,7 +84,7 @@ class UserController
                                         echo '<script>window.error_message = "' . $e->getMessage() . '";</script>';
                                 }
 
-                                $url = new URL(isset($_GET['from']) ? ['page' => $_GET['from']] : []);
+                                $url->addParams(isset($_GET['from']) ? ['page' => $_GET['from']] : []);
                                 isset($_GET['id']) ? $url->addParams(['id' => $_GET['id']]) : '';
                         }
                         else
@@ -118,18 +101,17 @@ class UserController
                 
                 if(!empty($error)){
                         sleep(1); // défense basique à la force brute
-                        $url = new URL(['page' => 'connection']);
+                        $url->addParams(['page' => 'connection']);
                         isset($_GET['from']) ? $url->addParams(['from' => $_GET['from']]) : null;
                         isset($_GET['id']) ? $url->addParams(['id' => $_GET['id']]) : null;
                         $url->addParams(['error' => $error]);
                 }
 
-                header('Location: ' . $url);
-                die;
+                return new RedirectResponse((string)$url);
         }
 
         // auth
-        static public function disconnect(): void
+        static public function disconnect(): RedirectResponse
         {
                 // nettoyage complet
                 unset($_SESSION['user']); // mémoire vive
@@ -140,15 +122,14 @@ class UserController
                 $url = new URL;
                 isset($_GET['from']) ? $url->addParams(['page' => $_GET['from']]) : '';
                 isset($_GET['id']) ? $url->addParams(['id' => $_GET['id']]) : '';
-                header('Location: ' . $url);
-                die;
+                return new RedirectResponse('Location: ' . $url);
         }
 
         // user
-        static public function updateUsername(EntityManager $entityManager): void
+        static public function updateUsername(EntityManager $entityManager): RedirectResponse
         {
                 if(!IS_ADMIN){ // superflux, fait dans le routeur
-                        self::disconnect();
+                        return self::disconnect();
                 }
 
                 $url = new URL(['page' => 'user_edit']);
@@ -180,15 +161,14 @@ class UserController
                         sleep(1);
                         $url->addParams(['error_username' => $error]);
                 }
-                header('Location: ' . $url);
-                die;
+                return new RedirectResponse('Location: ' . $url);
         }
 
         // user
-        static public function updatePassword(EntityManager $entityManager): void
+        static public function updatePassword(EntityManager $entityManager): RedirectResponse
         {
                 if(!IS_ADMIN){ // superflux, fait dans le routeur
-                        self::disconnect();
+                        return self::disconnect();
                 }
 
                 $url = new URL(['page' => 'user_edit']);
@@ -220,8 +200,7 @@ class UserController
                         sleep(1);
                         $url->addParams(['error_password' => $error]);
                 }
-                header('Location: ' . $url);
-                die;
+                return new RedirectResponse('Location: ' . $url);
         }
 
         // dans une classe mère ou un trait après découpage de UserController?
diff --git a/src/controller/ViewDirector.php b/src/controller/ViewDirector.php
index 2d37598..eda49e7 100644
--- a/src/controller/ViewDirector.php
+++ b/src/controller/ViewDirector.php
@@ -9,6 +9,7 @@ use App\Entity\Node;
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 
 class ViewDirector extends AbstractBuilder // ViewDirector est aussi le premier Builder
 {
@@ -31,7 +32,7 @@ class ViewDirector extends AbstractBuilder // ViewDirector est aussi le premier
         if(CURRENT_PAGE === 'article'){
             if(IS_ADMIN){
                 if(!$request->query->has('id')){
-                    return new Response($this->html, 302);
+                    return new RedirectResponse((string)new URL(['page' => $_GET['from'] ?? '']));
                 }
                 else{
                     // mode création d'article
@@ -42,10 +43,10 @@ class ViewDirector extends AbstractBuilder // ViewDirector est aussi le premier
                 }
             }
             elseif($request->query->get('id')[0] === 'n'){ // accès page nouvelle article interdit sans être admin
-                return new Response($this->html, 302);
+                return new RedirectResponse((string)new URL(['page' => $_GET['from'] ?? '']));
             }
         }
-        //else // l'id dans l'URL n'a pas d'effet ailleurs
+        // pas de else, l'id dans l'URL n'a pas d'effet ailleurs
 
 
         /* 2/ accès au modèle */
@@ -59,7 +60,7 @@ class ViewDirector extends AbstractBuilder // ViewDirector est aussi le premier
 
         // article non trouvé en BDD
         if(CURRENT_PAGE === 'article' && !IS_ADMIN && self::$root_node->getNodeByName('main')->getAdoptedChild() === null){
-            return new Response($this->html, 302);
+            return new RedirectResponse((string)new URL(['page' => $_GET['from'] ?? '']));
         }
 
 
@@ -71,6 +72,6 @@ class ViewDirector extends AbstractBuilder // ViewDirector est aussi le premier
             unset($_SESSION['flash_message']);
         }
 
-        return new Response($this->html, 200);
+        return new Response($this->html);
     }
 }
\ No newline at end of file