From 22ce0f1e7dea9e16fa3fe3b2179cb1403b928354 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 | 24 ++++++++++++------------ Admin/Routes/Web/Backend.php | 18 +++++++++--------- Controller/BackendController.php | 4 ++-- Controller/Controller.php | 8 ++++---- tests/Admin/AdminTest.php | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 4e12639..a6bd63e 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocCreate', 'verb' => RouteVerb::PUT, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::WIKI, ], @@ -32,7 +32,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocUpdate', 'verb' => RouteVerb::SET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, 'state' => PermissionState::WIKI, ], @@ -41,7 +41,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocGet', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::WIKI, ], @@ -50,7 +50,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocDelete', 'verb' => RouteVerb::DELETE, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::DELETE, 'state' => PermissionState::WIKI, ], @@ -62,7 +62,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryCreate', 'verb' => RouteVerb::PUT, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::CATEGORY, ], @@ -71,7 +71,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryUpdate', 'verb' => RouteVerb::SET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, 'state' => PermissionState::CATEGORY, ], @@ -80,7 +80,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryGet', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::CATEGORY, ], @@ -89,7 +89,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryDelete', 'verb' => RouteVerb::DELETE, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::DELETE, 'state' => PermissionState::CATEGORY, ], @@ -101,7 +101,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppCreate', 'verb' => RouteVerb::PUT, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::APP, ], @@ -110,7 +110,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppUpdate', 'verb' => RouteVerb::SET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, 'state' => PermissionState::APP, ], @@ -119,7 +119,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppGet', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::APP, ], @@ -128,7 +128,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppDelete', 'verb' => RouteVerb::DELETE, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::DELETE, 'state' => PermissionState::APP, ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 69e14b0..f9c2882 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\BackendController:setUpBackend', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::WIKI, ], @@ -34,7 +34,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDashboard', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::WIKI, ], @@ -45,7 +45,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategoryList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::CATEGORY, ], @@ -56,7 +56,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategory', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::CATEGORY, ], @@ -67,7 +67,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategoryCreate', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::CATEGORY, ], @@ -78,7 +78,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDoc', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::WIKI, ], @@ -89,7 +89,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocCreate', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::WIKI, ], @@ -100,7 +100,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocEdit', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::MODIFY, 'state' => PermissionState::WIKI, ], @@ -111,7 +111,7 @@ return [ 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::WIKI, ], diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 30dc58a..d00ddf7 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -286,7 +286,7 @@ final class BackendController extends Controller $accountId = $request->header->account; if (!$this->app->accountManager->get($accountId)->hasPermission( - PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::WIKI, $document->getId()) + PermissionType::READ, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::WIKI, $document->getId()) ) { $view->setTemplate('/Web/Backend/Error/403_inline'); $response->header->status = RequestStatusCode::R_403; @@ -300,7 +300,7 @@ final class BackendController extends Controller $view->setData('categories', $categories); $view->setData('document', $document); $view->addData('editable', $this->app->accountManager->get($accountId)->hasPermission( - PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::WIKI, $document->getId()) + PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::WIKI, $document->getId()) ); return $view; diff --git a/Controller/Controller.php b/Controller/Controller.php index 5151483..0a9d93f 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 = 'Knowledgebase'; + public const NAME = 'Knowledgebase'; /** * Module id. @@ -56,7 +56,7 @@ class Controller extends ModuleAbstract * @var int * @since 1.0.0 */ - public const MODULE_ID = 1005900000; + public const ID = 1005900000; /** * Providing. diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index c51e28d..4431cc1 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -19,7 +19,7 @@ namespace Modules\Knowledgebase\tests\Admin; */ class AdminTest extends \PHPUnit\Framework\TestCase { - protected const MODULE_NAME = 'Knowledgebase'; + protected const NAME = 'Knowledgebase'; protected const URI_LOAD = 'http://127.0.0.1/en/backend/wiki';