From 6ff00315d0e98c8588d02e4ad66a6b389a89c012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 3 Aug 2023 17:14:20 +0200 Subject: [PATCH] Fix search when search term has useless space --- .../CoreBundle/Controller/EntryController.php | 2 +- .../CoreBundle/Controller/EntryControllerTest.php | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 655217c95..6c9cfe3f0 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php @@ -615,7 +615,7 @@ class EntryController extends AbstractController */ private function showEntries($type, Request $request, $page) { - $searchTerm = (isset($request->get('search_entry')['term']) ? $request->get('search_entry')['term'] : ''); + $searchTerm = (isset($request->get('search_entry')['term']) ? trim($request->get('search_entry')['term']) : ''); $currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : ''); $request->getSession()->set('prevUrl', $request->getRequestUri()); diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php index a6e0f395b..d5e728958 100644 --- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php @@ -1390,6 +1390,18 @@ class EntryControllerTest extends WallabagCoreTestCase $this->assertCount(4, $crawler->filter($this->entryDataTestAttribute)); + // Add a check with useless spaces before and after the search term + $crawler = $client->request('GET', '/unread/list'); + + $form = $crawler->filter('form[name=search]')->form(); + $data = [ + 'search_entry[term]' => ' title ', + ]; + + $crawler = $client->submit($form, $data); + + $this->assertCount(4, $crawler->filter($this->entryDataTestAttribute)); + // Search on starred list $crawler = $client->request('GET', '/starred/list');