From b6411ec474aa0fc8674cb7bee03a5b1a0b6b4cd4 Mon Sep 17 00:00:00 2001 From: Dawid Parafinski Date: Wed, 9 Sep 2026 13:53:03 +0200 Subject: [PATCH 1/2] IBX-12046: Removed Symfony 8 deprecated code usage Replaces the deprecated Request::get() call in QueryResultsInjector with explicit attributes/query/request bag lookups for the pagination page parameter, mirroring the pattern used in ibexa/core's IBX-12046 fix. --- src/lib/ContentView/QueryResultsInjector.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/ContentView/QueryResultsInjector.php b/src/lib/ContentView/QueryResultsInjector.php index eef386e..744e6e9 100644 --- a/src/lib/ContentView/QueryResultsInjector.php +++ b/src/lib/ContentView/QueryResultsInjector.php @@ -113,7 +113,12 @@ private function buildResults(FilterViewParametersEvent $event): iterable $limit = $queryParameters['limit'] ?? $paginationLimit; $pageParam = sprintf('%s_page', $fieldDefinitionIdentifier); - $page = isset($request) ? $request->get($pageParam, 1) : 1; + $page = isset($request) ? match (true) { + $request->attributes->has($pageParam) => $request->attributes->get($pageParam), + $request->query->has($pageParam) => $request->query->all()[$pageParam], + $request->request->has($pageParam) => $request->request->all()[$pageParam], + default => 1, + } : 1; if ($location !== null) { $pager = new Pagerfanta( From 77d3feedc6d75e147d86748ee1af67d9003d5179 Mon Sep 17 00:00:00 2001 From: Dawid Parafinski Date: Thu, 10 Sep 2026 11:32:40 +0200 Subject: [PATCH 2/2] IBX-12046: Read the pagination page from the query string only The per-field page parameter is a query-string parameter of the main request; attributes and the POST body were only consulted because Request::get() did so generically. --- src/lib/ContentView/QueryResultsInjector.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/lib/ContentView/QueryResultsInjector.php b/src/lib/ContentView/QueryResultsInjector.php index 744e6e9..5f64d50 100644 --- a/src/lib/ContentView/QueryResultsInjector.php +++ b/src/lib/ContentView/QueryResultsInjector.php @@ -113,12 +113,7 @@ private function buildResults(FilterViewParametersEvent $event): iterable $limit = $queryParameters['limit'] ?? $paginationLimit; $pageParam = sprintf('%s_page', $fieldDefinitionIdentifier); - $page = isset($request) ? match (true) { - $request->attributes->has($pageParam) => $request->attributes->get($pageParam), - $request->query->has($pageParam) => $request->query->all()[$pageParam], - $request->request->has($pageParam) => $request->request->all()[$pageParam], - default => 1, - } : 1; + $page = $request?->query->getInt($pageParam, 1) ?? 1; if ($location !== null) { $pager = new Pagerfanta(