Merge branch '6.1' into 6.x

* 6.1: [MultidomainBundle] Fix issues with empty host in multidomain config
Kunstmaan · Feb 7, 2022 · 5be6988 · 5be6988
2 parents 1e2c1e5 + 2f6a85c
commit 5be6988
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/src/Kunstmaan/AdminBundle/Helper/DomainConfiguration.php b/src/Kunstmaan/AdminBundle/Helper/DomainConfiguration.php
@@ -162,6 +162,8 @@ public function getHostSwitched()
 
     /**
      * @param string|null $host
+     *
+     * @return string|null
      */
     public function getHostBaseUrl($host = null)
     {

diff --git a/src/Kunstmaan/MultiDomainBundle/Helper/DomainConfiguration.php b/src/Kunstmaan/MultiDomainBundle/Helper/DomainConfiguration.php
@@ -303,12 +303,16 @@ public function getFullHostById($id)
     /**
      * @param string|null $host
      *
-     * @return string
+     * @return string|null
      */
     public function getHostBaseUrl($host = null)
     {
         $config = $this->getFullHost($host);
 
+        if (!is_array($config)) {
+            return null;
+        }
+
         return sprintf('%s://%s', $config['protocol'], $config['host']);
     }
 

diff --git a/src/Kunstmaan/MultiDomainBundle/Tests/Helper/DomainConfigurationTest.php b/src/Kunstmaan/MultiDomainBundle/Tests/Helper/DomainConfigurationTest.php
@@ -186,6 +186,18 @@ public function testGetHostBaseUrl()
         $this->assertEquals('http://multilangdomain.tld', $object->getHostBaseUrl('multilangdomain.tld'));
     }
 
+    public function testGetHostBaseUrlWithEmptyRequestUrl()
+    {
+        $object = $this->getDomainConfiguration(Request::create(''));
+        $this->assertNull($object->getHostBaseUrl());
+    }
+
+    public function testGetHostBaseUrlWithUnkownHost()
+    {
+        $object = $this->getDomainConfiguration(Request::create('unkowndomain.tld'));
+        $this->assertNull($object->getHostBaseUrl());
+    }
+
     public function testGetFullHost()
     {
         $request = $this->getSingleLanguageRequest();