From 664272afb3cba08ed325643d4d4b1238304d3272 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 28 Sep 2021 18:28:43 +0200 Subject: [PATCH] rename module constants and fix some unit test bugs --- Admin/Routes/Web/Backend.php | 38 ++++++++++++++++++------------------ Controller/Controller.php | 8 ++++---- tests/Admin/AdminTest.php | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index b8f644c..6b26136 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskCockpit', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::COCKPIT, ], @@ -34,7 +34,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::RISK, ], @@ -45,7 +45,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskCreate', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::RISK, ], @@ -56,7 +56,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskSingle', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::RISK, ], @@ -67,7 +67,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskCauseList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::CAUSE, ], @@ -78,7 +78,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskCauseSingle', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::CAUSE, ], @@ -89,7 +89,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskSolutionList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::SOLUTION, ], @@ -100,7 +100,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskSolutionSingle', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::SOLUTION, ], @@ -111,7 +111,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskUnitList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::UNIT, ], @@ -122,7 +122,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskUnitSingle', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::UNIT, ], @@ -133,7 +133,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskDepartmentList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::DEPARTMENT, ], @@ -144,7 +144,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskDepartmentSingle', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::DEPARTMENT, ], @@ -155,7 +155,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskCategoryList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::CATEGORY, ], @@ -166,7 +166,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskCategorySingle', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::CATEGORY, ], @@ -177,7 +177,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskProjectList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::PROJECT, ], @@ -188,7 +188,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskProjectSingle', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::PROJECT, ], @@ -199,7 +199,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskProcessList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::PROCESS, ], @@ -210,7 +210,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskProcessSingle', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::PROCESS, ], @@ -221,7 +221,7 @@ return [ 'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskSettings', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::SETTINGS, ], diff --git a/Controller/Controller.php b/Controller/Controller.php index a83f4d2..bd44678 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 = 'RiskManagement'; + public const NAME = 'RiskManagement'; /** * Module id. @@ -56,7 +56,7 @@ class Controller extends ModuleAbstract * @var int * @since 1.0.0 */ - public const MODULE_ID = 1003000000; + public const ID = 1003000000; /** * Providing. diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index d0befaa..4746377 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -19,7 +19,7 @@ namespace Modules\RiskManagement\tests\Admin; */ class AdminTest extends \PHPUnit\Framework\TestCase { - protected const MODULE_NAME = 'RiskManagement'; + protected const NAME = 'RiskManagement'; protected const URI_LOAD = '';