From b0f880d0ebc22b7014702afdc225b53960063fab Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 15 Apr 2023 14:17:30 +0000
Subject: [PATCH] Fix: Force baseUrl being a string

---
 src/Console/Relocate.php                           | 2 +-
 src/Module/Install.php                             | 2 +-
 src/Module/User/Import.php                         | 2 +-
 src/Module/Xrd.php                                 | 6 +++---
 src/Navigation/Notifications/Repository/Notify.php | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Console/Relocate.php b/src/Console/Relocate.php
index a6fdd8bfbd..22de2903c5 100644
--- 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 abf7602379..d99f4d417e 100644
--- 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 3407fe52cc..48dc0660f2 100644
--- 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 098d69e23c..21cff56346 100644
--- 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 8bfdfbe9a0..6c38685240 100644
--- 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);
-- 
2.39.5