rename module constants and fix some unit test bugs

This commit is contained in:
Dennis Eichhorn 2021-09-28 18:28:42 +02:00
parent 6b27b71b23
commit 22ce0f1e7d
5 changed files with 28 additions and 28 deletions

View File

@ -23,7 +23,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocCreate', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],
@ -32,7 +32,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocUpdate', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],
@ -41,7 +41,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocGet', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],
@ -50,7 +50,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocDelete', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocDelete',
'verb' => RouteVerb::DELETE, 'verb' => RouteVerb::DELETE,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::DELETE, 'type' => PermissionType::DELETE,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],
@ -62,7 +62,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryCreate', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::CATEGORY, 'state' => PermissionState::CATEGORY,
], ],
@ -71,7 +71,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryUpdate', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::CATEGORY, 'state' => PermissionState::CATEGORY,
], ],
@ -80,7 +80,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryGet', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::CATEGORY, 'state' => PermissionState::CATEGORY,
], ],
@ -89,7 +89,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryDelete', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryDelete',
'verb' => RouteVerb::DELETE, 'verb' => RouteVerb::DELETE,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::DELETE, 'type' => PermissionType::DELETE,
'state' => PermissionState::CATEGORY, 'state' => PermissionState::CATEGORY,
], ],
@ -101,7 +101,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppCreate', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::APP, 'state' => PermissionState::APP,
], ],
@ -110,7 +110,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppUpdate', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::APP, 'state' => PermissionState::APP,
], ],
@ -119,7 +119,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppGet', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::APP, 'state' => PermissionState::APP,
], ],
@ -128,7 +128,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppDelete', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppDelete',
'verb' => RouteVerb::DELETE, 'verb' => RouteVerb::DELETE,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::DELETE, 'type' => PermissionType::DELETE,
'state' => PermissionState::APP, 'state' => PermissionState::APP,
], ],

View File

@ -23,7 +23,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:setUpBackend', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:setUpBackend',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],
@ -34,7 +34,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDashboard', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDashboard',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],
@ -45,7 +45,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategoryList', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategoryList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::CATEGORY, 'state' => PermissionState::CATEGORY,
], ],
@ -56,7 +56,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategory', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategory',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::CATEGORY, 'state' => PermissionState::CATEGORY,
], ],
@ -67,7 +67,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategoryCreate', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategoryCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::CATEGORY, 'state' => PermissionState::CATEGORY,
], ],
@ -78,7 +78,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDoc', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDoc',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],
@ -89,7 +89,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocCreate', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],
@ -100,7 +100,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocEdit', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocEdit',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],
@ -111,7 +111,7 @@ return [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocList', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],

View File

@ -286,7 +286,7 @@ final class BackendController extends Controller
$accountId = $request->header->account; $accountId = $request->header->account;
if (!$this->app->accountManager->get($accountId)->hasPermission( 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'); $view->setTemplate('/Web/Backend/Error/403_inline');
$response->header->status = RequestStatusCode::R_403; $response->header->status = RequestStatusCode::R_403;
@ -300,7 +300,7 @@ final class BackendController extends Controller
$view->setData('categories', $categories); $view->setData('categories', $categories);
$view->setData('document', $document); $view->setData('document', $document);
$view->addData('editable', $this->app->accountManager->get($accountId)->hasPermission( $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; return $view;

View File

@ -32,7 +32,7 @@ class Controller extends ModuleAbstract
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODULE_PATH = __DIR__ . '/../'; public const PATH = __DIR__ . '/../';
/** /**
* Module version. * Module version.
@ -40,7 +40,7 @@ class Controller extends ModuleAbstract
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODULE_VERSION = '1.0.0'; public const VERSION = '1.0.0';
/** /**
* Module name. * Module name.
@ -48,7 +48,7 @@ class Controller extends ModuleAbstract
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODULE_NAME = 'Knowledgebase'; public const NAME = 'Knowledgebase';
/** /**
* Module id. * Module id.
@ -56,7 +56,7 @@ class Controller extends ModuleAbstract
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODULE_ID = 1005900000; public const ID = 1005900000;
/** /**
* Providing. * Providing.

View File

@ -19,7 +19,7 @@ namespace Modules\Knowledgebase\tests\Admin;
*/ */
class AdminTest extends \PHPUnit\Framework\TestCase 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'; protected const URI_LOAD = 'http://127.0.0.1/en/backend/wiki';