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 b687f9dd5c
commit b25b62e711
5 changed files with 17 additions and 17 deletions

View File

@ -23,7 +23,7 @@ return [
'dest' => '\Modules\Editor\Controller\ApiController:apiEditorCreate', 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::DOC, 'state' => PermissionState::DOC,
], ],
@ -32,7 +32,7 @@ return [
'dest' => '\Modules\Editor\Controller\ApiController:apiEditorUpdate', 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::DOC, 'state' => PermissionState::DOC,
], ],
@ -41,7 +41,7 @@ return [
'dest' => '\Modules\Editor\Controller\ApiController:apiEditorGet', 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::DOC, 'state' => PermissionState::DOC,
], ],
@ -50,7 +50,7 @@ return [
'dest' => '\Modules\Editor\Controller\ApiController:apiEditorDelete', 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorDelete',
'verb' => RouteVerb::DELETE, 'verb' => RouteVerb::DELETE,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::DELETE, 'type' => PermissionType::DELETE,
'state' => PermissionState::DOC, 'state' => PermissionState::DOC,
], ],

View File

@ -23,7 +23,7 @@ return [
'dest' => '\Modules\Editor\Controller\BackendController:setUpEditorEditor', 'dest' => '\Modules\Editor\Controller\BackendController:setUpEditorEditor',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::DOC, 'state' => PermissionState::DOC,
], ],
@ -32,7 +32,7 @@ return [
'dest' => '\Modules\Editor\Controller\BackendController:viewEditorCreate', 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::DOC, 'state' => PermissionState::DOC,
], ],
@ -43,7 +43,7 @@ return [
'dest' => '\Modules\Editor\Controller\BackendController:viewEditorList', 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::DOC, 'state' => PermissionState::DOC,
], ],
@ -54,7 +54,7 @@ return [
'dest' => '\Modules\Editor\Controller\BackendController:viewEditorSingle', 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorSingle',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::DOC, 'state' => PermissionState::DOC,
], ],
@ -65,7 +65,7 @@ return [
'dest' => '\Modules\Editor\Controller\BackendController:viewEditorEdit', 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorEdit',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::DOC, 'state' => PermissionState::DOC,
], ],

View File

@ -136,7 +136,7 @@ final class BackendController extends Controller
if ($doc->createdBy->getId() !== $accountId if ($doc->createdBy->getId() !== $accountId
&& !$this->app->accountManager->get($accountId)->hasPermission( && !$this->app->accountManager->get($accountId)->hasPermission(
PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DOC, $doc->getId()) PermissionType::READ, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::DOC, $doc->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;
@ -154,7 +154,7 @@ final class BackendController extends Controller
$view->addData('tagSelector', $tagSelector); $view->addData('tagSelector', $tagSelector);
$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::DOC, $doc->getId()) PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::DOC, $doc->getId())
); );
return $view; return $view;
@ -182,7 +182,7 @@ final class BackendController extends Controller
if ($doc->createdBy->getId() !== $accountId if ($doc->createdBy->getId() !== $accountId
&& !$this->app->accountManager->get($accountId)->hasPermission( && !$this->app->accountManager->get($accountId)->hasPermission(
PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DOC, $doc->getId()) PermissionType::READ, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::DOC, $doc->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;

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 = 'Editor'; public const NAME = 'Editor';
/** /**
* 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 = 1005300000; public const ID = 1005300000;
/** /**
* Providing. * Providing.

View File

@ -19,7 +19,7 @@ namespace Modules\Editor\tests\Admin;
*/ */
class AdminTest extends \PHPUnit\Framework\TestCase class AdminTest extends \PHPUnit\Framework\TestCase
{ {
protected const MODULE_NAME = 'Editor'; protected const NAME = 'Editor';
protected const URI_LOAD = 'http://127.0.0.1/en/backend/editor'; protected const URI_LOAD = 'http://127.0.0.1/en/backend/editor';