From 94f9d502bf726f06f739fa051f5efb97b83b8c69 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 03:42:47 +0200 Subject: [PATCH] use direct data access for response data --- Controller/ApiController.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 8ce8303..9210e41 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -70,7 +70,7 @@ final class ApiController extends Controller public function apiWikiDocCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateWikiDocCreate($request))) { - $response->set($request->uri->__toString(), new FormValidation($val)); + $response->data[$request->uri->__toString()] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -79,7 +79,7 @@ final class ApiController extends Controller $doc = $this->createWikiDocFromRequest($request, $response, $data); $this->createModel($request->header->account, $doc, WikiDocMapper::class, 'doc', $request->getOrigin()); - if (!empty($request->getFiles()) + if (!empty($request->files) || !empty($request->getDataJson('media')) ) { $this->createWikiMedia($doc, $request); @@ -110,7 +110,7 @@ final class ApiController extends Controller /** @var \Modules\Admin\Models\Account $account */ $account = AccountMapper::get()->where('id', $request->header->account)->execute(); - if (!empty($uploadedFiles = $request->getFiles())) { + if (!empty($uploadedFiles = $request->files)) { $uploaded = $this->app->moduleManager->get('Media')->uploadFiles( names: [], fileNames: [], @@ -353,7 +353,7 @@ final class ApiController extends Controller public function apiWikiCategoryL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateWikiCategoryL11nCreate($request))) { - $response->set('wiki_category_l11n_create', new FormValidation($val)); + $response->data['wiki_category_l11n_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -500,7 +500,7 @@ final class ApiController extends Controller public function apiWikiCategoryCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateWikiCategoryCreate($request))) { - $response->set($request->uri->__toString(), new FormValidation($val)); + $response->data[$request->uri->__toString()] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -664,7 +664,7 @@ final class ApiController extends Controller public function apiWikiAppCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateWikiAppCreate($request))) { - $response->set($request->uri->__toString(), new FormValidation($val)); + $response->data[$request->uri->__toString()] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return;