Merge branch '6.x' into 7.0

* 6.x: Fixed MessageCatalogue strict type parameters in Translator Loader [AdminBundle] fixed base route name for exception admin lists Fix node reorder parents
Kunstmaan · Apr 28, 2024 · 53b4966 · 53b4966
2 parents 06c5a8b + 8b7ef10
commit 53b4966
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/src/Kunstmaan/AdminBundle/AdminList/ExceptionAdminListConfigurator.php b/src/Kunstmaan/AdminBundle/AdminList/ExceptionAdminListConfigurator.php
@@ -107,4 +107,18 @@ public function getEntityClass(): string
     {
         return Exception::class;
     }
+
+    /**
+     * @param string|null $suffix
+     *
+     * @return string
+     */
+    public function getPathByConvention($suffix = null)
+    {
+        if (null === $suffix || $suffix === '') {
+            return 'kunstmaanadminbundle_admin_exception';
+        }
+
+        return sprintf('kunstmaanadminbundle_admin_exception_%s', $suffix);
+    }
 }
diff --git a/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php b/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php
@@ -644,7 +644,7 @@ public function reorderAction(Request $request): Response
         $this->init($request);
         $nodes = [];
         $nodeIds = $request->request->all('nodes');
-        $changeParents = $request->request->get('parent');
+        $changeParents = $request->request->all('parent');
 
         foreach ($nodeIds as $id) {
             /* @var Node $node */

diff --git a/src/Kunstmaan/TranslatorBundle/Service/Translator/Loader.php b/src/Kunstmaan/TranslatorBundle/Service/Translator/Loader.php
@@ -21,7 +21,11 @@ public function load($resource, $locale, $domain = 'messages'): MessageCatalogue
             $catalogue = new MessageCatalogue($locale);
             $translations = $this->translationRepository->findBy(['locale' => $locale]);
             foreach ($translations as $translation) {
-                $catalogue->set($translation->getKeyword(), $translation->getText(), $translation->getDomain());
+                $catalogue->set(
+                    (string) $translation->getKeyword(),
+                    (string) $translation->getText(),
+                    (string) $translation->getDomain()
+                );
             }
             $this->catalogues[$locale] = $catalogue;
         } else {