diff --git a/src/bundle/Controller/ContentTypeGroupController.php b/src/bundle/Controller/ContentTypeGroupController.php index ae28e900cf..f1a5719c78 100644 --- a/src/bundle/Controller/ContentTypeGroupController.php +++ b/src/bundle/Controller/ContentTypeGroupController.php @@ -226,7 +226,7 @@ public function viewAction(Request $request, ContentTypeGroup $group, int $page return $this->render('@ibexadesign/content_type/content_type_group/index.html.twig', [ 'content_type_group' => $group, 'page' => $page, - 'route_name' => $request->get('_route'), + 'route_name' => $request->attributes->get('_route'), 'can_create' => $this->isGranted(new Attribute('class', 'create')), ]); } diff --git a/src/bundle/Controller/ContentViewController.php b/src/bundle/Controller/ContentViewController.php index 3c4f73280b..3f2e921240 100644 --- a/src/bundle/Controller/ContentViewController.php +++ b/src/bundle/Controller/ContentViewController.php @@ -250,8 +250,8 @@ private function supplyDraftPagination(ContentView $view, Request $request): voi $view->addParameters([ 'draft_pagination_params' => [ - 'route_name' => $request->get('_route'), - 'route_params' => $request->get('_route_params'), + 'route_name' => $request->attributes->get('_route'), + 'route_params' => $request->attributes->get('_route_params'), 'page' => (int) ($page['version_draft'] ?? 1), 'pages_map' => $page, 'limit' => $this->configResolver->getParameter('pagination.version_draft_limit'), @@ -265,8 +265,8 @@ private function supplyRelationPagination(ContentView $view, Request $request): $view->addParameters([ 'relation_pagination_params' => [ - 'route_name' => $request->get('_route'), - 'route_params' => $request->get('_route_params'), + 'route_name' => $request->attributes->get('_route'), + 'route_params' => $request->attributes->get('_route_params'), 'page' => (int) ($page['relation'] ?? 1), 'pages_map' => $page, 'limit' => $this->configResolver->getParameter('pagination.relation_limit'), @@ -280,8 +280,8 @@ private function supplyReverseRelationPagination(ContentView $view, Request $req $view->addParameters([ 'reverse_relation_pagination_params' => [ - 'route_name' => $request->get('_route'), - 'route_params' => $request->get('_route_params'), + 'route_name' => $request->attributes->get('_route'), + 'route_params' => $request->attributes->get('_route_params'), 'page' => (int) ($page['reverse_relation'] ?? 1), 'pages_map' => $page, 'limit' => $this->configResolver->getParameter( @@ -297,8 +297,8 @@ private function supplyCustomUrlPagination(ContentView $view, Request $request): $view->addParameters([ 'custom_urls_pagination_params' => [ - 'route_name' => $request->get('_route'), - 'route_params' => $request->get('_route_params'), + 'route_name' => $request->attributes->get('_route'), + 'route_params' => $request->attributes->get('_route_params'), 'page' => (int) ($page['custom_url'] ?? 1), 'limit' => $this->configResolver->getParameter( 'pagination.content_custom_url_limit' @@ -313,8 +313,8 @@ private function supplySystemUrlPagination(ContentView $view, Request $request): $view->addParameters([ 'system_urls_pagination_params' => [ - 'route_name' => $request->get('_route'), - 'route_params' => $request->get('_route_params'), + 'route_name' => $request->attributes->get('_route'), + 'route_params' => $request->attributes->get('_route_params'), 'page' => (int) ($page['system_url'] ?? 1), 'limit' => $this->configResolver->getParameter( 'pagination.content_system_url_limit' @@ -329,8 +329,8 @@ private function supplyRolePagination(ContentView $view, Request $request): void $view->addParameters([ 'roles_pagination_params' => [ - 'route_name' => $request->get('_route'), - 'route_params' => $request->get('_route_params'), + 'route_name' => $request->attributes->get('_route'), + 'route_params' => $request->attributes->get('_route_params'), 'page' => (int) ($page['role'] ?? 1), 'limit' => $this->configResolver->getParameter( 'pagination.content_role_limit' @@ -345,8 +345,8 @@ private function supplyPolicyPagination(ContentView $view, Request $request): vo $view->addParameters([ 'policies_pagination_params' => [ - 'route_name' => $request->get('_route'), - 'route_params' => $request->get('_route_params'), + 'route_name' => $request->attributes->get('_route'), + 'route_params' => $request->attributes->get('_route_params'), 'page' => (int) ($page['policy'] ?? 1), 'limit' => $this->configResolver->getParameter( 'pagination.content_policy_limit' diff --git a/src/bundle/Controller/RoleController.php b/src/bundle/Controller/RoleController.php index 67dfaed71d..3522967d7b 100644 --- a/src/bundle/Controller/RoleController.php +++ b/src/bundle/Controller/RoleController.php @@ -90,7 +90,7 @@ public function viewAction(Request $request, Role $role, int $policyPage = 1, in return $this->render('@ibexadesign/user/role/index.html.twig', [ 'role' => $role, 'delete_form' => $deleteForm, - 'route_name' => $request->get('_route'), + 'route_name' => $request->attributes->get('_route'), 'policy_page' => $policyPage, 'assignment_page' => $assignmentPage, ]); diff --git a/src/bundle/Controller/TrashController.php b/src/bundle/Controller/TrashController.php index faddf2cfb4..d5808b02fa 100644 --- a/src/bundle/Controller/TrashController.php +++ b/src/bundle/Controller/TrashController.php @@ -267,7 +267,7 @@ function (TrashItemDeleteData $data) use ($request): RedirectResponse { private function redirectToTrashList(Request $request): RedirectResponse { - $trashSearchParams = $request->get('trash_search'); + $trashSearchParams = $request->query->all('trash_search'); $params = $trashSearchParams ? ['trash_search' => $trashSearchParams] : []; return $this->redirectToRoute('ibexa.trash.list', $params); diff --git a/src/bundle/Controller/VersionController.php b/src/bundle/Controller/VersionController.php index 27a2086347..6a30a363b9 100644 --- a/src/bundle/Controller/VersionController.php +++ b/src/bundle/Controller/VersionController.php @@ -41,7 +41,7 @@ public function __construct( */ public function removeAction(Request $request): Response { - $isDraftForm = null !== $request->get( + $isDraftForm = $request->request->has( sprintf('version-remove-%s', VersionsTab::FORM_REMOVE_DRAFT) ); diff --git a/src/bundle/DependencyInjection/Configuration/Parser/Module/Subitems.php b/src/bundle/DependencyInjection/Configuration/Parser/Module/Subitems.php index 0df3c21e66..cdda0719af 100644 --- a/src/bundle/DependencyInjection/Configuration/Parser/Module/Subitems.php +++ b/src/bundle/DependencyInjection/Configuration/Parser/Module/Subitems.php @@ -32,7 +32,7 @@ public function addSemanticConfig(NodeBuilder $nodeBuilder): void ->arrayNode('subitems_module') ->info('Subitems module configuration') ->children() - ->integerNode('limit')->isRequired()->defaultValue(10)->end() + ->integerNode('limit')->isRequired()->end() ->end() ->end(); } diff --git a/src/bundle/Resources/views/themes/admin/content/tab/content.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/content.html.twig index 9bae695c13..5489723506 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/content.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/content.html.twig @@ -1,7 +1,7 @@ {% extends '@ibexadesign/content/content_view_fields.html.twig' %} {% block extras %} - {% set current_language = app.request.get('languageCode') ?: content.prioritizedFieldLanguageCode %} + {% set current_language = app.request.attributes.get('languageCode') ?: content.prioritizedFieldLanguageCode %} {% if languages|length > 1 %}
diff --git a/src/bundle/Resources/views/themes/admin/content_type/tab/view.html.twig b/src/bundle/Resources/views/themes/admin/content_type/tab/view.html.twig index 63d6b7e373..0c9d39e14e 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/tab/view.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/tab/view.html.twig @@ -1,7 +1,7 @@ {% import "@ibexadesign/content_type/macros.html.twig" as macros %} {% trans_default_domain 'ibexa_content_type' %} -{% set current_language = app.request.get('languageCode') ?: language_code %} +{% set current_language = app.request.attributes.get('languageCode') ?: language_code %} {% set global_properties_items = [ { diff --git a/src/bundle/Resources/views/themes/admin/trash/list.html.twig b/src/bundle/Resources/views/themes/admin/trash/list.html.twig index 0b461318aa..92f8486192 100644 --- a/src/bundle/Resources/views/themes/admin/trash/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/trash/list.html.twig @@ -25,7 +25,7 @@ {% endblock %} {% block content %} - {% set trash_search_params = app.request.get('trash_search') %} + {% set trash_search_params = app.request.query.all('trash_search') %} {% set creator = form_search.vars.data ? form_search.vars.data.creator : '' %} {% set creator_exists = creator is not empty %} diff --git a/src/bundle/Resources/views/themes/admin/ui/component/sub_items/multifile_upload.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/sub_items/multifile_upload.html.twig index 8b23261988..d6a60babd5 100644 --- a/src/bundle/Resources/views/themes/admin/ui/component/sub_items/multifile_upload.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/component/sub_items/multifile_upload.html.twig @@ -4,5 +4,5 @@ data-parent-content-type-identifier="{{ contentType.identifier }}" data-parent-content-type-id="{{ contentType.id }}" data-parent-name="{{ location.contentInfo.name }}" - data-current-language="{{ app.request.get('languageCode') ?: content.prioritizedFieldLanguageCode }}" + data-current-language="{{ app.request.attributes.get('languageCode') ?: content.prioritizedFieldLanguageCode }}" > diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image.html.twig index f023265586..6f75ee3bf2 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image.html.twig @@ -55,8 +55,8 @@ 'admin-ui-image-edit-actions-after', { 'fieldDefinitionIdentifier' : form.parent.vars.value.fieldDefinition.identifier, - 'contentId' : content_id ?? app.request.get('contentId'), - 'versionNo' : version_no ?? app.request.get('versionNo'), + 'contentId' : content_id ?? app.request.attributes.get('contentId'), + 'versionNo' : version_no ?? app.request.attributes.get('versionNo'), 'disabled': readonly ? true : false, } ) }} diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image_asset.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image_asset.html.twig index f0f868543a..d0635de868 100644 --- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image_asset.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ibexa_image_asset.html.twig @@ -148,8 +148,8 @@ 'admin-ui-image-edit-actions-after', { 'fieldDefinitionIdentifier' : form.parent.vars.value.fieldDefinition.identifier, - 'contentId' : content_id ?? app.request.get('contentId'), - 'versionNo' : version_no ?? app.request.get('versionNo'), + 'contentId' : content_id ?? app.request.attributes.get('contentId'), + 'versionNo' : version_no ?? app.request.attributes.get('versionNo'), 'disabled': readonly ? true : false, } ) }} diff --git a/src/bundle/Resources/views/themes/admin/ui/layout.html.twig b/src/bundle/Resources/views/themes/admin/ui/layout.html.twig index b4a126f28a..9bf3787ef2 100644 --- a/src/bundle/Resources/views/themes/admin/ui/layout.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/layout.html.twig @@ -3,7 +3,7 @@ - +