From 1086f9bd9af0c3c54f86bcdc635eac49d62e9b84 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 03:42:51 +0200 Subject: [PATCH] use direct data access for response data --- Controller/ApiController.php | 18 +++++++++--------- Theme/Backend/supplier-profile.tpl.php | 2 +- tests/Models/SupplierTest.php | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 2ca5450..65713b8 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -68,7 +68,7 @@ final class ApiController extends Controller public function apiSupplierCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateSupplierCreate($request))) { - $response->set('supplier_create', new FormValidation($val)); + $response->data['supplier_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -148,7 +148,7 @@ final class ApiController extends Controller public function apiSupplierL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateSupplierL11nCreate($request))) { - $response->set('supplier_l11n_create', new FormValidation($val)); + $response->data['supplier_l11n_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -219,7 +219,7 @@ final class ApiController extends Controller public function apiSupplierL11nTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateSupplierL11nTypeCreate($request))) { - $response->set('supplier_l11n_type_create', new FormValidation($val)); + $response->data['supplier_l11n_type_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -283,7 +283,7 @@ final class ApiController extends Controller public function apiSupplierAttributeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateSupplierAttributeCreate($request))) { - $response->set('attribute_create', new FormValidation($val)); + $response->data['attribute_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -351,7 +351,7 @@ final class ApiController extends Controller public function apiSupplierAttributeTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateSupplierAttributeTypeL11nCreate($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; @@ -420,7 +420,7 @@ final class ApiController extends Controller public function apiSupplierAttributeTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateSupplierAttributeTypeCreate($request))) { - $response->set('attr_type_create', new FormValidation($val)); + $response->data['attr_type_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -491,7 +491,7 @@ final class ApiController extends Controller public function apiSupplierAttributeValueCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateSupplierAttributeValueCreate($request))) { - $response->set('attr_value_create', new FormValidation($val)); + $response->data['attr_value_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -576,7 +576,7 @@ final class ApiController extends Controller public function apiSupplierAttributeValueL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateSupplierAttributeValueL11nCreate($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; @@ -644,7 +644,7 @@ final class ApiController extends Controller */ public function apiFileCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { - $uploadedFiles = $request->getFiles(); + $uploadedFiles = $request->files; if (empty($uploadedFiles)) { $this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Item', 'Invalid supplier image', $uploadedFiles); diff --git a/Theme/Backend/supplier-profile.tpl.php b/Theme/Backend/supplier-profile.tpl.php index 4d91b83..85c66c6 100755 --- a/Theme/Backend/supplier-profile.tpl.php +++ b/Theme/Backend/supplier-profile.tpl.php @@ -23,7 +23,7 @@ $countries = \phpOMS\Localization\ISO3166NameEnum::getConstants(); */ $supplier = $this->getData('supplier'); $notes = $supplier->getNotes(); -$files = $supplier->getFiles(); +$files = $supplier->files; $newestInvoices = $this->getData('newestInvoices') ?? []; $monthlyPurchaseCosts = $this->getData('monthlyPurchaseCosts') ?? []; diff --git a/tests/Models/SupplierTest.php b/tests/Models/SupplierTest.php index 52f28a6..8fc4cb7 100755 --- a/tests/Models/SupplierTest.php +++ b/tests/Models/SupplierTest.php @@ -48,7 +48,7 @@ final class SupplierTest extends \PHPUnit\Framework\TestCase self::assertEquals(SupplierStatus::ACTIVE, $this->supplier->getStatus()); self::assertEquals(0, $this->supplier->getType()); self::assertEquals([], $this->supplier->getNotes()); - self::assertEquals([], $this->supplier->getFiles()); + self::assertEquals([], $this->supplier->files); self::assertEquals([], $this->supplier->getAddresses()); self::assertEquals([], $this->supplier->getContactElements()); self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->supplier->createdAt->format('Y-m-d')); @@ -84,7 +84,7 @@ final class SupplierTest extends \PHPUnit\Framework\TestCase public function testFileInputOutput() : void { $this->supplier->addFile($temp = new Media()); - self::assertCount(1, $this->supplier->getFiles()); + self::assertCount(1, $this->supplier->files); } /**