From 8db87fd5aba43d47b70cf6e0032ff2074778da30 Mon Sep 17 00:00:00 2001 From: Steve Ireland Date: Sun, 25 Jun 2023 12:16:51 -0400 Subject: [PATCH] In dev mode, allow blank root password. --- app/Config/Database.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/app/Config/Database.php b/app/Config/Database.php index 8d675e4d4..5f2e39bc8 100644 --- a/app/Config/Database.php +++ b/app/Config/Database.php @@ -102,9 +102,20 @@ class Database extends Config { parent::__construct(); - $this->development['hostname'] = getenv('MYSQL_HOST_NAME') ? getenv('MYSQL_HOST_NAME') : 'localhost'; - $this->development['username'] = getenv('MYSQL_USERNAME') ? getenv('MYSQL_USERNAME') : 'admin'; - $this->development['password'] = getenv('MYSQL_PASSWORD') ? getenv('MYSQL_PASSWORD') : 'pointofsale'; + if(!getenv('database.development.hostname')) + { + $this->development['hostname'] = getenv('database.development.hostname'); + } + + if(!getenv('database.development.hostname')) + { + $this->development['username'] = getenv('database.development.username'); + } + + if(!getenv('database.development.hostname')) + { + $this->development['password'] = getenv('database.development.password'); + } // Ensure that we always set the database group to 'tests' if // we are currently running an automated test suite, so that