From 3758770718a9d0eac5ccef43fadb003c01a1bc01 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 03:42:43 +0200 Subject: [PATCH] use direct data access for response data --- Controller/ApiAttributeController.php | 10 +++++----- Controller/ApiBillController.php | 14 +++++++------- Controller/ApiBillTypeController.php | 4 ++-- Controller/ApiPriceController.php | 2 +- Controller/ApiPurchaseController.php | 2 +- Controller/ApiTaxController.php | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php index 3a11691..bc43c1a 100755 --- a/Controller/ApiAttributeController.php +++ b/Controller/ApiAttributeController.php @@ -58,7 +58,7 @@ final class ApiAttributeController extends Controller public function apiBillAttributeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateBillAttributeCreate($request))) { - $response->set('attribute_create', new FormValidation($val)); + $response->data['attribute_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -137,7 +137,7 @@ final class ApiAttributeController extends Controller public function apiBillAttributeTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateBillAttributeTypeL11nCreate($request))) { - $response->set('attr_type_l11n_create', new FormValidation($val)); + $response->data['attr_type_l11n_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -206,7 +206,7 @@ final class ApiAttributeController extends Controller public function apiBillAttributeTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateBillAttributeTypeCreate($request))) { - $response->set('attr_type_create', new FormValidation($val)); + $response->data['attr_type_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -277,7 +277,7 @@ final class ApiAttributeController extends Controller public function apiBillAttributeValueCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateBillAttributeValueCreate($request))) { - $response->set('attr_value_create', new FormValidation($val)); + $response->data['attr_value_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -362,7 +362,7 @@ final class ApiAttributeController extends Controller public function apiBillAttributeValueL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateBillAttributeValueL11nCreate($request))) { - $response->set('attr_value_l11n_create', new FormValidation($val)); + $response->data['attr_value_l11n_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; diff --git a/Controller/ApiBillController.php b/Controller/ApiBillController.php index ec23f4b..4b71d7a 100755 --- a/Controller/ApiBillController.php +++ b/Controller/ApiBillController.php @@ -76,7 +76,7 @@ final class ApiBillController extends Controller public function apiBillUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateBillUpdate($request))) { - $response->set($request->uri->__toString(), new FormValidation($val)); + $response->data[$request->uri->__toString()] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -144,7 +144,7 @@ final class ApiBillController extends Controller public function apiBillCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateBillCreate($request))) { - $response->set($request->uri->__toString(), new FormValidation($val)); + $response->data[$request->uri->__toString()] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -392,7 +392,7 @@ final class ApiBillController extends Controller public function apiMediaAddToBill(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateMediaAddToBill($request))) { - $response->set($request->uri->__toString(), new FormValidation($val)); + $response->data[$request->uri->__toString()] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -403,7 +403,7 @@ final class ApiBillController extends Controller $path = $this->createBillDir($bill); $uploaded = []; - if (!empty($uploadedFiles = $request->getFiles())) { + if (!empty($uploadedFiles = $request->files)) { $uploaded = $this->app->moduleManager->get('Media')->uploadFiles( names: [], fileNames: [], @@ -513,7 +513,7 @@ final class ApiBillController extends Controller private function validateMediaAddToBill(RequestAbstract $request) : array { $val = []; - if (($val['media'] = (!$request->hasData('media') && empty($request->getFiles()))) + if (($val['media'] = (!$request->hasData('media') && empty($request->files))) || ($val['bill'] = !$request->hasData('bill')) ) { return $val; @@ -538,7 +538,7 @@ final class ApiBillController extends Controller public function apiBillElementCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateBillElementCreate($request))) { - $response->set($request->uri->__toString(), new FormValidation($val)); + $response->data[$request->uri->__toString()] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -997,7 +997,7 @@ final class ApiBillController extends Controller public function apiNoteCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateNoteCreate($request))) { - $response->set('bill_note_create', new FormValidation($val)); + $response->data['bill_note_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; diff --git a/Controller/ApiBillTypeController.php b/Controller/ApiBillTypeController.php index fb8d9bb..e0beed4 100755 --- a/Controller/ApiBillTypeController.php +++ b/Controller/ApiBillTypeController.php @@ -55,7 +55,7 @@ final class ApiBillTypeController extends Controller public function apiBillTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateBillTypeCreate($request))) { - $response->set('bill_type_create', new FormValidation($val)); + $response->data['bill_type_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -132,7 +132,7 @@ final class ApiBillTypeController extends Controller public function apiBillTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateBillTypeL11nCreate($request))) { - $response->set('bill_type_l11n_create', new FormValidation($val)); + $response->data['bill_type_l11n_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; diff --git a/Controller/ApiPriceController.php b/Controller/ApiPriceController.php index ee84ec1..b917685 100755 --- a/Controller/ApiPriceController.php +++ b/Controller/ApiPriceController.php @@ -238,7 +238,7 @@ final class ApiPriceController extends Controller public function apiPriceCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validatePriceCreate($request))) { - $response->set('price_create', new FormValidation($val)); + $response->data['price_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; diff --git a/Controller/ApiPurchaseController.php b/Controller/ApiPurchaseController.php index e5cdbeb..2a6dc22 100755 --- a/Controller/ApiPurchaseController.php +++ b/Controller/ApiPurchaseController.php @@ -65,7 +65,7 @@ final class ApiPurchaseController extends Controller ->limit(1) ->execute(); - $files = $request->getFiles(); + $files = $request->files; foreach ($files as $file) { // Create default bill $billRequest = new HttpRequest(new HttpUri('')); diff --git a/Controller/ApiTaxController.php b/Controller/ApiTaxController.php index 828f7c7..f04ac3d 100755 --- a/Controller/ApiTaxController.php +++ b/Controller/ApiTaxController.php @@ -117,7 +117,7 @@ final class ApiTaxController extends Controller public function apiTaxCombinationCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateTaxCombinationCreate($request))) { - $response->set('tax_combination_create', new FormValidation($val)); + $response->data['tax_combination_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return;