Fix: Force baseUrl being a string

diff --git a/src/Console/Relocate.php b/src/Console/Relocate.php
index a6fdd8bfbd1304a0ecff34e1656236fd04b6334e..22de2903c5b8fe03d7a36b6aee218f2694b4400a 100644 (file)
--- a/src/Console/Relocate.php
+++ b/src/Console/Relocate.php
@@ -94,7 +94,7 @@ HELP;
 
                $this->out(sprintf('Relocation started from %s to %s. Could take a while to complete.', $this->baseUrl, $this->getArgument(0)));
 
-               $old_url = $this->baseUrl;
+               $old_url = (string)$this->baseUrl;
 
                // Generate host names for relocation the addresses in the format user@address.tld
                $new_host = str_replace('http://', '@', Strings::normaliseLink($new_url));

diff --git a/src/Module/Install.php b/src/Module/Install.php
index abf76023798f0912b11bc9c5f62c007e8f84e572..d99f4d417e1630e7cbe75aeb2338a962c6127d6d 100644 (file)
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -343,7 +343,7 @@ class Install extends BaseModule
         */
        private function whatNext(): string
        {
-               $baseurl = $this->baseUrl;
+               $baseurl = (string)$this->baseUrl;
                return
                        $this->t('<h1>What next</h1>')
                        . "<p>" . $this->t('IMPORTANT: You will need to [manually] setup a scheduled task for the worker.')

diff --git a/src/Module/User/Import.php b/src/Module/User/Import.php
index 3407fe52ccdea83819cdd3411da98a5a6efa431c..48dc0660f2bcf5daee50b96d12356f34160dff44 100644 (file)
--- a/src/Module/User/Import.php
+++ b/src/Module/User/Import.php
@@ -232,7 +232,7 @@ class Import extends \Friendica\BaseModule
                }
 
                $oldBaseUrl = $account['baseurl'];
-               $newBaseUrl = $this->baseUrl;
+               $newBaseUrl = (string)$this->baseUrl;
 
                $oldAddr = str_replace('http://', '@', Strings::normaliseLink($oldBaseUrl));
                $newAddr = str_replace('http://', '@', Strings::normaliseLink($newBaseUrl));

diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index 098d69e23cb2b579879977f5b97bbf585470c666..21cff563468d5496f825b7adbf46d7080dac5786 100644 (file)
--- a/src/Module/Xrd.php
+++ b/src/Module/Xrd.php
@@ -105,7 +105,7 @@ class Xrd extends BaseModule
 
        private function printSystemJSON(array $owner)
        {
-               $baseURL = $this->baseUrl;
+               $baseURL = (string)$this->baseUrl;
                $json = [
                        'subject' => 'acct:' . $owner['addr'],
                        'aliases' => [$owner['url']],
@@ -151,7 +151,7 @@ class Xrd extends BaseModule
 
        private function printJSON(string $alias, array $owner, array $avatar)
        {
-               $baseURL = $this->baseUrl;
+               $baseURL = (string)$this->baseUrl;
 
                $json = [
                        'subject' => 'acct:' . $owner['addr'],
@@ -228,7 +228,7 @@ class Xrd extends BaseModule
 
        private function printXML(string $alias, array $owner, array $avatar)
        {
-               $baseURL = $this->baseUrl;
+               $baseURL = (string)$this->baseUrl;
 
                $xmlString = XML::fromArray([
                        'XRD' => [

diff --git a/src/Navigation/Notifications/Repository/Notify.php b/src/Navigation/Notifications/Repository/Notify.php
index 8bfdfbe9a00fa43518d52e2e339e64d18abfb874..6c386852402f6d50fe5e33ea1cb274f121b54f06 100644 (file)
--- a/src/Navigation/Notifications/Repository/Notify.php
+++ b/src/Navigation/Notifications/Repository/Notify.php
@@ -264,7 +264,7 @@ class Notify extends BaseRepository
                        }
                }
 
-               $siteurl = $this->baseUrl;
+               $siteurl = (string)$this->baseUrl;
                $sitename = $this->config->get('config', 'sitename');
 
                // with $params['show_in_notification_page'] == false, the notification isn't inserted into
@@ -807,7 +807,7 @@ class Notify extends BaseRepository
                $epreamble = $msg['rich'];
 
                $sitename = $this->config->get('config', 'sitename');
-               $siteurl  = $this->baseUrl;
+               $siteurl  = (string)$this->baseUrl;
 
                $sitelink  = $l10n->t('Please visit %s to view and/or reply to the conversation.');
                $tsitelink = sprintf($sitelink, $siteurl);