From 684b2616cefb78fc8161b41a1cd30fbc3315b77e 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/Install/Admin.install.php | 6 +++--- Admin/Routes/Web/Api.php | 32 ++++++++++++++++---------------- Admin/Routes/Web/Backend.php | 22 +++++++++++----------- Controller/Controller.php | 8 ++++---- tests/Admin/AdminTest.php | 2 +- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Admin/Install/Admin.install.php b/Admin/Install/Admin.install.php index 91f32f2..3a873a9 100644 --- a/Admin/Install/Admin.install.php +++ b/Admin/Install/Admin.install.php @@ -20,18 +20,18 @@ return [ 'type' => 'setting', 'name' => SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_UNIT, 'content' => '1', - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, ], [ 'type' => 'setting', 'name' => SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_DEPARTMENT, 'content' => '1', - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, ], [ 'type' => 'setting', 'name' => SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_POSITION, 'content' => '1', - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, ], ]; diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 8f01527..0b8ede0 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionCreate', 'verb' => RouteVerb::PUT, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::POSITION, ], @@ -32,7 +32,7 @@ return [ 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionGet', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::POSITION, ], @@ -41,7 +41,7 @@ return [ 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionSet', 'verb' => RouteVerb::SET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, 'state' => PermissionState::POSITION, ], @@ -50,7 +50,7 @@ return [ 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionDelete', 'verb' => RouteVerb::DELETE, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::DELETE, 'state' => PermissionState::POSITION, ], @@ -61,7 +61,7 @@ return [ 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentCreate', 'verb' => RouteVerb::PUT, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::DEPARTMENT, ], @@ -70,7 +70,7 @@ return [ 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentGet', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::DEPARTMENT, ], @@ -79,7 +79,7 @@ return [ 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentSet', 'verb' => RouteVerb::SET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, 'state' => PermissionState::DEPARTMENT, ], @@ -88,7 +88,7 @@ return [ 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentDelete', 'verb' => RouteVerb::DELETE, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::DELETE, 'state' => PermissionState::DEPARTMENT, ], @@ -99,7 +99,7 @@ return [ 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitCreate', 'verb' => RouteVerb::PUT, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::UNIT, ], @@ -108,7 +108,7 @@ return [ 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitGet', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::UNIT, ], @@ -117,7 +117,7 @@ return [ 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitSet', 'verb' => RouteVerb::SET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, 'state' => PermissionState::UNIT, ], @@ -126,7 +126,7 @@ return [ 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitDelete', 'verb' => RouteVerb::DELETE, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::UNIT, ], @@ -138,7 +138,7 @@ return [ 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitImageSet', 'verb' => RouteVerb::SET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, 'state' => PermissionState::UNIT, ], @@ -150,7 +150,7 @@ return [ 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitFind', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::UNIT, ], @@ -161,7 +161,7 @@ return [ 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentFind', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::DEPARTMENT, ], @@ -172,7 +172,7 @@ return [ 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionFind', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::POSITION, ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 0d837c2..bad2e73 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\Organization\Controller\BackendController:viewOrganigram', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::ORGANIGRAM, ], @@ -34,7 +34,7 @@ return [ 'dest' => '\Modules\Organization\Controller\BackendController:viewUnitList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::UNIT, ], @@ -45,7 +45,7 @@ return [ 'dest' => '\Modules\Organization\Controller\BackendController:viewUnitProfile', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::UNIT, ], @@ -56,7 +56,7 @@ return [ 'dest' => '\Modules\Media\Controller\BackendController::setUpFileUploaderTrait', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::UNIT, ], @@ -65,7 +65,7 @@ return [ 'dest' => '\Modules\Organization\Controller\BackendController:viewUnitCreate', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::UNIT, ], @@ -76,7 +76,7 @@ return [ 'dest' => '\Modules\Organization\Controller\BackendController:viewDepartmentList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::DEPARTMENT, ], @@ -87,7 +87,7 @@ return [ 'dest' => '\Modules\Organization\Controller\BackendController:viewDepartmentProfile', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::DEPARTMENT, ], @@ -98,7 +98,7 @@ return [ 'dest' => '\Modules\Organization\Controller\BackendController:viewDepartmentCreate', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::DEPARTMENT, ], @@ -109,7 +109,7 @@ return [ 'dest' => '\Modules\Organization\Controller\BackendController:viewPositionList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::POSITION, ], @@ -120,7 +120,7 @@ return [ 'dest' => '\Modules\Organization\Controller\BackendController:viewPositionProfile', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::POSITION, ], @@ -131,7 +131,7 @@ return [ 'dest' => '\Modules\Organization\Controller\BackendController:viewPositionCreate', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::POSITION, ], diff --git a/Controller/Controller.php b/Controller/Controller.php index ea68c55..219ee44 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 = 'Organization'; + public const NAME = 'Organization'; /** * Module id. @@ -56,7 +56,7 @@ class Controller extends ModuleAbstract * @var int * @since 1.0.0 */ - public const MODULE_ID = 1004700000; + public const ID = 1004700000; /** * Providing. diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index 2a350f8..8ada941 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -19,7 +19,7 @@ namespace Modules\Organization\tests\Admin; */ class AdminTest extends \PHPUnit\Framework\TestCase { - protected const MODULE_NAME = 'Organization'; + protected const NAME = 'Organization'; protected const URI_LOAD = 'http://127.0.0.1/en/backend/organization';