Merge branch '6.4' into 6.x

* 6.4:
  Prepare 6.4.2 release
  [LeadGenerationBundle] fixed route and type handling
  [TaggingBundle] fixed base route
  Fix node reorder

CHANGELOG-6.4.md

@@ -6,6 +6,12 @@ This changelog references the relevant changes (bug and security fixes) done in
 To get the diff for a specific change, go to https://github.com/kunstmaan/KunstmaanBundlesCMS/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/kunstmaan/KunstmaanBundlesCMS/compare/6.4.0...6.4.1
 
+## 6.4.2 / 2024-04-20
+
+* [NodeBundle] Fix node reorder [#3408](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3408) ([@dannyvw](https://github.com/dannyvw))
+* [TaggingBundle] fixed base route name [#3404](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3404) ([@virtualize](https://github.com/virtualize))
+* [LeadGenerationBundle] fixed route and type handling [#3403](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3403) ([@virtualize](https://github.com/virtualize))
+
 ## 6.4.1 / 2024-04-06
 
 * [AllBundles] Fix incorrect return types [#3385](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3385) ([@delboy1978uk](https://github.com/delboy1978uk))

src/Kunstmaan/LeadGenerationBundle/AdminList/PopupAdminListConfigurator.php

@@ -104,4 +104,18 @@ public function canAdd()
     {
         return true;
     }
+
+    /**
+     * @param string|null $suffix
+     *
+     * @return string
+     */
+    public function getPathByConvention($suffix = null)
+    {
+        if (null === $suffix || $suffix === '') {
+            return 'kunstmaanleadgenerationbundle_admin_popup_abstractpopup';
+        }
+
+        return sprintf('kunstmaanleadgenerationbundle_admin_popup_abstractpopup_%s', $suffix);
+    }
 }

src/Kunstmaan/LeadGenerationBundle/Controller/PopupsAdminListController.php

@@ -64,7 +64,9 @@ public function editAction(Request $request, $id): Response
     #[Route(path: '/add', name: 'kunstmaanleadgenerationbundle_admin_popup_abstractpopup_add', methods: ['GET', 'POST'])]
     public function addAction(Request $request): Response
     {
-        $type = $request->query->get('type');
+        $type = $request->isMethod('post')
+            ? $request->request->get('type')
+            : $request->query->get('type');
 
         return parent::doAddAction($this->getAdminListConfigurator(), $type, $request);
     }

src/Kunstmaan/LeadGenerationBundle/Controller/RulesAdminListController.php

@@ -34,7 +34,9 @@ public function detailAction(Request $request, $popup)
     #[Route(path: '/{popup}/add', requirements: ['popup' => '\d+'], name: 'kunstmaanleadgenerationbundle_admin_rule_abstractrule_add', methods: ['GET', 'POST'])]
     public function addAction(Request $request, $popup): Response
     {
-        $type = $request->query->get('type');
+        $type = $request->isMethod('post')
+            ? $request->request->get('type')
+            : $request->query->get('type');
 
         return parent::doAddAction($this->getAdminListConfigurator($popup), $type, $request);
     }

src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php

@@ -639,11 +639,11 @@ public function addHomepageAction(Request $request): RedirectResponse
     }
 
     #[Route(path: '/reorder', name: 'KunstmaanNodeBundle_nodes_reorder', methods: ['POST'])]
-    public function reorderAction(Request $request): string
+    public function reorderAction(Request $request): Response
     {
         $this->init($request);
         $nodes = [];
-        $nodeIds = $request->request->get('nodes');
+        $nodeIds = $request->request->all('nodes');
         $changeParents = $request->request->get('parent');
 
         foreach ($nodeIds as $id) {

src/Kunstmaan/TaggingBundle/AdminList/TagAdminListConfigurator.php

@@ -67,4 +67,18 @@ public function getEntityClass(): string
     {
         return Tag::class;
     }
+
+    /**
+     * @param string|null $suffix
+     *
+     * @return string
+     */
+    public function getPathByConvention($suffix = null)
+    {
+        if (null === $suffix || $suffix === '') {
+            return 'kunstmaantaggingbundle_admin_tag';
+        }
+
+        return sprintf('kunstmaantaggingbundle_admin_tag_%s', $suffix);
+    }
 }