diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 71e6059c65..80bd6c9629 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -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\ given\.$#' identifier: argument.type diff --git a/src/bundle/Controller/ContentViewController.php b/src/bundle/Controller/ContentViewController.php index 9e220693ee..3539a631c2 100644 --- a/src/bundle/Controller/ContentViewController.php +++ b/src/bundle/Controller/ContentViewController.php @@ -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'), ], @@ -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'), ], @@ -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'), ], @@ -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'), ], ]); @@ -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'), ], ]); @@ -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'), ], ]); @@ -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'), ], ]);