rename module constants and fix some unit test bugs

This commit is contained in:
Dennis Eichhorn 2021-09-28 18:28:43 +02:00
parent dc24a2452f
commit 2b929450f6
5 changed files with 19 additions and 19 deletions

View File

@ -23,7 +23,7 @@ return [
// 'dest' => '\Modules\Support\Controller\ApiController:apiTaskCreate', // 'dest' => '\Modules\Support\Controller\ApiController:apiTaskCreate',
// 'verb' => RouteVerb::PUT, // 'verb' => RouteVerb::PUT,
// 'permission' => [ // 'permission' => [
// 'module' => ApiController::MODULE_NAME, // 'module' => ApiController::NAME,
// 'type' => PermissionType::CREATE, // 'type' => PermissionType::CREATE,
// 'state' => PermissionState::TICKET, // 'state' => PermissionState::TICKET,
// ], // ],
@ -32,7 +32,7 @@ return [
// 'dest' => '\Modules\Support\Controller\ApiController:apiTaskSet', // 'dest' => '\Modules\Support\Controller\ApiController:apiTaskSet',
// 'verb' => RouteVerb::SET, // 'verb' => RouteVerb::SET,
// 'permission' => [ // 'permission' => [
// 'module' => ApiController::MODULE_NAME, // 'module' => ApiController::NAME,
// 'type' => PermissionType::MODIFY, // 'type' => PermissionType::MODIFY,
// 'state' => PermissionState::TICKET, // 'state' => PermissionState::TICKET,
// ], // ],
@ -41,7 +41,7 @@ return [
// 'dest' => '\Modules\Support\Controller\ApiController:apiTaskGet', // 'dest' => '\Modules\Support\Controller\ApiController:apiTaskGet',
// 'verb' => RouteVerb::GET, // 'verb' => RouteVerb::GET,
// 'permission' => [ // 'permission' => [
// 'module' => ApiController::MODULE_NAME, // 'module' => ApiController::NAME,
// 'type' => PermissionType::READ, // 'type' => PermissionType::READ,
// 'state' => PermissionState::TICKET, // 'state' => PermissionState::TICKET,
// ], // ],
@ -52,7 +52,7 @@ return [
// 'dest' => '\Modules\Support\Controller\ApiController:apiTaskElementCreate', // 'dest' => '\Modules\Support\Controller\ApiController:apiTaskElementCreate',
// 'verb' => RouteVerb::PUT, // 'verb' => RouteVerb::PUT,
// 'permission' => [ // 'permission' => [
// 'module' => ApiController::MODULE_NAME, // 'module' => ApiController::NAME,
// 'type' => PermissionType::CREATE, // 'type' => PermissionType::CREATE,
// 'state' => PermissionState::ELEMENT, // 'state' => PermissionState::ELEMENT,
// ], // ],
@ -61,7 +61,7 @@ return [
// 'dest' => '\Modules\Support\Controller\ApiController:apiTaskElementSet', // 'dest' => '\Modules\Support\Controller\ApiController:apiTaskElementSet',
// 'verb' => RouteVerb::SET, // 'verb' => RouteVerb::SET,
// 'permission' => [ // 'permission' => [
// 'module' => ApiController::MODULE_NAME, // 'module' => ApiController::NAME,
// 'type' => PermissionType::MODIFY, // 'type' => PermissionType::MODIFY,
// 'state' => PermissionState::ELEMENT, // 'state' => PermissionState::ELEMENT,
// ], // ],
@ -70,7 +70,7 @@ return [
// 'dest' => '\Modules\Support\Controller\ApiController:apiTaskElementGet', // 'dest' => '\Modules\Support\Controller\ApiController:apiTaskElementGet',
// 'verb' => RouteVerb::GET, // 'verb' => RouteVerb::GET,
// 'permission' => [ // 'permission' => [
// 'module' => ApiController::MODULE_NAME, // 'module' => ApiController::NAME,
// 'type' => PermissionType::READ, // 'type' => PermissionType::READ,
// 'state' => PermissionState::TICKET, // 'state' => PermissionState::TICKET,
// ], // ],

View File

@ -23,7 +23,7 @@ return [
'dest' => '\Modules\Support\Controller\BackendController:viewModuleSettings', 'dest' => '\Modules\Support\Controller\BackendController:viewModuleSettings',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => \Modules\Admin\Models\PermissionState::MODULE, 'state' => \Modules\Admin\Models\PermissionState::MODULE,
], ],
@ -34,7 +34,7 @@ return [
'dest' => '\Modules\Support\Controller\BackendController:viewSupportList', 'dest' => '\Modules\Support\Controller\BackendController:viewSupportList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::TICKET, 'state' => PermissionState::TICKET,
], ],
@ -45,7 +45,7 @@ return [
'dest' => '\Modules\Support\Controller\BackendController:viewSupportTicket', 'dest' => '\Modules\Support\Controller\BackendController:viewSupportTicket',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::TICKET, 'state' => PermissionState::TICKET,
], ],
@ -56,7 +56,7 @@ return [
'dest' => '\Modules\Support\Controller\BackendController:viewSupportCreate', 'dest' => '\Modules\Support\Controller\BackendController:viewSupportCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::TICKET, 'state' => PermissionState::TICKET,
], ],
@ -67,7 +67,7 @@ return [
'dest' => '\Modules\Support\Controller\BackendController:viewSupportAnalysis', 'dest' => '\Modules\Support\Controller\BackendController:viewSupportAnalysis',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::ANALYSIS, 'state' => PermissionState::ANALYSIS,
], ],
@ -78,7 +78,7 @@ return [
'dest' => '\Modules\Support\Controller\BackendController:viewSupportSettings', 'dest' => '\Modules\Support\Controller\BackendController:viewSupportSettings',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::SETTINGS, 'state' => PermissionState::SETTINGS,
], ],
@ -89,7 +89,7 @@ return [
'dest' => '\Modules\Support\Controller\BackendController:viewPrivateSupportDashboard', 'dest' => '\Modules\Support\Controller\BackendController:viewPrivateSupportDashboard',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::DASHBOARD, 'state' => PermissionState::DASHBOARD,
], ],

View File

@ -241,7 +241,7 @@ final class BackendController extends Controller
$view->setData('applications', $applications); $view->setData('applications', $applications);
if (\is_file(__DIR__ . '/../Admin/Settings/Theme/Backend/settings.tpl.php')) { if (\is_file(__DIR__ . '/../Admin/Settings/Theme/Backend/settings.tpl.php')) {
$view->setTemplate('/Modules/' . static::MODULE_NAME . '/Admin/Settings/Theme/Backend/settings'); $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings');
} else { } else {
$view->setTemplate('/Modules/Admin/Theme/Backend/modules-settings'); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-settings');
} }

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

View File

@ -19,7 +19,7 @@ namespace Modules\Support\tests\Admin;
*/ */
class AdminTest extends \PHPUnit\Framework\TestCase class AdminTest extends \PHPUnit\Framework\TestCase
{ {
protected const MODULE_NAME = 'Support'; protected const NAME = 'Support';
protected const URI_LOAD = ''; protected const URI_LOAD = '';