From 1c72898d44084a655c8f786368a5a800fa66d778 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 24 Sep 2023 02:17:50 +0000 Subject: [PATCH] fix tests --- Controller/BackendController.php | 10 +++++++++- Models/ItemMapper.php | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index a056511..fefc431 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -389,6 +389,7 @@ final class BackendController extends Controller ->where(ItemMapper::HAS_MANY['files']['self'], '=', $item->id) ->where(MediaTypeMapper::TABLE . '.' . MediaTypeMapper::getColumnByMember('name'), '=', 'item_profile_image'); + /** @var \Modules\Media\Models\Media $itemImage */ $itemImage = MediaMapper::get() ->with('types') ->where('id', $results) @@ -397,8 +398,8 @@ final class BackendController extends Controller $view->data['itemImage'] = $itemImage; - /** @var \Model\Setting $settings */ // @todo: this one should already be loaded in the backend application no????????? + /** @var \Model\Setting $settings */ $settings = $this->app->appSettings->get(null, [ SettingsEnum::DEFAULT_LOCALIZATION, ]); @@ -408,11 +409,13 @@ final class BackendController extends Controller $view->data['l11nView'] = new \Web\Backend\Views\L11nView($this->app->l11nManager, $request, $response); + /** @var \phpOMS\Localization\BaseStringL11nType[] $l11nTypes */ $l11nTypes = ItemL11nTypeMapper::getAll() ->execute(); $view->data['l11nTypes'] = $l11nTypes; + /** @var \phpOMS\Localization\BaseStringL11n[] $l11nValues */ $l11nValues = ItemL11nMapper::getAll() ->with('type') ->where('ref', $item->id) @@ -420,6 +423,7 @@ final class BackendController extends Controller $view->data['l11nValues'] = $l11nValues; + /** @var \Modules\Attribute\Models\AttributeType[] $attributeTypes */ $attributeTypes = ItemAttributeTypeMapper::getAll() ->with('l11n') ->where('l11n/language', $response->header->l11n->language) @@ -427,11 +431,13 @@ final class BackendController extends Controller $view->data['attributeTypes'] = $attributeTypes; + /** @var \Modules\Organization\Models\Unit[] $units */ $units = UnitMapper::getAll() ->execute(); $view->data['units'] = $units; + /** @var \Modules\Billing\Models\Price\Price[] $prices */ $prices = PriceMapper::getAll() ->where('item', $item->id) ->where('type', PriceType::SALES) @@ -440,6 +446,7 @@ final class BackendController extends Controller $view->data['prices'] = $prices; + /** @var \Modules\Auditor\Models\Audit[] $audits */ $audits = AuditMapper::getAll() ->where('type', StringUtils::intHash(ItemMapper::class)) ->where('module', 'ItemManagement') @@ -448,6 +455,7 @@ final class BackendController extends Controller $view->data['audits'] = $audits; + /** @var \Modules\Media\Models\Media[] $files */ $files = MediaMapper::getAll() ->with('types') ->join('id', ItemMapper::class, 'files') // id = media id, files = item relations diff --git a/Models/ItemMapper.php b/Models/ItemMapper.php index ae0a10e..6cb8edc 100755 --- a/Models/ItemMapper.php +++ b/Models/ItemMapper.php @@ -131,7 +131,7 @@ final class ItemMapper extends DataMapperFactory left join media_type on media_type_rel.media_type_rel_dst = media_type.media_type_id and media_type.media_type_name = 'item_profile_image' SQL; - $itemsResult = self::$db->con->query($query)->fetchAll(); + $itemsResult = self::$db->con->query($query)?->fetchAll() ?? []; $items = []; foreach ($itemsResult as $res) {