diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 1e1b428..bee7dde 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -106,7 +106,7 @@ final class ApiController extends Controller public function apiClientCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateClientCreate($request))) { - $response->set('client_create', new FormValidation($val)); + $response->data['client_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -283,7 +283,7 @@ final class ApiController extends Controller public function apiMainAddressUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateMainAddressUpdate($request))) { - $response->set('client_main_address', new FormValidation($val)); + $response->data['client_main_address'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -377,7 +377,7 @@ final class ApiController extends Controller public function apiClientL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateClientL11nCreate($request))) { - $response->set('client_l11n_create', new FormValidation($val)); + $response->data['client_l11n_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -448,7 +448,7 @@ final class ApiController extends Controller public function apiClientL11nTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateClientL11nTypeCreate($request))) { - $response->set('client_l11n_type_create', new FormValidation($val)); + $response->data['client_l11n_type_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -512,7 +512,7 @@ final class ApiController extends Controller public function apiClientAttributeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateClientAttributeCreate($request))) { - $response->set('attribute_create', new FormValidation($val)); + $response->data['attribute_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -590,7 +590,7 @@ final class ApiController extends Controller public function apiClientAttributeTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateClientAttributeTypeL11nCreate($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; @@ -659,7 +659,7 @@ final class ApiController extends Controller public function apiClientAttributeTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateClientAttributeTypeCreate($request))) { - $response->set('attr_type_create', new FormValidation($val)); + $response->data['attr_type_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -730,7 +730,7 @@ final class ApiController extends Controller public function apiClientAttributeValueCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateClientAttributeValueCreate($request))) { - $response->set('attr_value_create', new FormValidation($val)); + $response->data['attr_value_create'] = new FormValidation($val); $response->header->status = RequestStatusCode::R_400; return; @@ -815,7 +815,7 @@ final class ApiController extends Controller public function apiClientAttributeValueL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateClientAttributeValueL11nCreate($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; @@ -883,7 +883,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, 'Client', 'Invalid file', $uploadedFiles); diff --git a/Theme/Backend/client-profile.tpl.php b/Theme/Backend/client-profile.tpl.php index 925adc2..3b76126 100755 --- a/Theme/Backend/client-profile.tpl.php +++ b/Theme/Backend/client-profile.tpl.php @@ -24,7 +24,7 @@ $countries = \phpOMS\Localization\ISO3166NameEnum::getConstants(); */ $client = $this->getData('client'); $notes = $client->getNotes(); -$files = $client->getFiles(); +$files = $client->files; $clientImage = $this->getData('clientImage') ?? new NullMedia(); diff --git a/tests/Models/ClientTest.php b/tests/Models/ClientTest.php index 8aede53..723e524 100755 --- a/tests/Models/ClientTest.php +++ b/tests/Models/ClientTest.php @@ -48,7 +48,7 @@ final class ClientTest extends \PHPUnit\Framework\TestCase self::assertEquals(ClientStatus::ACTIVE, $this->client->getStatus()); self::assertEquals(0, $this->client->getType()); self::assertEquals([], $this->client->getNotes()); - self::assertEquals([], $this->client->getFiles()); + self::assertEquals([], $this->client->files); self::assertEquals([], $this->client->getAddresses()); self::assertEquals([], $this->client->getContactElements()); self::assertEquals((new \DateTime('now'))->format('Y-m-d'), $this->client->createdAt->format('Y-m-d')); @@ -84,7 +84,7 @@ final class ClientTest extends \PHPUnit\Framework\TestCase public function testFileInputOutput() : void { $this->client->addFile($temp = new Media()); - self::assertCount(1, $this->client->getFiles()); + self::assertCount(1, $this->client->files); } /**