Skip to content

IBX-9614, IBX-9585, IBX-9586: Fixed pagination after upgrading to symfony 6 #1496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 15, 2025
Merged

IBX-9614, IBX-9585, IBX-9586: Fixed pagination after upgrading to symfony 6 #1496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c30a65
IBX-9614, IBX-9585, IBX-9586: Fixed pagination after upgrading to sym…
ViniTou Mar 11, 2025
d4529bc
dropped pagination issues from baseline
ViniTou Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,42 +390,6 @@ parameters:
count: 1
path: src/bundle/Controller/ContentViewController.php

-
message: '#^Offset ''custom_url'' on string\|null on left side of \?\? does not exist\.$#'
identifier: nullCoalesce.offset
count: 1
path: src/bundle/Controller/ContentViewController.php

-
message: '#^Offset ''policy'' on string\|null on left side of \?\? does not exist\.$#'
identifier: nullCoalesce.offset
count: 1
path: src/bundle/Controller/ContentViewController.php

-
message: '#^Offset ''reverse_relation'' on string\|null on left side of \?\? does not exist\.$#'
identifier: nullCoalesce.offset
count: 1
path: src/bundle/Controller/ContentViewController.php

-
message: '#^Offset ''role'' on string\|null on left side of \?\? does not exist\.$#'
identifier: nullCoalesce.offset
count: 1
path: src/bundle/Controller/ContentViewController.php

-
message: '#^Offset ''system_url'' on string\|null on left side of \?\? does not exist\.$#'
identifier: nullCoalesce.offset
count: 1
path: src/bundle/Controller/ContentViewController.php

-
message: '#^Offset ''version_draft'' on string\|null on left side of \?\? does not exist\.$#'
identifier: nullCoalesce.offset
count: 1
path: src/bundle/Controller/ContentViewController.php

-
message: '#^Parameter \#1 \$array of function array_column expects array, iterable\<Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Location\> given\.$#'
identifier: argument.type
Expand Down
26 changes: 13 additions & 13 deletions src/bundle/Controller/ContentViewController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,13 +346,13 @@ private function createContentEditForm(
*/
private function supplyDraftPagination(ContentView $view, Request $request): void
{
$page = $request->query->get('page');
$page = $request->query->all('page');

$view->addParameters([
'draft_pagination_params' => [
'route_name' => $request->get('_route'),
'route_params' => $request->get('_route_params'),
'page' => $page['version_draft'] ?? 1,
'page' => (int) ($page['version_draft'] ?? 1),
'pages_map' => $page,
'limit' => $this->configResolver->getParameter('pagination.version_draft_limit'),
],
Expand All @@ -367,7 +367,7 @@ private function supplyRelationPagination(ContentView $view, Request $request):
'relation_pagination_params' => [
'route_name' => $request->get('_route'),
'route_params' => $request->get('_route_params'),
'page' => $page['relation'] ?? 1,
'page' => (int) ($page['relation'] ?? 1),
'pages_map' => $page,
'limit' => $this->configResolver->getParameter('pagination.relation_limit'),
],
Expand All @@ -380,13 +380,13 @@ private function supplyRelationPagination(ContentView $view, Request $request):
*/
private function supplyReverseRelationPagination(ContentView $view, Request $request): void
{
$page = $request->query->get('page');
$page = $request->query->all('page');

$view->addParameters([
'reverse_relation_pagination_params' => [
'route_name' => $request->get('_route'),
'route_params' => $request->get('_route_params'),
'page' => $page['reverse_relation'] ?? 1,
'page' => (int) ($page['reverse_relation'] ?? 1),
'pages_map' => $page,
'limit' => $this->configResolver->getParameter('pagination.reverse_relation_limit'),
],
Expand All @@ -399,13 +399,13 @@ private function supplyReverseRelationPagination(ContentView $view, Request $req
*/
private function supplyCustomUrlPagination(ContentView $view, Request $request): void
{
$page = $request->query->get('page');
$page = $request->query->all('page');

$view->addParameters([
'custom_urls_pagination_params' => [
'route_name' => $request->get('_route'),
'route_params' => $request->get('_route_params'),
'page' => $page['custom_url'] ?? 1,
'page' => (int) ($page['custom_url'] ?? 1),
'limit' => $this->configResolver->getParameter('pagination.content_custom_url_limit'),
],
]);
Expand All @@ -417,13 +417,13 @@ private function supplyCustomUrlPagination(ContentView $view, Request $request):
*/
private function supplySystemUrlPagination(ContentView $view, Request $request): void
{
$page = $request->query->get('page');
$page = $request->query->all('page');

$view->addParameters([
'system_urls_pagination_params' => [
'route_name' => $request->get('_route'),
'route_params' => $request->get('_route_params'),
'page' => $page['system_url'] ?? 1,
'page' => (int) ($page['system_url'] ?? 1),
'limit' => $this->configResolver->getParameter('pagination.content_system_url_limit'),
],
]);
Expand All @@ -435,13 +435,13 @@ private function supplySystemUrlPagination(ContentView $view, Request $request):
*/
private function supplyRolePagination(ContentView $view, Request $request): void
{
$page = $request->query->get('page');
$page = $request->query->all('page');

$view->addParameters([
'roles_pagination_params' => [
'route_name' => $request->get('_route'),
'route_params' => $request->get('_route_params'),
'page' => $page['role'] ?? 1,
'page' => (int) ($page['role'] ?? 1),
'limit' => $this->configResolver->getParameter('pagination.content_role_limit'),
],
]);
Expand All @@ -453,13 +453,13 @@ private function supplyRolePagination(ContentView $view, Request $request): void
*/
private function supplyPolicyPagination(ContentView $view, Request $request): void
{
$page = $request->query->get('page');
$page = $request->query->all('page');

$view->addParameters([
'policies_pagination_params' => [
'route_name' => $request->get('_route'),
'route_params' => $request->get('_route_params'),
'page' => $page['policy'] ?? 1,
'page' => (int) ($page['policy'] ?? 1),
'limit' => $this->configResolver->getParameter('pagination.content_policy_limit'),
],
]);
Expand Down
Loading