From d3baf528bd9cfa5df0fc521676a3b4b469f6f1d6 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 28 Sep 2021 18:28:42 +0200 Subject: [PATCH] rename module constants and fix some unit test bugs --- Admin/Routes/Web/Backend.php | 10 +++++----- Controller/Controller.php | 8 ++++---- tests/Admin/AdminTest.php | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 5ff3204..7f48d2f 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringGeneral', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::DASHBOARD, ], @@ -34,7 +34,7 @@ return [ 'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringLogList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::LOG, ], @@ -45,7 +45,7 @@ return [ 'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringLogEntry', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::LOG, ], @@ -56,7 +56,7 @@ return [ 'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringSecurityDashboard', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::SECURITY, ], @@ -67,7 +67,7 @@ return [ 'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringSecurityFileList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::SECURITY, ], diff --git a/Controller/Controller.php b/Controller/Controller.php index 23a907b..d8ba727 100755 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -32,7 +32,7 @@ class Controller extends ModuleAbstract * @var string * @since 1.0.0 */ - public const MODULE_PATH = __DIR__ . '/../'; + public const PATH = __DIR__ . '/../'; /** * Module version. @@ -40,7 +40,7 @@ class Controller extends ModuleAbstract * @var string * @since 1.0.0 */ - public const MODULE_VERSION = '1.0.0'; + public const VERSION = '1.0.0'; /** * Module name. @@ -48,7 +48,7 @@ class Controller extends ModuleAbstract * @var string * @since 1.0.0 */ - public const MODULE_NAME = 'Monitoring'; + public const NAME = 'Monitoring'; /** * Module id. @@ -56,7 +56,7 @@ class Controller extends ModuleAbstract * @var int * @since 1.0.0 */ - public const MODULE_ID = 1000700000; + public const ID = 1000700000; /** * Providing. diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index 2a16c37..6739fe0 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -19,7 +19,7 @@ namespace Modules\Monitoring\tests\Admin; */ class AdminTest extends \PHPUnit\Framework\TestCase { - protected const MODULE_NAME = 'Monitoring'; + protected const NAME = 'Monitoring'; protected const URI_LOAD = '';