From 83164d0706a2d9386babfdf94409b58374a08561 Mon Sep 17 00:00:00 2001
From: Yassine Guedidi <yassine@guedidi.com>
Date: Sun, 19 Jan 2025 02:06:54 +0100
Subject: [PATCH] Stop using get() directly on Request

---
 src/Controller/Api/TagRestController.php | 4 ++--
 src/Controller/ConfigController.php      | 2 +-
 src/Controller/EntryController.php       | 4 ++--
 src/Controller/ExportController.php      | 4 ++--
 src/Controller/TagController.php         | 2 +-
 src/Controller/UserController.php        | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Controller/Api/TagRestController.php b/src/Controller/Api/TagRestController.php
index a7053165d..84cfc6cbd 100644
--- a/src/Controller/Api/TagRestController.php
+++ b/src/Controller/Api/TagRestController.php
@@ -70,7 +70,7 @@ class TagRestController extends WallabagRestController
     public function deleteTagLabelAction(Request $request, TagRepository $tagRepository, EntryRepository $entryRepository)
     {
         $this->validateAuthentication();
-        $label = $request->get('tag', '');
+        $label = $request->request->get('tag', $request->query->get('tag', ''));
 
         $tags = $tagRepository->findByLabelsAndUser([$label], $this->getUser()->getId());
 
@@ -119,7 +119,7 @@ class TagRestController extends WallabagRestController
     {
         $this->validateAuthentication();
 
-        $tagsLabels = $request->get('tags', '');
+        $tagsLabels = $request->request->get('tags', $request->query->get('tags', ''));
 
         $tags = $tagRepository->findByLabelsAndUser(explode(',', $tagsLabels), $this->getUser()->getId());
 
diff --git a/src/Controller/ConfigController.php b/src/Controller/ConfigController.php
index 80ab75095..6f05c37c1 100644
--- a/src/Controller/ConfigController.php
+++ b/src/Controller/ConfigController.php
@@ -411,7 +411,7 @@ class ConfigController extends AbstractController
 
         $isValid = $googleAuthenticator->checkCode(
             $this->getUser(),
-            $request->get('_auth_code')
+            $request->request->get('_auth_code')
         );
 
         if (true === $isValid) {
diff --git a/src/Controller/EntryController.php b/src/Controller/EntryController.php
index bd5fb4bad..162709199 100644
--- a/src/Controller/EntryController.php
+++ b/src/Controller/EntryController.php
@@ -221,7 +221,7 @@ class EntryController extends AbstractController
     public function addEntryViaBookmarkletAction(Request $request)
     {
         $entry = new Entry($this->getUser());
-        $entry->setUrl($request->get('url'));
+        $entry->setUrl($request->query->get('url'));
 
         if (false === $this->checkIfEntryAlreadyExists($entry)) {
             $this->updateEntry($entry);
@@ -623,7 +623,7 @@ class EntryController extends AbstractController
      */
     private function showEntries($type, Request $request, $page)
     {
-        $searchTerm = (isset($request->get('search_entry')['term']) ? trim($request->get('search_entry')['term']) : '');
+        $searchTerm = (isset($request->query->get('search_entry')['term']) ? trim($request->query->get('search_entry')['term']) : '');
         $currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : '');
 
         $formOptions = [];
diff --git a/src/Controller/ExportController.php b/src/Controller/ExportController.php
index c49a3d2c1..ce252cee9 100644
--- a/src/Controller/ExportController.php
+++ b/src/Controller/ExportController.php
@@ -69,7 +69,7 @@ class ExportController extends AbstractController
         if ('same_domain' === $category) {
             $entries = $entryRepository->getBuilderForSameDomainByUser(
                 $this->getUser()->getId(),
-                $request->get('entry')
+                $request->query->get('entry')
             )->getQuery()
              ->getResult();
 
@@ -84,7 +84,7 @@ class ExportController extends AbstractController
 
             $title = 'Tag ' . $tag->getLabel();
         } elseif ('search' === $category) {
-            $searchTerm = (isset($request->get('search_entry')['term']) ? $request->get('search_entry')['term'] : '');
+            $searchTerm = (isset($request->query->get('search_entry')['term']) ? $request->query->get('search_entry')['term'] : '');
             $currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : '');
 
             $entries = $entryRepository->getBuilderForSearchByUser(
diff --git a/src/Controller/TagController.php b/src/Controller/TagController.php
index 4c8a69281..c34c9b17a 100644
--- a/src/Controller/TagController.php
+++ b/src/Controller/TagController.php
@@ -155,7 +155,7 @@ class TagController extends AbstractController
             $entries->setCurrentPage($page);
         } catch (OutOfRangeCurrentPageException $e) {
             if ($page > 1) {
-                return $this->redirect($this->generateUrl($request->get('_route'), [
+                return $this->redirect($this->generateUrl($request->attributes->get('_route'), [
                     'slug' => $tag->getSlug(),
                     'page' => $entries->getNbPages(),
                 ]), 302);
diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index f9fba7b07..b48b6205c 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -161,7 +161,7 @@ class UserController extends AbstractController
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            $searchTerm = (isset($request->get('search_user')['term']) ? $request->get('search_user')['term'] : '');
+            $searchTerm = (isset($request->query->get('search_user')['term']) ? $request->query->get('search_user')['term'] : '');
 
             $qb = $userRepository->getQueryBuilderForSearch($searchTerm);
         }