Merge branch '7.1' into 7.x

* 7.1: Fix exporting form submission Override getPathByConvention function in MenuItemAdminListConfigurator so it returns the correct path Fix getCurrentFullHost return type
Kunstmaan · Jun 9, 2024 · 458ee42 · 458ee42
2 parents 6cfff87 + 425550a
commit 458ee42
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/src/Kunstmaan/FormBundle/AdminList/FormSubmissionExportListConfigurator.php b/src/Kunstmaan/FormBundle/AdminList/FormSubmissionExportListConfigurator.php
@@ -125,9 +125,8 @@ public function buildIterator()
 
         $collection = new ArrayCollection();
         $i = 0;
-        foreach ($iterableResult as $row) {
+        foreach ($iterableResult as $submission) {
             /* @var FormSubmission $submission */
-            $submission = $row[0];
 
             // Write row data
             $data = [

diff --git a/src/Kunstmaan/FormBundle/Tests/AdminList/FormSubmissionExportListConfiguratorTest.php b/src/Kunstmaan/FormBundle/Tests/AdminList/FormSubmissionExportListConfiguratorTest.php
@@ -56,9 +56,9 @@ protected function getMockedEntityManager(): \Doctrine\ORM\EntityManager
         ]));
 
         $submissions = [
-            [$sub],
-            [new FormSubmission()],
-            [new FormSubmission()],
+            $sub,
+            new FormSubmission(),
+            new FormSubmission(),
         ];
         $query = $this->getMockBuilder('Doctrine\ORM\AbstractQuery')
             ->disableOriginalConstructor()

diff --git a/src/Kunstmaan/MenuBundle/AdminList/MenuItemAdminListConfigurator.php b/src/Kunstmaan/MenuBundle/AdminList/MenuItemAdminListConfigurator.php
@@ -113,4 +113,18 @@ public function getLimit()
     {
         return 1000;
     }
+
+    /**
+     * @param string|null $suffix
+     *
+     * @return string
+     */
+    public function getPathByConvention($suffix = null)
+    {
+        if (null === $suffix || $suffix === '') {
+            return 'kunstmaanmenubundle_admin_menuitem';
+        }
+
+        return sprintf('kunstmaanmenubundle_admin_menuitem_%s', $suffix);
+    }
 }
diff --git a/src/Kunstmaan/MultiDomainBundle/Twig/MultiDomainTwigExtension.php b/src/Kunstmaan/MultiDomainBundle/Twig/MultiDomainTwigExtension.php
@@ -52,7 +52,7 @@ public function getCurrentHost(): string
         return $this->domainConfiguration->getHost();
     }
 
-    public function getCurrentFullHost(): array
+    public function getCurrentFullHost(): ?array
     {
         return $this->domainConfiguration->getFullHost();
     }