From 728d1d1fc69788fbe8596d5225ea16f667e538a3 Mon Sep 17 00:00:00 2001 From: Jeroen Thora Date: Wed, 20 Dec 2023 20:08:07 +0100 Subject: [PATCH] [AllBundles] Symfony 6 compatibility fixes --- .../Helper/Security/Acl/Permission/PermissionAdmin.php | 2 +- src/Kunstmaan/ConfigBundle/Resources/config/routing.yml | 2 +- src/Kunstmaan/NodeBundle/Resources/config/routing.yml | 2 +- src/Kunstmaan/PagePartBundle/PagePartAdmin/PagePartAdmin.php | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Kunstmaan/AdminBundle/Helper/Security/Acl/Permission/PermissionAdmin.php b/src/Kunstmaan/AdminBundle/Helper/Security/Acl/Permission/PermissionAdmin.php index 2cf224aa02..802a698276 100644 --- a/src/Kunstmaan/AdminBundle/Helper/Security/Acl/Permission/PermissionAdmin.php +++ b/src/Kunstmaan/AdminBundle/Helper/Security/Acl/Permission/PermissionAdmin.php @@ -214,7 +214,7 @@ public function getPossiblePermissions() */ public function bindRequest(Request $request) { - $changes = $request->request->get('permission-hidden-fields'); + $changes = $request->request->all('permission-hidden-fields'); if (empty($changes)) { return true; diff --git a/src/Kunstmaan/ConfigBundle/Resources/config/routing.yml b/src/Kunstmaan/ConfigBundle/Resources/config/routing.yml index d2ccd50d0b..2a89ba53f8 100644 --- a/src/Kunstmaan/ConfigBundle/Resources/config/routing.yml +++ b/src/Kunstmaan/ConfigBundle/Resources/config/routing.yml @@ -1,4 +1,4 @@ kunstmaanconfigbundle_default: path: /%kunstmaan_admin.admin_prefix%/settings/config/{internalName} defaults: - _controller: kunstmaan_config.controller.config:indexAction + _controller: kunstmaan_config.controller.config::indexAction diff --git a/src/Kunstmaan/NodeBundle/Resources/config/routing.yml b/src/Kunstmaan/NodeBundle/Resources/config/routing.yml index 4d12a6739e..e1eaa80bff 100644 --- a/src/Kunstmaan/NodeBundle/Resources/config/routing.yml +++ b/src/Kunstmaan/NodeBundle/Resources/config/routing.yml @@ -11,4 +11,4 @@ KunstmaanNodeBundle_nodes: KunstmaanNodeBundle_urlchooser_replace: prefix: /%kunstmaan_admin.admin_prefix%/url-replace path: /replace - defaults: { _controller: kunstmaan_node.url_replace.controller:replaceURLAction } + defaults: { _controller: kunstmaan_node.url_replace.controller::replaceURLAction } diff --git a/src/Kunstmaan/PagePartBundle/PagePartAdmin/PagePartAdmin.php b/src/Kunstmaan/PagePartBundle/PagePartAdmin/PagePartAdmin.php index 148630d561..e00baa7b74 100644 --- a/src/Kunstmaan/PagePartBundle/PagePartAdmin/PagePartAdmin.php +++ b/src/Kunstmaan/PagePartBundle/PagePartAdmin/PagePartAdmin.php @@ -187,7 +187,7 @@ public function preBindRequest(Request $request) // Create the objects for the new pageparts $this->newPageParts = []; - $newRefIds = $request->request->get($this->context . '_new'); + $newRefIds = $request->request->all($this->context . '_new'); if (\is_array($newRefIds)) { foreach ($newRefIds as $newId) { @@ -198,7 +198,7 @@ public function preBindRequest(Request $request) // Sort pageparts again $sequences = $request->request->get($this->context . '_sequence'); - if (!\is_null($sequences)) { + if ($sequences !== []) { $tempPageparts = $this->pageParts; $this->pageParts = []; foreach ($sequences as $sequence) {