Do not feed null into trim()

joomla-framework · Aug 21, 2022 · 5aedbd5 · 5aedbd5
1 parent 81ad0e5
commit 5aedbd5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -7,6 +7,7 @@
     "license": "GPL-2.0-or-later",
     "require": {
         "php": "^7.2.5|~8.0.0|~8.1.0",
+        "ext-json": "*",
         "psr/log": "^1.0",
         "psr/http-message": "^1.0",
         "joomla/event": "^2.0",

diff --git a/src/AbstractWebApplication.php b/src/AbstractWebApplication.php
@@ -959,7 +959,7 @@ protected function loadSystemUris($requestUri = null)
 		}
 
 		// Check to see if an explicit base URI has been set.
-		$siteUri = trim($this->get('site_uri'));
+		$siteUri = trim($this->get('site_uri') ?? '');
 
 		if ($siteUri != '')
 		{
@@ -1010,7 +1010,7 @@ protected function loadSystemUris($requestUri = null)
 		}
 
 		// Get an explicitly set media URI is present.
-		$mediaURI = trim($this->get('media_uri'));
+		$mediaURI = trim($this->get('media_uri') ?? '');
 
 		if ($mediaURI)
 		{