diff --git a/Application/Controller/Admin/ManufacturerInfoLongdesc.php b/Application/Controller/Admin/ManufacturerInfoLongdesc.php index 92f813b..b25cc39 100644 --- a/Application/Controller/Admin/ManufacturerInfoLongdesc.php +++ b/Application/Controller/Admin/ManufacturerInfoLongdesc.php @@ -17,11 +17,12 @@ declare(strict_types=1); namespace D3\ManufacturerInformation\Application\Controller\Admin; -use D3\ManufacturerInformation\Application\Model\Constants; use D3\ManufacturerInformation\Modules\Application\Model\D3ManufacturerLongDesc; +use Exception; use OxidEsales\Eshop\Application\Controller\Admin\AdminDetailsController; use OxidEsales\Eshop\Application\Model\Manufacturer; use OxidEsales\Eshop\Core\Registry; +use stdClass; class ManufacturerInfoLongdesc extends AdminDetailsController { @@ -33,12 +34,12 @@ class ManufacturerInfoLongdesc extends AdminDetailsController parent::render(); /** @var Manufacturer|D3ManufacturerLongDesc $oManufacturer */ - $this->_aViewData['edit'] = $oManufacturer = oxNew(\OxidEsales\Eshop\Application\Model\Manufacturer::class); + $this->_aViewData['edit'] = $oManufacturer = oxNew(Manufacturer::class); $sOXID = $this->_aViewData["oxid"] = $this->getEditObjectId(); if (isset($sOXID) && $sOXID != "-1") { // load object - $d3manufacturerlang = \OxidEsales\Eshop\Core\Registry::getRequest()->getRequestEscapedParameter("catlang"); + $d3manufacturerlang = Registry::getRequest()->getRequestEscapedParameter("catlang"); if (!isset($d3manufacturerlang)) { $d3manufacturerlang = $this->_iEditLang; @@ -53,8 +54,8 @@ class ManufacturerInfoLongdesc extends AdminDetailsController $this->_aViewData['readonly'] = true; } - foreach (\OxidEsales\Eshop\Core\Registry::getLang()->getLanguageNames() as $id => $language) { - $oLang = new \stdClass(); + foreach (Registry::getLang()->getLanguageNames() as $id => $language) { + $oLang = new stdClass(); $oLang->sLangDesc = $language; $oLang->selected = ($id == $this->_iEditLang); $this->_aViewData["otherlang"][$id] = clone $oLang; @@ -68,13 +69,13 @@ class ManufacturerInfoLongdesc extends AdminDetailsController /** * @return void - * @throws \Exception + * @throws Exception */ - public function save() + public function save(): void { parent::save(); - $iManufacturerLang = intval(\OxidEsales\Eshop\Core\Registry::getRequest()->getRequestEscapedParameter("catlang")); + $iManufacturerLang = intval(Registry::getRequest()->getRequestEscapedParameter("catlang")); $sOXID = $this->getEditObjectId(); $this->setEditObjectId($sOXID); @@ -115,7 +116,7 @@ class ManufacturerInfoLongdesc extends AdminDetailsController * * @return mixed */ - protected function processLongDesc($sValue) + protected function processLongDesc($sValue): mixed { $aSearch = [' ', '&', '"', '&lang=', '
', '
']; $aReplace = [' ', '&', '"', '&lang=', '', '']; diff --git a/Application/views/admin_smarty/de/d3manufacturerinformation_lang.php b/Application/views/admin_smarty/de/d3manufacturerinformation_lang.php index 15ce7e0..8b48433 100644 --- a/Application/views/admin_smarty/de/d3manufacturerinformation_lang.php +++ b/Application/views/admin_smarty/de/d3manufacturerinformation_lang.php @@ -18,10 +18,10 @@ $sLangName = "Deutsch"; // RESOURCE IDENTITFIER = STRING // ------------------------------- $aLang = [ - 'charset' => 'UTF-8', + 'charset' => 'UTF-8', - 'mxd3manufacturerinfolongdesc' => 'Langtext', - 'SHOP_MODULE_GROUP_d3manufacturerinformation_main' => 'Einstellungen', - 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage' => 'vorhandene Herstellertexte auf Artikeldetails als Tab anzeigen', - 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnManufacturerPage' => 'Herstellertexte auf Herstellerseite anzeigen', + 'mxd3manufacturerinfolongdesc' => 'Langtext', + 'SHOP_MODULE_GROUP_d3manufacturerinformation_main' => 'Einstellungen', + 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage' => 'vorhandene Herstellertexte auf Artikeldetails als Tab anzeigen', + 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnManufacturerPage' => 'Herstellertexte auf Herstellerseite anzeigen', ]; diff --git a/Application/views/admin_smarty/en/d3manufacturerinformation_lang.php b/Application/views/admin_smarty/en/d3manufacturerinformation_lang.php index f898b05..a636020 100644 --- a/Application/views/admin_smarty/en/d3manufacturerinformation_lang.php +++ b/Application/views/admin_smarty/en/d3manufacturerinformation_lang.php @@ -18,10 +18,10 @@ $sLangName = "Deutsch"; // RESOURCE IDENTITFIER = STRING // ------------------------------- $aLang = [ - 'charset' => 'UTF-8', + 'charset' => 'UTF-8', - 'mxd3manufacturerinfolongdesc' => 'Text', - 'SHOP_MODULE_GROUP_d3manufacturerinformation_main' => 'Settings', - 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage' => 'show existing manufacturer texts on item details page as a tab', - 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnManufacturerPage' => 'show manufacturer texts on manufacturer page', + 'mxd3manufacturerinfolongdesc' => 'Text', + 'SHOP_MODULE_GROUP_d3manufacturerinformation_main' => 'Settings', + 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage' => 'show existing manufacturer texts on item details page as a tab', + 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnManufacturerPage' => 'show manufacturer texts on manufacturer page', ]; diff --git a/Application/views/admin_twig/de/d3manufacturerinformation_lang.php b/Application/views/admin_twig/de/d3manufacturerinformation_lang.php index c8346fe..ad6269e 100644 --- a/Application/views/admin_twig/de/d3manufacturerinformation_lang.php +++ b/Application/views/admin_twig/de/d3manufacturerinformation_lang.php @@ -18,10 +18,10 @@ $sLangName = "Deutsch"; // RESOURCE IDENTITFIER = STRING // ------------------------------- $aLang = [ - 'charset' => 'UTF-8', + 'charset' => 'UTF-8', - 'mxd3manufacturerinfolongdesc' => 'Langtext', - 'SHOP_MODULE_GROUP_d3manufacturerinformation_main' => 'Einstellungen', - 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage' => 'vorhandene Herstellertexte auf Artikeldetails als Tab anzeigen', - 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnManufacturerPage' => 'Herstellertexte auf Herstellerseite anzeigen', + 'mxd3manufacturerinfolongdesc' => 'Langtext', + 'SHOP_MODULE_GROUP_d3manufacturerinformation_main' => 'Einstellungen', + 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage' => 'vorhandene Herstellertexte auf Artikeldetails als Tab anzeigen', + 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnManufacturerPage' => 'Herstellertexte auf Herstellerseite anzeigen', ]; diff --git a/Application/views/admin_twig/en/d3manufacturerinformation_lang.php b/Application/views/admin_twig/en/d3manufacturerinformation_lang.php index 9fccdbd..dcd4a5d 100644 --- a/Application/views/admin_twig/en/d3manufacturerinformation_lang.php +++ b/Application/views/admin_twig/en/d3manufacturerinformation_lang.php @@ -18,10 +18,10 @@ $sLangName = "Deutsch"; // RESOURCE IDENTITFIER = STRING // ------------------------------- $aLang = [ - 'charset' => 'UTF-8', + 'charset' => 'UTF-8', - 'mxd3manufacturerinfolongdesc' => 'Text', - 'SHOP_MODULE_GROUP_d3manufacturerinformation_main' => 'Settings', - 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage' => 'display existing manufacturer texts on item details as a tab', - 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnManufacturerPage' => 'show manufacturer texts on manufacturer page', + 'mxd3manufacturerinfolongdesc' => 'Text', + 'SHOP_MODULE_GROUP_d3manufacturerinformation_main' => 'Settings', + 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage' => 'display existing manufacturer texts on item details as a tab', + 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnManufacturerPage' => 'show manufacturer texts on manufacturer page', ]; diff --git a/Modules/Application/Model/D3ManufacturerLongDesc.php b/Modules/Application/Model/D3ManufacturerLongDesc.php index a33afcb..143197f 100644 --- a/Modules/Application/Model/D3ManufacturerLongDesc.php +++ b/Modules/Application/Model/D3ManufacturerLongDesc.php @@ -18,7 +18,6 @@ declare(strict_types=1); namespace D3\ManufacturerInformation\Modules\Application\Model; use D3\ManufacturerInformation\Application\Model\Constants; -use OxidEsales\Eshop\Application\Model\Manufacturer; use OxidEsales\Eshop\Core\Field; use OxidEsales\Eshop\Core\Registry; diff --git a/Modules/Application/Model/ManufacturerInfoList.php b/Modules/Application/Model/ManufacturerInfoList.php index 1302b11..68b73d8 100644 --- a/Modules/Application/Model/ManufacturerInfoList.php +++ b/Modules/Application/Model/ManufacturerInfoList.php @@ -33,7 +33,7 @@ class ManufacturerInfoList extends ManufacturerInfoList_parent * @param Manufacturer|D3ManufacturerLongDesc $oManufacturer * @return void */ - protected function addCategoryFields($oManufacturer) + protected function addCategoryFields($oManufacturer): void { parent::addCategoryFields($oManufacturer);