Merge branch 'main' into issue-3911issue-3911

1 files changed, 18 insertions, 6 deletions

diff --git a/tests/configuration.php b/tests/configuration.php
index f2ea461..c68a445 100644
--- a/tests/configuration.php
+++ b/tests/configuration.php
@@ -1,11 +1,23 @@
 <?php
 
-return (function ($filename) {
-    if (file_exists($filename)) {
-        require_once $filename;
+return (function (string ...$filenames) {
+    $ABSOLUTE_URI_STUDIP = '';
+    $ASSETS_URL = '';
+    $STUDIP_BASE_PATH = '';
 
-        return compact('DB_STUDIP_HOST', 'DB_STUDIP_USER', 'DB_STUDIP_PASSWORD', 'DB_STUDIP_DATABASE');
+    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'
+);