diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 01c21a7..9f4e3fb 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorCreate', 'verb' => RouteVerb::PUT, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::DOC, ], @@ -32,7 +32,7 @@ return [ 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorUpdate', 'verb' => RouteVerb::SET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, 'state' => PermissionState::DOC, ], @@ -41,7 +41,7 @@ return [ 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorGet', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::DOC, ], @@ -50,7 +50,7 @@ return [ 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorDelete', 'verb' => RouteVerb::DELETE, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::DELETE, 'state' => PermissionState::DOC, ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index fd9705a..4a0f288 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\Editor\Controller\BackendController:setUpEditorEditor', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::DOC, ], @@ -32,7 +32,7 @@ return [ 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorCreate', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::DOC, ], @@ -43,7 +43,7 @@ return [ 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::DOC, ], @@ -54,7 +54,7 @@ return [ 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorSingle', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::DOC, ], @@ -65,7 +65,7 @@ return [ 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorEdit', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::MODIFY, 'state' => PermissionState::DOC, ], diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 9c2045c..63a9b59 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -136,7 +136,7 @@ final class BackendController extends Controller if ($doc->createdBy->getId() !== $accountId && !$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'); $response->header->status = RequestStatusCode::R_403; @@ -154,7 +154,7 @@ final class BackendController extends Controller $view->addData('tagSelector', $tagSelector); $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; @@ -182,7 +182,7 @@ final class BackendController extends Controller if ($doc->createdBy->getId() !== $accountId && !$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'); $response->header->status = RequestStatusCode::R_403; diff --git a/Controller/Controller.php b/Controller/Controller.php index b38449e..a8293ac 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 = 'Editor'; + public const NAME = 'Editor'; /** * Module id. @@ -56,7 +56,7 @@ class Controller extends ModuleAbstract * @var int * @since 1.0.0 */ - public const MODULE_ID = 1005300000; + public const ID = 1005300000; /** * Providing. diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index 30c0d2c..0fe6903 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -19,7 +19,7 @@ namespace Modules\Editor\tests\Admin; */ 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';