From c01b4c051acb445897b685c9b4359e86fff888af Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 10 Sep 2023 18:58:34 +0000 Subject: [PATCH] update --- Admin/Installer.php | 2 +- Controller/ApiAttributeController.php | 8 ++++---- Controller/ApiController.php | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index 1841296..919525e 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -112,7 +112,7 @@ final class Installer extends InstallerAbstract /** @var \Modules\ItemManagement\Controller\ApiAttributeController $module2 */ $module2 = $app->moduleManager->getModuleInstance('ItemManagement', 'ApiAttribute'); - /** @var \Modules\Attribute\Models\Attribute\AttributeType[] $attributeTypes */ + /** @var \Modules\Attribute\Models\AttributeType[] $attributeTypes */ $attributeTypes = ItemAttributeTypeMapper::getAll()->with('defaults')->execute(); /** @var \phpOMS\Localization\BaseStringL11nType[] $l11nTypes */ diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php index c649c7d..46438e3 100644 --- a/Controller/ApiAttributeController.php +++ b/Controller/ApiAttributeController.php @@ -327,7 +327,7 @@ final class ApiAttributeController extends Controller return; } - /** @var \Modules\ItemManagement\Models\ItemAttributeTypeL11n $itemAttributeTypeL11n */ + /** @var BaseStringL11n $itemAttributeTypeL11n */ $itemAttributeTypeL11n = ItemAttributeTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); $this->deleteModel($request->header->account, $itemAttributeTypeL11n, ItemAttributeTypeL11nMapper::class, 'item_attribute_type_l11n', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $itemAttributeTypeL11n); @@ -387,7 +387,7 @@ final class ApiAttributeController extends Controller return; } - /** @var \Modules\ItemManagement\Models\ItemAttributeType $itemAttributeType */ + /** @var AttributeType $itemAttributeType */ $itemAttributeType = ItemAttributeTypeMapper::get()->where('id', (int) $request->getData('id'))->execute(); $this->deleteModel($request->header->account, $itemAttributeType, ItemAttributeTypeMapper::class, 'item_attribute_type', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $itemAttributeType); @@ -418,7 +418,7 @@ final class ApiAttributeController extends Controller /** @var AttributeValue $old */ $old = ItemAttributeValueMapper::get()->where('id', (int) $request->getData('id'))->execute(); - /** @var \Modules\Attribute\Models\Attribute $type */ + /** @var \Modules\Attribute\Models\Attribute $attr */ $attr = ItemAttributeMapper::get() ->with('type') ->where('id', $request->getDataInt('attribute') ?? 0) @@ -514,7 +514,7 @@ final class ApiAttributeController extends Controller return; } - /** @var \Modules\ItemManagement\Models\ItemAttributeValueL11n $itemAttributeValueL11n */ + /** @var BaseStringL11n $itemAttributeValueL11n */ $itemAttributeValueL11n = ItemAttributeValueL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); $this->deleteModel($request->header->account, $itemAttributeValueL11n, ItemAttributeValueL11nMapper::class, 'item_attribute_value_l11n', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $itemAttributeValueL11n); diff --git a/Controller/ApiController.php b/Controller/ApiController.php index f3c1473..aedfe62 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -374,8 +374,8 @@ final class ApiController extends Controller public function apiItemL11nUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { if (!empty($val = $this->validateItemL11nUpdate($request))) { - $response->data['l11n_update'] = new FormValidation($val); - $response->header->status = RequestStatusCode::R_400; + $response->data['l11n_update'] = new FormValidation($val); + $response->header->status = RequestStatusCode::R_400; return; } @@ -401,7 +401,7 @@ final class ApiController extends Controller */ private function updateItemL11nFromRequest(RequestAbstract $request, BaseStringL11n $l11n) : BaseStringL11n { - $l11n->content = $request->getDataString('description'); + $l11n->content = $request->getDataString('description') ?? ''; return $l11n; }