diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2024-05-07 09:48:35 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2024-05-07 09:48:35 +0000 |
| commit | 49451b26817ba0d50121dc84a1bd0df5902906f9 (patch) | |
| tree | e00af562e72f56869364deb9e4b8c530d484251e /tests/configuration.php | |
| parent | 51876b9c1878a2a5bd4c49241507f1ed47472d46 (diff) | |
fixes #4123
Closes #4123
Merge request studip/studip!2968
Diffstat (limited to 'tests/configuration.php')
| -rw-r--r-- | tests/configuration.php | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/tests/configuration.php b/tests/configuration.php index f2ea461..523229f 100644 --- a/tests/configuration.php +++ b/tests/configuration.php @@ -1,11 +1,19 @@ <?php -return (function ($filename) { - if (file_exists($filename)) { - require_once $filename; - - return compact('DB_STUDIP_HOST', 'DB_STUDIP_USER', 'DB_STUDIP_PASSWORD', 'DB_STUDIP_DATABASE'); +return (function (string ...$filenames) { + foreach ($filenames as $filename) { + if (file_exists($filename)) { + require_once $filename; + } } - return []; -})(dirname(__DIR__).'/config/config_local.inc.php'); + return array_filter([ + 'DB_STUDIP_HOST' => $DB_STUDIP_HOST ?? null, + 'DB_STUDIP_USER' => $DB_STUDIP_USER ?? null, + 'DB_STUDIP_PASSWORD' => $DB_STUDIP_PASSWORD ?? null, + 'DB_STUDIP_DATABASE' => $DB_STUDIP_DATABASE ?? null, + ]); +})( + dirname(__DIR__).'/config/config_defaults.inc.php', + dirname(__DIR__).'/config/config_local.inc.php' +); |
