Merge branch '6.4' into 6.x

* 6.4:
  Override getPathByConvention function in MenuItemAdminListConfigurator so it returns the correct path
  Fix getCurrentFullHost return type

src/Kunstmaan/MenuBundle/AdminList/MenuItemAdminListConfigurator.php

@@ -137,4 +137,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);
+    }
 }

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();
     }