From ed000e9ea51ab2f26999f99f84ffcd829915def8 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 15 Jul 2023 21:11:02 -0700
Subject: [PATCH] setup - Fix php8 warnings when MySQL password is blank

---
 setup/src/Setup/DbUtil.php       | 2 +-
 setup/src/Setup/SettingsUtil.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/src/Setup/DbUtil.php b/setup/src/Setup/DbUtil.php
index 89c4d24e4b..e71bec3953 100644
--- 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 508d258902..72b4e02a3a 100644
--- 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.
-- 
2.25.1