mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-02-02 03:52:23 +00:00
Code Issues Projects Releases Wiki Activity

Stop using get() directly on Request

Browse source
This commit is contained in:
Yassine Guedidi 2025-01-19 02:06:54 +01:00
parent 5a8b581adf
commit 83164d0706
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Controller/Api/TagRestController.php
View file

@ -70,7 +70,7 @@ class TagRestController extends WallabagRestController
public function deleteTagLabelAction(Request $request, TagRepository $tagRepository, EntryRepository $entryRepository) public function deleteTagLabelAction(Request $request, TagRepository $tagRepository, EntryRepository $entryRepository)
{ {
$this->validateAuthentication(); $this->validateAuthentication();
$label = $request->get('tag', ''); $label = $request->request->get('tag', $request->query->get('tag', ''));
$tags = $tagRepository->findByLabelsAndUser([$label], $this->getUser()->getId()); $tags = $tagRepository->findByLabelsAndUser([$label], $this->getUser()->getId());
@ -119,7 +119,7 @@ class TagRestController extends WallabagRestController
{ {
$this->validateAuthentication(); $this->validateAuthentication();
$tagsLabels = $request->get('tags', ''); $tagsLabels = $request->request->get('tags', $request->query->get('tags', ''));
$tags = $tagRepository->findByLabelsAndUser(explode(',', $tagsLabels), $this->getUser()->getId()); $tags = $tagRepository->findByLabelsAndUser(explode(',', $tagsLabels), $this->getUser()->getId());

2
src/Controller/ConfigController.php
View file

@ -411,7 +411,7 @@ class ConfigController extends AbstractController
$isValid = $googleAuthenticator->checkCode( $isValid = $googleAuthenticator->checkCode(
$this->getUser(), $this->getUser(),
$request->get('_auth_code') $request->request->get('_auth_code')
); );
if (true === $isValid) { if (true === $isValid) {

4
src/Controller/EntryController.php
View file

@ -221,7 +221,7 @@ class EntryController extends AbstractController
public function addEntryViaBookmarkletAction(Request $request) public function addEntryViaBookmarkletAction(Request $request)
{ {
$entry = new Entry($this->getUser()); $entry = new Entry($this->getUser());
$entry->setUrl($request->get('url')); $entry->setUrl($request->query->get('url'));
if (false === $this->checkIfEntryAlreadyExists($entry)) { if (false === $this->checkIfEntryAlreadyExists($entry)) {
$this->updateEntry($entry); $this->updateEntry($entry);
@ -623,7 +623,7 @@ class EntryController extends AbstractController
*/ */
private function showEntries($type, Request $request, $page) 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') : ''); $currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : '');
$formOptions = []; $formOptions = [];

4
src/Controller/ExportController.php
View file

@ -69,7 +69,7 @@ class ExportController extends AbstractController
if ('same_domain' === $category) { if ('same_domain' === $category) {
$entries = $entryRepository->getBuilderForSameDomainByUser( $entries = $entryRepository->getBuilderForSameDomainByUser(
$this->getUser()->getId(), $this->getUser()->getId(),
$request->get('entry') $request->query->get('entry')
)->getQuery() )->getQuery()
->getResult(); ->getResult();
@ -84,7 +84,7 @@ class ExportController extends AbstractController
$title = 'Tag ' . $tag->getLabel(); $title = 'Tag ' . $tag->getLabel();
} elseif ('search' === $category) { } 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') : ''); $currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : '');
$entries = $entryRepository->getBuilderForSearchByUser( $entries = $entryRepository->getBuilderForSearchByUser(

2
src/Controller/TagController.php
View file

@ -155,7 +155,7 @@ class TagController extends AbstractController
$entries->setCurrentPage($page); $entries->setCurrentPage($page);
} catch (OutOfRangeCurrentPageException $e) { } catch (OutOfRangeCurrentPageException $e) {
if ($page > 1) { if ($page > 1) {
return $this->redirect($this->generateUrl($request->get('_route'), [ return $this->redirect($this->generateUrl($request->attributes->get('_route'), [
'slug' => $tag->getSlug(), 'slug' => $tag->getSlug(),
'page' => $entries->getNbPages(), 'page' => $entries->getNbPages(),
]), 302); ]), 302);

2
src/Controller/UserController.php
View file

@ -161,7 +161,7 @@ class UserController extends AbstractController
$form->handleRequest($request); $form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) { 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); $qb = $userRepository->getQueryBuilderForSearch($searchTerm);
} }