Updated env loading to be contained/controlled for usage

[system-cli] / scripts / Commands / BackupCommand.php

diff --git a/scripts/Commands/BackupCommand.php b/scripts/Commands/BackupCommand.php
index d41b36d4d5d82702671961f8c0f8d58e1e47b20e..8dcc3fa253149478a355b50a56850543b6be6855 100644 (file)
--- a/scripts/Commands/BackupCommand.php
+++ b/scripts/Commands/BackupCommand.php
@@ -2,6 +2,7 @@
 
 namespace Cli\Commands;
 
+use Cli\Services\EnvironmentLoader;
 use Cli\Services\ProgramRunner;
 use Minicli\Command\CommandCall;
 use RecursiveDirectoryIterator;
@@ -146,14 +147,15 @@ final class BackupCommand
      */
     protected function createDatabaseDump(): string
     {
+        $envOptions = EnvironmentLoader::loadMergedWithCurrentEnv($this->appDir);
         $dbOptions = [
-            'host' => ($_SERVER['DB_HOST'] ?? ''),
-            'username' => ($_SERVER['DB_USERNAME'] ?? ''),
-            'password' => ($_SERVER['DB_PASSWORD'] ?? ''),
-            'database' => ($_SERVER['DB_DATABASE'] ?? ''),
+            'host' => ($envOptions['DB_HOST'] ?? ''),
+            'username' => ($envOptions['DB_USERNAME'] ?? ''),
+            'password' => ($envOptions['DB_PASSWORD'] ?? ''),
+            'database' => ($envOptions['DB_DATABASE'] ?? ''),
         ];
 
-        $port = $_SERVER['DB_PORT'] ?? '';
+        $port = $envOptions['DB_PORT'] ?? '';
         if ($port) {
             $dbOptions['host'] .= ':' . $port;
         }