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 893e527b89
commit 0796549cba
9 changed files with 24 additions and 23 deletions

View File

@ -23,7 +23,7 @@ return [
'dest' => '\Modules\Media\Controller\ApiController:apiMediaUpload',
'verb' => RouteVerb::PUT,
'permission' => [
'module' => ApiController::MODULE_NAME,
'module' => ApiController::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::MEDIA,
],
@ -32,7 +32,7 @@ return [
'dest' => '\Modules\Media\Controller\ApiController:apiMediaUpdate',
'verb' => RouteVerb::SET,
'permission' => [
'module' => ApiController::MODULE_NAME,
'module' => ApiController::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::MEDIA,
],
@ -43,7 +43,7 @@ return [
'dest' => '\Modules\Media\Controller\ApiController:apiMediaCreate',
'verb' => RouteVerb::PUT,
'permission' => [
'module' => ApiController::MODULE_NAME,
'module' => ApiController::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::MEDIA,
],
@ -54,7 +54,7 @@ return [
'dest' => '\Modules\Media\Controller\ApiController:apiMediaExport',
'verb' => RouteVerb::GET,
'permission' => [
'module' => ApiController::MODULE_NAME,
'module' => ApiController::NAME,
'type' => PermissionType::READ,
'state' => PermissionState::MEDIA,
],
@ -65,7 +65,7 @@ return [
'dest' => '\Modules\Media\Controller\ApiController:apiCollectionCreate',
'verb' => RouteVerb::PUT,
'permission' => [
'module' => ApiController::MODULE_NAME,
'module' => ApiController::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::MEDIA,
],

View File

@ -23,7 +23,7 @@ return [
'dest' => '\Modules\Media\Controller\BackendController:viewMediaList',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::MODULE_NAME,
'module' => BackendController::NAME,
'type' => PermissionType::READ,
'state' => PermissionState::MEDIA,
],
@ -34,7 +34,7 @@ return [
'dest' => '\Modules\Media\Controller\BackendController:viewMediaUpload',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::MODULE_NAME,
'module' => BackendController::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::MEDIA,
],
@ -45,7 +45,7 @@ return [
'dest' => '\Modules\Media\Controller\BackendController:viewMediaFileCreate',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::MODULE_NAME,
'module' => BackendController::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::MEDIA,
],
@ -56,7 +56,7 @@ return [
'dest' => '\Modules\Media\Controller\BackendController:viewMediaCollectionCreate',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::MODULE_NAME,
'module' => BackendController::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::MEDIA,
],
@ -67,7 +67,7 @@ return [
'dest' => '\Modules\Media\Controller\BackendController:viewMediaSingle',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::MODULE_NAME,
'module' => BackendController::NAME,
'type' => PermissionType::READ,
'state' => PermissionState::MEDIA,
],

View File

@ -244,8 +244,8 @@ final class ApiController extends Controller
$account,
$this->app->orgId,
$this->app->appName,
self::MODULE_NAME,
self::MODULE_NAME,
self::NAME,
self::NAME,
PermissionState::MEDIA,
$created->getId(),
null,
@ -494,7 +494,7 @@ final class ApiController extends Controller
{
if (empty($media)
|| !$this->app->accountManager->get($account)->hasPermission(
PermissionType::CREATE, $this->app->orgId, null, self::MODULE_NAME, PermissionState::COLLECTION, null)
PermissionType::CREATE, $this->app->orgId, null, self::NAME, PermissionState::COLLECTION, null)
) {
return new NullCollection();
}

View File

@ -44,7 +44,7 @@ final class BackendController extends Controller
* @var string
* @since 1.0.0
*/
public const MODULE_PATH = __DIR__;
public const PATH = __DIR__;
/**
* Module version.
@ -52,7 +52,7 @@ final class BackendController extends Controller
* @var string
* @since 1.0.0
*/
public const MODULE_VERSION = '1.0.0';
public const VERSION = '1.0.0';
/**
* Module name.
@ -60,7 +60,7 @@ final class BackendController extends Controller
* @var string
* @since 1.0.0
*/
public const MODULE_NAME = 'Media';
public const NAME = 'Media';
/**
* Module id.
@ -68,7 +68,7 @@ final class BackendController extends Controller
* @var int
* @since 1.0.0
*/
public const MODULE_ID = 1000400000;
public const ID = 1000400000;
/**
* Providing.

View File

@ -40,7 +40,7 @@ class Controller extends ModuleAbstract
* @var string
* @since 1.0.0
*/
public const MODULE_PATH = __DIR__ . '/../';
public const PATH = __DIR__ . '/../';
/**
* Module version.
@ -48,7 +48,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.
@ -56,7 +56,7 @@ class Controller extends ModuleAbstract
* @var string
* @since 1.0.0
*/
public const MODULE_NAME = 'Media';
public const NAME = 'Media';
/**
* Module id.
@ -64,7 +64,7 @@ class Controller extends ModuleAbstract
* @var int
* @since 1.0.0
*/
public const MODULE_ID = 1000400000;
public const ID = 1000400000;
/**
* Providing.

View File

@ -22,7 +22,7 @@ use phpOMS\Application\ApplicationAbstract;
*/
class AdminTest extends \PHPUnit\Framework\TestCase
{
protected const MODULE_NAME = 'Media';
protected const NAME = 'Media';
protected const URI_LOAD = 'http://127.0.0.1/en/backend/media';

View File

@ -1 +0,0 @@
file content

View File

@ -0,0 +1 @@
Test Content

View File

@ -0,0 +1 @@
Media/Collection Test 2