diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 28b4e17..cf15e40 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\Helper\Controller\ApiController:apiHelperExport', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::REPORT, ], @@ -34,7 +34,7 @@ return [ 'dest' => '\Modules\Helper\Controller\ApiController:apiTemplateCreate', 'verb' => RouteVerb::SET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::TEMPLATE, ], @@ -45,7 +45,7 @@ return [ 'dest' => '\Modules\Helper\Controller\ApiController:apiReportCreate', 'verb' => RouteVerb::SET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::REPORT, ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 6fdda80..3411428 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\Media\Controller\BackendController::setUpFileUploaderTrait', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::TEMPLATE, ], @@ -32,7 +32,7 @@ return [ 'dest' => '\Modules\Helper\Controller\BackendController:viewTemplateCreate', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::TEMPLATE, ], @@ -43,7 +43,7 @@ return [ 'dest' => '\Modules\Media\Controller\BackendController::setUpFileUploaderTrait', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::REPORT, ], @@ -52,7 +52,7 @@ return [ 'dest' => '\Modules\Helper\Controller\BackendController:viewReportCreate', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::REPORT, ], @@ -63,7 +63,7 @@ return [ 'dest' => '\Modules\Helper\Controller\BackendController:viewTemplateList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::REPORT, ], @@ -74,7 +74,7 @@ return [ 'dest' => '\Modules\Helper\Controller\BackendController:viewHelperReport', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::REPORT, ], diff --git a/Controller/ApiController.php b/Controller/ApiController.php index ea9588f..fb3f91c 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -74,7 +74,7 @@ final class ApiController extends Controller // is allowed to read if (!$this->app->accountManager->get($accountId)->hasPermission( - PermissionType::READ, $this->app->orgId, null, self::MODULE_NAME, PermissionState::REPORT, $template->getId()) + PermissionType::READ, $this->app->orgId, null, self::NAME, PermissionState::REPORT, $template->getId()) ) { $response->header->status = RequestStatusCode::R_403; @@ -84,7 +84,7 @@ final class ApiController extends Controller if (\in_array($request->getData('type'), ['xlsx', 'pdf', 'docx', 'pptx', 'csv'])) { // is allowed to export if (!$this->app->accountManager->get($accountId)->hasPermission( - PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::EXPORT + PermissionType::READ, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::EXPORT )) { $response->header->status = RequestStatusCode::R_403; @@ -345,8 +345,8 @@ final class ApiController extends Controller $request->header->account, $this->app->orgId, $this->app->appName, - self::MODULE_NAME, - self::MODULE_NAME, + self::NAME, + self::NAME, PermissionState::TEMPLATE, $template->getId(), null, @@ -456,8 +456,8 @@ final class ApiController extends Controller $request->header->account, $this->app->orgId, $this->app->appName, - self::MODULE_NAME, - self::MODULE_NAME, + self::NAME, + self::NAME, PermissionState::REPORT, $report->getId(), null, diff --git a/Controller/Controller.php b/Controller/Controller.php index 356477e..a2ba789 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 = 'Helper'; + public const NAME = 'Helper'; /** * Module id. @@ -56,7 +56,7 @@ class Controller extends ModuleAbstract * @var int * @since 1.0.0 */ - public const MODULE_ID = 1002700000; + public const ID = 1002700000; /** * Providing. diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index b3fbc75..820de87 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -19,7 +19,7 @@ namespace Modules\Helper\tests\Admin; */ class AdminTest extends \PHPUnit\Framework\TestCase { - protected const MODULE_NAME = 'Helper'; + protected const NAME = 'Helper'; protected const URI_LOAD = 'http://127.0.0.1/en/backend/helper';