From 4c7ee265b4e3495ed3b613f0fbef9686dfdb12e1 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/Api.php | 2 +- Admin/Routes/Web/Backend.php | 10 +++++----- Controller/Controller.php | 8 ++++---- tests/Admin/AdminTest.php | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 2f7e335..3e5d80c 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\Draw\Controller\ApiController:apiDrawCreate', 'verb' => RouteVerb::SET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::DRAW, ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index fe33924..03e8dc7 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\Draw\Controller\BackendController:setUpDrawEditor', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::DRAW, ], @@ -32,7 +32,7 @@ return [ 'dest' => '\Modules\Draw\Controller\BackendController:viewDrawCreate', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::DRAW, ], @@ -43,7 +43,7 @@ return [ 'dest' => '\Modules\Draw\Controller\BackendController:viewDrawList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::DRAW, ], @@ -54,7 +54,7 @@ return [ 'dest' => '\Modules\Draw\Controller\BackendController:setUpDrawEditor', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::DRAW, ], @@ -63,7 +63,7 @@ return [ 'dest' => '\Modules\Draw\Controller\BackendController:viewDrawSingle', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::DRAW, ], diff --git a/Controller/Controller.php b/Controller/Controller.php index 40577b3..17a6c1b 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 = 'Draw'; + public const NAME = 'Draw'; /** * Module id. @@ -56,7 +56,7 @@ class Controller extends ModuleAbstract * @var int * @since 1.0.0 */ - public const MODULE_ID = 1005200000; + public const ID = 1005200000; /** * Providing. diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index a3747c9..45120d0 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -19,7 +19,7 @@ namespace Modules\Draw\tests\Admin; */ class AdminTest extends \PHPUnit\Framework\TestCase { - protected const MODULE_NAME = 'Draw'; + protected const NAME = 'Draw'; protected const URI_LOAD = 'http://127.0.0.1/en/backend/draw';