From 1cfa5226ce5f1c231740385013b602913590fde1 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 25 Dec 2022 00:06:17 +0100 Subject: [PATCH] test fixes and changes for release --- Controller/BackendController.php | 4 +--- tests/Bootstrap.php | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 9bc0446..633bc1f 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -181,9 +181,7 @@ final class BackendController extends Controller /** @var \Model\Setting[] $settings */ $settings = SettingMapper::getAll()->where('module', $id)->execute(); - if (!($settings instanceof NullSetting)) { - $view->setData('settings', !\is_array($settings) ? [$settings] : $settings); - } + $view->setData('settings', $settings); /** @var \Modules\QA\Models\QAApp[] $apps */ $apps = QAAppMapper::getAll()->execute(); diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index d46fd31..b5d36a8 100755 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -257,6 +257,25 @@ $CONFIG = [ 'root' => '/', 'https' => false, ], + 'app' => [ + 'path' => __DIR__, + 'default' => [ + 'app' => 'Backend', + 'id' => 'backend', + 'lang' => 'en', + 'theme' => 'Backend', + 'org' => 1, + ], + 'domains' => [ + '127.0.0.1' => [ + 'app' => 'Backend', + 'id' => 'backend', + 'lang' => 'en', + 'theme' => 'Backend', + 'org' => 1, + ], + ], + ], 'socket' => [ 'master' => [ 'host' => '127.0.0.1',