Jingga/oms-Media
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Media.git synced 2026-02-16 17:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename module constants and fix some unit test bugs

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Admin/Routes/Web/Api.php
View File

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

10
Admin/Routes/Web/Backend.php
View File

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

6
Controller/ApiController.php
View File

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

8
Controller/BackendController.php
View File

@ -44,7 +44,7 @@ final class BackendController extends Controller
* @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.
@ -52,7 +52,7 @@ final class BackendController extends Controller
* @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.
@ -60,7 +60,7 @@ final class BackendController extends Controller
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODULE_NAME = 'Media'; public const NAME = 'Media';
/** /**
* Module id. * Module id.
@ -68,7 +68,7 @@ final class BackendController extends Controller
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODULE_ID = 1000400000; public const ID = 1000400000;
/** /**
* Providing. * Providing.

8
Controller/Controller.php
View File

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

2
tests/Admin/AdminTest.php
View File

@ -22,7 +22,7 @@ use phpOMS\Application\ApplicationAbstract;
*/ */
class AdminTest extends \PHPUnit\Framework\TestCase 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'; protected const URI_LOAD = 'http://127.0.0.1/en/backend/media';

1
tests/Controller/test/path/created.md
View File

@ -1 +0,0 @@
file content

1
tests/Controller/test/path/testFile1.txt Normal file
View File

@ -0,0 +1 @@
Test Content

1
tests/Controller/test/path/testFile2.txt Normal file
View File

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