use direct data access for response data

This commit is contained in:
Dennis Eichhorn 2023-05-30 03:42:47 +02:00
parent 89c7917c3f
commit d8c3edbdd6
4 changed files with 19 additions and 19 deletions

View File

@ -156,7 +156,7 @@ final class ApiController extends Controller
public function apiItemCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateItemCreate($request))) {
$response->set('item_create', new FormValidation($val));
$response->data['item_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -311,7 +311,7 @@ final class ApiController extends Controller
public function apiItemPriceCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateItemPriceCreate($request))) {
$response->set('item_create', new FormValidation($val));
$response->data['item_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -386,7 +386,7 @@ final class ApiController extends Controller
public function apiItemAttributeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateItemAttributeCreate($request))) {
$response->set('attribute_create', new FormValidation($val));
$response->data['attribute_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -464,7 +464,7 @@ final class ApiController extends Controller
public function apiItemAttributeUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateItemAttributeUpdate($request))) {
$response->set('attribute_update', new FormValidation($val));
$response->data['attribute_update'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -563,7 +563,7 @@ final class ApiController extends Controller
public function apiItemAttributeTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateItemAttributeTypeL11nCreate($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;
@ -632,7 +632,7 @@ final class ApiController extends Controller
public function apiItemAttributeTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateItemAttributeTypeCreate($request))) {
$response->set('attr_type_create', new FormValidation($val));
$response->data['attr_type_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -702,7 +702,7 @@ final class ApiController extends Controller
public function apiItemAttributeValueCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateItemAttributeValueCreate($request))) {
$response->set('attr_value_create', new FormValidation($val));
$response->data['attr_value_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -787,7 +787,7 @@ final class ApiController extends Controller
public function apiItemAttributeValueL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateItemAttributeValueL11nCreate($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;
@ -856,7 +856,7 @@ final class ApiController extends Controller
public function apiItemAttribute(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateItemAttributeValueL11nCreate($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 apiItemL11nTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateItemL11nTypeCreate($request))) {
$response->set('item_l11n_type_create', new FormValidation($val));
$response->data['item_l11n_type_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -947,7 +947,7 @@ final class ApiController extends Controller
public function apiItemRelationTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateItemRelationTypeCreate($request))) {
$response->set('item_relation_type_create', new FormValidation($val));
$response->data['item_relation_type_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -1010,7 +1010,7 @@ final class ApiController extends Controller
public function apiItemL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateItemL11nCreate($request))) {
$response->set('item_l11n_create', new FormValidation($val));
$response->data['item_l11n_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -1081,13 +1081,13 @@ final class ApiController extends Controller
public function apiFileCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateFileCreate($request))) {
$response->set('item_file_create', new FormValidation($val));
$response->data['item_file_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
}
$uploadedFiles = $request->getFiles();
$uploadedFiles = $request->files;
if (empty($uploadedFiles)) {
$response->header->status = RequestStatusCode::R_400;
@ -1173,7 +1173,7 @@ final class ApiController extends Controller
public function apiNoteCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateNoteCreate($request))) {
$response->set('item_note_create', new FormValidation($val));
$response->data['item_note_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;

View File

@ -26,7 +26,7 @@ $item = $this->getData('item');
$attribute = $item->getAttributes();
$notes = $item->getNotes();
$files = $item->getFiles();
$files = $item->files;
$itemImage = $this->getData('itemImage') ?? new NullMedia();
$newestInvoices = $this->getData('newestInvoices') ?? [];

View File

@ -24,7 +24,7 @@ $itemL11n = $item->getL11ns();
$Attribute = $item->getAttributes();
$notes = $item->getNotes();
$files = $item->getFiles();
$files = $item->files;
$newestInvoices = $this->getData('newestInvoices') ?? [];
$allInvoices = $this->getData('allInvoices') ?? [];

View File

@ -48,7 +48,7 @@ final class ItemTest extends \PHPUnit\Framework\TestCase
self::assertEquals('', $this->item->info);
self::assertEquals(ItemStatus::ACTIVE, $this->item->getStatus());
self::assertEquals([], $this->item->getNotes());
self::assertEquals([], $this->item->getFiles());
self::assertEquals([], $this->item->files);
self::assertEquals([], $this->item->getAttributes());
self::assertInstanceOf(BaseStringL11n::class, $this->item->getL11n(''));
self::assertInstanceOf('phpOMS\Localization\Money', $this->item->salesPrice);
@ -72,7 +72,7 @@ final class ItemTest extends \PHPUnit\Framework\TestCase
public function testFileInputOutput() : void
{
$this->item->addFile($temp = new Media());
self::assertCount(1, $this->item->getFiles());
self::assertCount(1, $this->item->files);
}
/**