Jingga/oms-Media
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Media.git synced 2026-01-30 09:28:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make data in routing endpoint array

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-09-27 22:33:53 +00:00
parent 891c15f5f3
commit 804978cdd7
3 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Controller/ApiController.php
View File

@ -71,7 +71,7 @@ final class ApiController extends Controller
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
* @param array $data Generic data
*
* @return void
*
@ -79,7 +79,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiMediaUpload(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
public function apiMediaUpload(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
$uploads = $this->uploadFiles(
names: $request->getDataList('names'),
@ -552,7 +552,7 @@ final class ApiController extends Controller
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
* @param array $data Generic data
*
* @return void
*
@ -560,7 +560,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiMediaUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
public function apiMediaUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
/** @var Media $old */
$old = MediaMapper::get()->where('id', (int) $request->getData('id'))->execute();
@ -618,7 +618,7 @@ final class ApiController extends Controller
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
* @param array $data Generic data
*
* @return void
*
@ -626,7 +626,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiReferenceCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
public function apiReferenceCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
if (!empty($val = $this->validateReferenceCreate($request))) {
$response->header->status = RequestStatusCode::R_400;
@ -724,7 +724,7 @@ final class ApiController extends Controller
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
* @param array $data Generic data
*
* @return void
*
@ -732,7 +732,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiCollectionAdd(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
public function apiCollectionAdd(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
$collection = (int) $request->getData('collection');
$media = $request->getDataJson('media-list');
@ -755,7 +755,7 @@ final class ApiController extends Controller
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
* @param array $data Generic data
*
* @return void
*
@ -763,7 +763,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiCollectionCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
public function apiCollectionCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
if (!empty($val = $this->validateCollectionCreate($request))) {
$response->header->status = RequestStatusCode::R_400;
@ -947,7 +947,7 @@ final class ApiController extends Controller
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
* @param array $data Generic data
*
* @return void
*
@ -957,7 +957,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiMediaCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
public function apiMediaCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
$path = \urldecode($request->getDataString('path') ?? '');
$virtualPath = \urldecode($request->getDataString('virtualpath') ?? '/');
@ -1023,7 +1023,7 @@ final class ApiController extends Controller
*
* @param HttpRequest $request Request
* @param HttpResponse $response Response
* @param mixed $data Generic data
* @param array $data Generic data
*
* @return void
*
@ -1031,7 +1031,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiMediaExport(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
public function apiMediaExport(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
$filePath = '';
$media = null;
@ -1072,11 +1072,8 @@ final class ApiController extends Controller
return;
}
if (!isset($data, $data['guard'])) {
if (!isset($data)) {
$data = [];
}
if (!isset($data['guard'])) {
$data['guard'] = __DIR__ . '/../Files';
}
} elseif (empty($data) || !isset($data['guard'])) {
@ -1378,7 +1375,7 @@ final class ApiController extends Controller
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
* @param array $data Generic data
*
* @return void
*
@ -1386,7 +1383,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiMediaTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
public function apiMediaTypeCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
if (!empty($val = $this->validateMediaTypeCreate($request))) {
$response->header->status = RequestStatusCode::R_400;
@ -1450,7 +1447,7 @@ final class ApiController extends Controller
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
* @param array $data Generic data
*
* @return void
*
@ -1458,7 +1455,7 @@ final class ApiController extends Controller
*
* @since 1.0.0
*/
public function apiMediaTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
public function apiMediaTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
if (!empty($val = $this->validateMediaTypeL11nCreate($request))) {
$response->header->status = RequestStatusCode::R_400;

28
Controller/BackendController.php
View File

@ -54,14 +54,14 @@ final class BackendController extends Controller
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
* @param array $data Generic data
*
* @return RenderableInterface
*
* @since 1.0.0
* @codeCoverageIgnore
*/
public function viewMediaList(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
public function viewMediaList(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Media/Theme/Backend/media-list');
@ -189,14 +189,14 @@ final class BackendController extends Controller
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
* @param array $data Generic data
*
* @return RenderableInterface
*
* @since 1.0.0
* @codeCoverageIgnore
*/
public function viewMediaSingle(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
public function viewMediaSingle(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
{
$view = new MediaView($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Media/Theme/Backend/media-single');
@ -371,14 +371,14 @@ final class BackendController extends Controller
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
* @param array $data Generic data
*
* @return RenderableInterface
*
* @since 1.0.0
* @codeCoverageIgnore
*/
public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
{
$view = new View($this->app->l11nManager, $request, $response);
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response);
@ -401,14 +401,14 @@ final class BackendController extends Controller
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
* @param array $data Generic data
*
* @return RenderableInterface
*
* @since 1.0.0
* @codeCoverageIgnore
*/
public function viewMediaTypeSettings(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
public function viewMediaTypeSettings(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings-type');
@ -434,14 +434,14 @@ final class BackendController extends Controller
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
* @param array $data Generic data
*
* @return RenderableInterface
*
* @since 1.0.0
* @codeCoverageIgnore
*/
public function viewMediaUpload(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
public function viewMediaUpload(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Media/Theme/Backend/media-upload');
@ -454,14 +454,14 @@ final class BackendController extends Controller
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
* @param array $data Generic data
*
* @return RenderableInterface
*
* @since 1.0.0
* @codeCoverageIgnore
*/
public function viewMediaFileCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
public function viewMediaFileCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Media/Theme/Backend/media-file-create');
@ -477,14 +477,14 @@ final class BackendController extends Controller
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
* @param array $data Generic data
*
* @return RenderableInterface
*
* @since 1.0.0
* @codeCoverageIgnore
*/
public function viewMediaCollectionCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
public function viewMediaCollectionCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Media/Theme/Backend/media-collection-create');

4
Controller/FileUploaderTrait.php
View File

@ -33,14 +33,14 @@ trait FileUploaderTrait
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Misc. data
* @param array $data Misc. data
*
* @return void
*
* @since 1.0.0
* @codeCoverageIgnore
*/
public function setUpFileUploaderTrait(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
public function setUpFileUploaderTrait(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
$head = $response->data['Content']->head;
$nonce = $this->app->appSettings->getOption('script-nonce');