From c41acd48320458c0857953cfc4e3ecb6b6e55e56 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 7 Jan 2023 19:00:32 +0100 Subject: [PATCH] l11n, unit/app and simplification fixes --- Controller/ApiController.php | 10 +++++----- Interfaces/GSD/Importer.php | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index bda8469..f6dd3ae 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -116,11 +116,11 @@ final class ApiController extends Controller if (!empty($request->getData('dbtype'))) { $remoteConnection = ConnectionFactory::create([ 'db' => (string) $request->getData('dbtype'), - 'host' => $request->hasData('dbhost') ? (string) $request->getData('dbhost') : null, - 'port' => $request->hasData('dbport') ? (int) $request->getData('dbport') : null, - 'database' => $request->hasData('dbdatabase') ? (string) $request->getData('dbdatabase') : null, - 'login' => $request->hasData('dblogin') ? (string) $request->getData('dblogin') : null, - 'password' => $request->hasData('dbpassword') ? (string) $request->getData('dbpassword') : null, + 'host' => $request->getData('dbhost', 'string'), + 'port' => $request->getData('dbport', 'int'), + 'database' => $request->getData('dbdatabase', 'string'), + 'login' => $request->getData('dblogin', 'string'), + 'password' => $request->getData('dbpassword', 'string'), ]); } diff --git a/Interfaces/GSD/Importer.php b/Interfaces/GSD/Importer.php index 8f12d56..cf1c9e0 100755 --- a/Interfaces/GSD/Importer.php +++ b/Interfaces/GSD/Importer.php @@ -36,7 +36,7 @@ use Modules\Exchange\Interfaces\GSD\Model\GSDSupplierMapper; use Modules\Exchange\Models\ImporterAbstract; use Modules\ItemManagement\Models\Item; use Modules\ItemManagement\Models\ItemAttributeType; -use Modules\ItemManagement\Models\ItemAttributeTypeL11n; +use phpOMS\Localization\BaseStringL11n; use Modules\ItemManagement\Models\ItemAttributeTypeL11nMapper; use Modules\ItemManagement\Models\ItemAttributeTypeMapper; use Modules\ItemManagement\Models\ItemAttributeValue; @@ -548,40 +548,40 @@ final class Importer extends ImporterAbstract $itemAttrType['tradegroup'] = new ItemAttributeType('tradegroup'); ItemAttributeTypeMapper::create()->execute($itemAttrType['tradegroup']); - ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['tradegroup']->getId(), 'Trade Group', ISO639x1Enum::_EN)); - ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['tradegroup']->getId(), 'Handelsgruppe', ISO639x1Enum::_DE)); + ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['tradegroup']->getId(), 'Trade Group', ISO639x1Enum::_EN)); + ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['tradegroup']->getId(), 'Handelsgruppe', ISO639x1Enum::_DE)); } if (($itemAttrType['exportcontrolgroup'] = ItemAttributeTypeMapper::get()->where('name', 'exportcontrolgroup')->execute()) instanceof NullItemAttributeType) { $itemAttrType['exportcontrolgroup'] = new ItemAttributeType('exportcontrolgroup'); ItemAttributeTypeMapper::create()->execute($itemAttrType['exportcontrolgroup']); - ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['exportcontrolgroup']->getId(), 'Export Control Group', ISO639x1Enum::_EN)); - ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['exportcontrolgroup']->getId(), 'Exportkontrollgruppe', ISO639x1Enum::_DE)); + ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['exportcontrolgroup']->getId(), 'Export Control Group', ISO639x1Enum::_EN)); + ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['exportcontrolgroup']->getId(), 'Exportkontrollgruppe', ISO639x1Enum::_DE)); } if (($itemAttrType['medicalgroup'] = ItemAttributeTypeMapper::get()->where('name', 'medicalgroup')->execute()) instanceof NullItemAttributeType) { $itemAttrType['medicalgroup'] = new ItemAttributeType('medicalgroup'); ItemAttributeTypeMapper::create()->execute($itemAttrType['medicalgroup']); - ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['medicalgroup']->getId(), 'Medical Device Group', ISO639x1Enum::_EN)); - ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['medicalgroup']->getId(), 'Medezinproduktklasse', ISO639x1Enum::_DE)); + ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['medicalgroup']->getId(), 'Medical Device Group', ISO639x1Enum::_EN)); + ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['medicalgroup']->getId(), 'Medezinproduktklasse', ISO639x1Enum::_DE)); } if (($itemAttrType['customsnumber'] = ItemAttributeTypeMapper::get()->where('name', 'customsnumber')->execute()) instanceof NullItemAttributeType) { $itemAttrType['customsnumber'] = new ItemAttributeType('customsnumber'); ItemAttributeTypeMapper::create()->execute($itemAttrType['customsnumber']); - ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['customsnumber']->getId(), 'Customs Number', ISO639x1Enum::_EN)); - ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['customsnumber']->getId(), 'Zolltarifnummer', ISO639x1Enum::_DE)); + ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['customsnumber']->getId(), 'Customs Number', ISO639x1Enum::_EN)); + ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['customsnumber']->getId(), 'Zolltarifnummer', ISO639x1Enum::_DE)); } if (($itemAttrType['unnumber'] = ItemAttributeTypeMapper::get()->where('name', 'unnumber')->execute()) instanceof NullItemAttributeType) { $itemAttrType['unnumber'] = new ItemAttributeType('unnumber'); ItemAttributeTypeMapper::create()->execute($itemAttrType['unnumber']); - ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['unnumber']->getId(), 'UN-Number', ISO639x1Enum::_EN)); - ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['unnumber']->getId(), 'UN-Nummer', ISO639x1Enum::_DE)); + ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['unnumber']->getId(), 'UN-Number', ISO639x1Enum::_EN)); + ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['unnumber']->getId(), 'UN-Nummer', ISO639x1Enum::_DE)); } return $itemAttrType;