From de80393b7027f995adbfc0f3504d25c0ba81c821 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 19 May 2023 02:37:35 +0000 Subject: [PATCH] test fixes + new test data --- Admin/Install/Navigation.php | 16 ++++++++-------- Admin/Installer.php | 13 ++++++++++--- Admin/Routes/Web/Backend.php | 4 ++-- Admin/Status.php | 13 ++++++++++--- Admin/Uninstaller.php | 13 ++++++++++--- Admin/Updater.php | 13 ++++++++++--- Controller/BackendController.php | 6 +++--- Controller/Controller.php | 6 +++--- Models/PermissionState.php | 6 +++--- info.json | 16 ++++++++-------- 10 files changed, 67 insertions(+), 39 deletions(-) diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index ec01b7f..937f86c 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -4,7 +4,7 @@ * * PHP Version 7.4 * - * @package Modules\PL\Admin\Install + * @package Modules\IncomeStatement\Admin\Install * @copyright Dennis Eichhorn * @license OMS License 1.0 * @version 1.0.0 @@ -12,14 +12,14 @@ */ declare(strict_types=1); -namespace Modules\PL\Admin\Install; +namespace Modules\IncomeStatement\Admin\Install; -use phpOMS\DataStorage\Database\DatabasePool; +use phpOMS\Application\ApplicationAbstract; /** * Navigation class. * - * @package Modules\PL\Admin\Install + * @package Modules\IncomeStatement\Admin\Install * @license OMS License 1.0 * @link https://orange-management.org * @since 1.0.0 @@ -29,15 +29,15 @@ class Navigation /** * Install navigation providing * - * @param string $path Module path - * @param DatabasePool $dbPool Database pool for database interaction + * @param ApplicationAbstract $app Application + * @param string $path Module path * * @return void * * @since 1.0.0 */ - public static function install(string $path, DatabasePool $dbPool) : void + public static function install(ApplicationAbstract $app, string $path) : void { - \Modules\Navigation\Admin\Installer::installExternal($dbPool, ['path' => __DIR__ . '/Navigation.install.json']); + \Modules\Navigation\Admin\Installer::installExternal($app, ['path' => __DIR__ . '/Navigation.install.json']); } } diff --git a/Admin/Installer.php b/Admin/Installer.php index cfee4ac..7a9b9a4 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -4,7 +4,7 @@ * * PHP Version 7.4 * - * @package Modules\PL\Admin + * @package Modules\IncomeStatement\Admin * @copyright Dennis Eichhorn * @license OMS License 1.0 * @version 1.0.0 @@ -12,18 +12,25 @@ */ declare(strict_types=1); -namespace Modules\PL\Admin; +namespace Modules\IncomeStatement\Admin; use phpOMS\Module\InstallerAbstract; /** * Installer class. * - * @package Modules\PL\Admin + * @package Modules\IncomeStatement\Admin * @license OMS License 1.0 * @link https://orange-management.org * @since 1.0.0 */ final class Installer extends InstallerAbstract { + /** + * Path of the file + * + * @var string + * @since 1.0.0 + */ + public const PATH = __DIR__; } diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index e4265aa..551b4f5 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -1,7 +1,7 @@