From 7737971ea1992b2b5d78c836abf58c4f4a44871e 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/Api.php | 8 ++++---- Admin/Routes/Web/Backend.php | 6 +++--- Controller/Controller.php | 8 ++++---- tests/Admin/AdminTest.php | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 722c280..076e691 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\Tag\Controller\ApiController:apiTagCreate', 'verb' => RouteVerb::PUT, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::TAG, ], @@ -32,7 +32,7 @@ return [ 'dest' => '\Modules\Tag\Controller\ApiController:apiTagUpdate', 'verb' => RouteVerb::SET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, 'state' => PermissionState::TAG, ], @@ -41,7 +41,7 @@ return [ 'dest' => '\Modules\Tag\Controller\ApiController:apiTagDelete', 'verb' => RouteVerb::DELETE, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::DELETE, 'state' => PermissionState::TAG, ], @@ -52,7 +52,7 @@ return [ 'dest' => '\Modules\Tag\Controller\ApiController:apiTagFind', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::TAG, ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index a137938..aa73287 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\Tag\Controller\BackendController:viewTagCreate', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::TAG, ], @@ -34,7 +34,7 @@ return [ 'dest' => '\Modules\Tag\Controller\BackendController:viewTagList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::TAG, ], @@ -45,7 +45,7 @@ return [ 'dest' => '\Modules\Tag\Controller\BackendController:viewTagSingle', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::TAG, ], diff --git a/Controller/Controller.php b/Controller/Controller.php index 50178e3..f038f25 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 = 'Tag'; + public const NAME = 'Tag'; /** * Module id. @@ -56,7 +56,7 @@ class Controller extends ModuleAbstract * @var int * @since 1.0.0 */ - public const MODULE_ID = 1007500000; + public const ID = 1007500000; /** * Providing. diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index 9240c7a..91cd3f0 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -19,7 +19,7 @@ namespace Modules\Tag\tests\Admin; */ class AdminTest extends \PHPUnit\Framework\TestCase { - protected const MODULE_NAME = 'Tag'; + protected const NAME = 'Tag'; protected const URI_LOAD = '';