diff --git a/api/setup/settings/01_env.php b/api/setup/settings/01_env.php index 89deb37..3bd6140 100644 --- a/api/setup/settings/01_env.php +++ b/api/setup/settings/01_env.php @@ -20,13 +20,15 @@ return [ $arr = [ 'host' => 'db', 'name' => $_ENV['MYSQL_DATABASE'], - 'username' => $_ENV['MYSQL_USER'], - 'password' => $_ENV['MYSQL_PASSWORD'] + 'user' => [ + 'name' => $_ENV['MYSQL_USER'], + 'password' => $_ENV['MYSQL_PASSWORD'] + ] ]; if (isset($_ENV['MYSQL_PORT'])) { $arr['port'] = $_ENV['MYSQL_PORT']; } - return (object) $arr; + return json_decode(json_encode($arr)); }, 'max_update_days' => 7 ]; diff --git a/api/setup/setups/01_emails.php b/api/setup/setups/01_emails.php index 1428bae..dbbc26c 100644 --- a/api/setup/setups/01_emails.php +++ b/api/setup/setups/01_emails.php @@ -22,6 +22,6 @@ return [ } $dsn []= "dbname={$database->name}"; $dsn = implode(';', $dsn); - return new PDO($dsn, $database->username, $database->password); + return new PDO($dsn, $database->user->name, $database->user->password); }, ];