setup - Fix php8 warnings when MySQL password is blank

diff --git a/setup/src/Setup/DbUtil.php b/setup/src/Setup/DbUtil.php
index 89c4d24e4b75c92a466b6aa3aa631f8721e0a32b..e71bec39533cefced9be3dbd154e2db2f8516c20 100644 (file)
--- a/setup/src/Setup/DbUtil.php
+++ b/setup/src/Setup/DbUtil.php
@@ -30,7 +30,7 @@ class DbUtil {
     return array(
       'server' => $server,
       'username' => $parsed['user'] ?: NULL,
-      'password' => $parsed['pass'] ?: NULL,
+      'password' => $parsed['pass'] ?? NULL,
       'database' => $database,
       'ssl_params' => self::parseSSL($parsed['query'] ?? NULL),
     );

diff --git a/setup/src/Setup/SettingsUtil.php b/setup/src/Setup/SettingsUtil.php
index 508d25890277976713962ffc1aa0047edaf6a50c..72b4e02a3a623e1e4f75d0392b6ae170f29ba592 100644 (file)
--- a/setup/src/Setup/SettingsUtil.php
+++ b/setup/src/Setup/SettingsUtil.php
@@ -15,7 +15,7 @@ class SettingsUtil {
     $params['frontEnd'] = 0;
     $params['baseURL'] = addslashes(rtrim($m->cmsBaseUrl, '/'));
     $params['dbUser'] = addslashes(urlencode($m->db['username']));
-    $params['dbPass'] = addslashes(urlencode($m->db['password']));
+    $params['dbPass'] = addslashes(urlencode($m->db['password'] ?? ''));
     $params['dbHost'] = addslashes(implode(':', array_map('urlencode', explode(':', $m->db['server']))));
     $params['dbName'] = addslashes(urlencode($m->db['database']));
     // The '&' prefix is awkward, but we don't know what's already in the file.