diff --git a/CHANGELOG-8.0.md b/CHANGELOG-8.0.md index 7dfee0659b..fc49319694 100644 --- a/CHANGELOG-8.0.md +++ b/CHANGELOG-8.0.md @@ -9,20 +9,20 @@ - Registration of environment variables via Symfony Dotenv Component - Bootstrap parameters have been moved from config.inc.php to environment and container parameters - Container parameters - - `oxid_debug_mode` - - `oxid_smtp_debug_mode` - - `oxid_multilingual_tables` - - `oxid_skip_database_views_usage` - - `oxid_multi_shop_article_fields` - - `oxid_show_update_views_button` - - `oxid_shop_url` - - `oxid_shop_admin_url` - - `oxid_multi_shop_tables` - - `oxid_basket_reservation_cleanup_rate` - - `oxid_cron_enabled` - - `oxid_user_rights_roles_mode` - - `oxid_seo_mode` - - `oxid_shop_credit_rating` + - `oxid_esales.debug_mode` + - `oxid_esales.smtp_debug_mode` + - `oxid_esales.multilingual_tables` + - `oxid_esales.skip_database_views_usage` + - `oxid_esales.multi_shop_article_fields` + - `oxid_esales.show_update_views_button` + - `oxid_esales.shop_url` + - `oxid_esales.shop_admin_url` + - `oxid_esales.multi_shop_tables` + - `oxid_esales.basket_reservation_cleanup_rate` + - `oxid_esales.cron_enabled` + - `oxid_esales.user_rights_roles_mode` + - `oxid_esales.seo_mode` + - `oxid_esales.shop_credit_rating` - Interface for storing Symfony Service Container parameters in configuration ### Changed diff --git a/source/Application/Component/BasketComponent.php b/source/Application/Component/BasketComponent.php index 0c5dbc1cca..76448ea607 100644 --- a/source/Application/Component/BasketComponent.php +++ b/source/Application/Component/BasketComponent.php @@ -73,7 +73,7 @@ public function init() } } $basketReservations->discardUnusedReservations( - ContainerFacade::getParameter('oxid_basket_reservation_cleanup_rate') + ContainerFacade::getParameter('oxid_esales.basket_reservation_cleanup_rate') ); } } diff --git a/source/Application/Component/UserComponent.php b/source/Application/Component/UserComponent.php index 7f70587693..9c01cba44d 100644 --- a/source/Application/Component/UserComponent.php +++ b/source/Application/Component/UserComponent.php @@ -351,7 +351,7 @@ public function logout() } // redirecting if user logs out in SSL mode - if (Registry::getRequest()->getRequestEscapedParameter('redirect') && ContainerFacade::getParameter('oxid_shop_url')) { + if (Registry::getRequest()->getRequestEscapedParameter('redirect') && ContainerFacade::getParameter('oxid_esales.shop_url')) { Registry::getUtils()->redirect($this->getLogoutLink()); } } diff --git a/source/Application/Component/Widget/ArticleDetails.php b/source/Application/Component/Widget/ArticleDetails.php index 4370bb608a..2cb34f1d84 100644 --- a/source/Application/Component/Widget/ArticleDetails.php +++ b/source/Application/Component/Widget/ArticleDetails.php @@ -943,8 +943,8 @@ public function render() $config = Registry::getConfig(); $this->_aViewData['preview'] = Registry::getRequest()->getRequestEscapedParameter('preview'); - $this->_aViewData['altImageUrl'] = ContainerFacade::getParameter('oxid_alternative_image_url'); - $this->_aViewData['SSLAltImageUrl'] = ContainerFacade::getParameter('oxid_alternative_image_url'); + $this->_aViewData['altImageUrl'] = ContainerFacade::getParameter('oxid_esales.alternative_image_url'); + $this->_aViewData['SSLAltImageUrl'] = ContainerFacade::getParameter('oxid_esales.alternative_image_url'); return $this->_sThisTemplate; } diff --git a/source/Application/Controller/Admin/ActionsMain.php b/source/Application/Controller/Admin/ActionsMain.php index 8ea0fe71a6..c4a9001be4 100644 --- a/source/Application/Controller/Admin/ActionsMain.php +++ b/source/Application/Controller/Admin/ActionsMain.php @@ -55,7 +55,7 @@ public function render() } if ($this->getViewConfig()->isAltImageServerConfigured()) { - $this->_aViewData["imageUrl"] = ContainerFacade::getParameter('oxid_alternative_image_url'); + $this->_aViewData["imageUrl"] = ContainerFacade::getParameter('oxid_esales.alternative_image_url'); } if (Registry::getRequest()->getRequestEscapedParameter("aoc")) { diff --git a/source/Application/Controller/Admin/AdminController.php b/source/Application/Controller/Admin/AdminController.php index d287508557..44e6e3e493 100644 --- a/source/Application/Controller/Admin/AdminController.php +++ b/source/Application/Controller/Admin/AdminController.php @@ -167,10 +167,10 @@ public function addGlobalParams($oShop = null) $oShop = parent::addGlobalParams($oShop); - if (ContainerFacade::getParameter('oxid_shop_admin_url')) { - $url = ContainerFacade::getParameter('oxid_shop_admin_url'); + if (ContainerFacade::getParameter('oxid_esales.shop_admin_url')) { + $url = ContainerFacade::getParameter('oxid_esales.shop_admin_url'); } else { - $url = ContainerFacade::getParameter('oxid_shop_url') . + $url = ContainerFacade::getParameter('oxid_esales.shop_url') . $myConfig->getConfigParam('sAdminDir') . "/"; } diff --git a/source/Application/Controller/Admin/AdminDetailsController.php b/source/Application/Controller/Admin/AdminDetailsController.php index 444424283a..8e5a878ebe 100644 --- a/source/Application/Controller/Admin/AdminDetailsController.php +++ b/source/Application/Controller/Admin/AdminDetailsController.php @@ -24,12 +24,12 @@ public function render() // generate help link $myConfig = Registry::getConfig(); $sDir = Path::join( - ContainerFacade::getParameter('oxid_shop_source_directory'), + ContainerFacade::getParameter('oxid_esales.shop_source_directory'), 'documentation', 'admin' ); if (is_dir($sDir)) { - $sDir = ContainerFacade::getParameter('oxid_shop_url') . 'documentation/admin'; + $sDir = ContainerFacade::getParameter('oxid_esales.shop_url') . 'documentation/admin'; } else { $languageId = $this->getDocumentationLanguageId(); $shopVersion = oxNew(ShopVersion::class)->getVersion(); diff --git a/source/Application/Controller/Admin/ArticlePictures.php b/source/Application/Controller/Admin/ArticlePictures.php index 22cd34d4b4..55dddcb10a 100644 --- a/source/Application/Controller/Admin/ArticlePictures.php +++ b/source/Application/Controller/Admin/ArticlePictures.php @@ -45,10 +45,10 @@ public function render() } } - $this->_aViewData["iPicCount"] = ContainerFacade::getParameter('oxid_max_product_picture_count'); + $this->_aViewData["iPicCount"] = ContainerFacade::getParameter('oxid_esales.max_product_picture_count'); if ($this->getViewConfig()->isAltImageServerConfigured()) { - $this->_aViewData["imageUrl"] = ContainerFacade::getParameter('oxid_alternative_image_url'); + $this->_aViewData["imageUrl"] = ContainerFacade::getParameter('oxid_esales.alternative_image_url'); } return "article_pictures"; diff --git a/source/Application/Controller/Admin/CategoryMain.php b/source/Application/Controller/Admin/CategoryMain.php index dd155af27e..9ffd152b2c 100644 --- a/source/Application/Controller/Admin/CategoryMain.php +++ b/source/Application/Controller/Admin/CategoryMain.php @@ -85,7 +85,7 @@ public function render() $this->_aViewData["sortableFields"] = $this->getSortableFields(); if ($this->getViewConfig()->isAltImageServerConfigured()) { - $this->_aViewData["imageUrl"] = ContainerFacade::getParameter('oxid_alternative_image_url'); + $this->_aViewData["imageUrl"] = ContainerFacade::getParameter('oxid_esales.alternative_image_url'); } if (Registry::getRequest()->getRequestEscapedParameter("aoc")) { diff --git a/source/Application/Controller/Admin/DiagnosticsMain.php b/source/Application/Controller/Admin/DiagnosticsMain.php index 8b469b2bda..242a8f0e6d 100644 --- a/source/Application/Controller/Admin/DiagnosticsMain.php +++ b/source/Application/Controller/Admin/DiagnosticsMain.php @@ -89,7 +89,7 @@ public function __construct() { parent::__construct(); - $this->_sShopDir = ContainerFacade::getParameter('oxid_shop_source_directory'); + $this->_sShopDir = ContainerFacade::getParameter('oxid_esales.shop_source_directory'); $this->_oOutput = oxNew(\OxidEsales\Eshop\Application\Model\DiagnosticsOutput::class); } @@ -132,7 +132,7 @@ protected function runBasicDiagnostics() $aViewData = []; $oDiagnostics = oxNew(\OxidEsales\Eshop\Application\Model\Diagnostics::class); - $oDiagnostics->setShopLink(ContainerFacade::getParameter('oxid_shop_url')); + $oDiagnostics->setShopLink(ContainerFacade::getParameter('oxid_esales.shop_url')); $oDiagnostics->setEdition(Registry::getConfig()->getFullEdition()); $oDiagnostics->setVersion( oxNew(\OxidEsales\Eshop\Core\ShopVersion::class)->getVersion() diff --git a/source/Application/Controller/Admin/DiscountItemAjax.php b/source/Application/Controller/Admin/DiscountItemAjax.php index 1d2675f990..d25807af52 100644 --- a/source/Application/Controller/Admin/DiscountItemAjax.php +++ b/source/Application/Controller/Admin/DiscountItemAjax.php @@ -187,7 +187,7 @@ private function getQueryForIdentifierColumns(): string private function getLanguageSuffix(): string { - return ContainerFacade::getParameter('oxid_skip_database_views_usage') + return ContainerFacade::getParameter('oxid_esales.skip_database_views_usage') ? Registry::getLang()->getLanguageTag() : ''; } diff --git a/source/Application/Controller/Admin/DynamicExportBaseController.php b/source/Application/Controller/Admin/DynamicExportBaseController.php index 3af56b4524..fa9b267176 100644 --- a/source/Application/Controller/Admin/DynamicExportBaseController.php +++ b/source/Application/Controller/Admin/DynamicExportBaseController.php @@ -123,7 +123,7 @@ public function __construct() // set generic frame template $this->_sFilePath = Path::join( - ContainerFacade::getParameter('oxid_shop_source_directory'), + ContainerFacade::getParameter('oxid_esales.shop_source_directory'), $this->sExportPath, "$this->sExportFileName.$this->sExportFileType" ); @@ -148,7 +148,7 @@ public function render() $this->_aViewData['sOutputFile'] = $this->_sFilePath; $this->_aViewData['sDownloadFile'] = Path::join( - ContainerFacade::getParameter('oxid_shop_url'), + ContainerFacade::getParameter('oxid_esales.shop_url'), $this->sExportPath, "$this->sExportFileName.$this->sExportFileType" ); diff --git a/source/Application/Controller/Admin/GenericImportMain.php b/source/Application/Controller/Admin/GenericImportMain.php index 160a173dde..ddc4873327 100644 --- a/source/Application/Controller/Admin/GenericImportMain.php +++ b/source/Application/Controller/Admin/GenericImportMain.php @@ -289,7 +289,7 @@ protected function getUploadedCsvFilePath() $aFile = $oConfig->getUploadedFile('csvfile'); if (isset($aFile['name']) && $aFile['name']) { $this->_sCsvFilePath = Path::join( - ContainerFacade::getParameter('oxid_build_directory'), + ContainerFacade::getParameter('oxid_esales.build_directory'), basename($aFile['tmp_name']) ); move_uploaded_file($aFile['tmp_name'], $this->_sCsvFilePath); diff --git a/source/Application/Controller/Admin/ListComponentAjax.php b/source/Application/Controller/Admin/ListComponentAjax.php index 05dea64ce9..8f50b0e03a 100644 --- a/source/Application/Controller/Admin/ListComponentAjax.php +++ b/source/Application/Controller/Admin/ListComponentAjax.php @@ -538,7 +538,7 @@ protected function getData($sCountQ, $sQ) $aResponse['sort'] = '_' . $this->getSortCol(); $aResponse['dir'] = $this->getSortDir(); - $debug = ContainerFacade::getParameter('oxid_debug_mode'); + $debug = ContainerFacade::getParameter('oxid_esales.debug_mode'); if ($debug) { $aResponse['countsql'] = $sCountQ; } diff --git a/source/Application/Controller/Admin/LoginController.php b/source/Application/Controller/Admin/LoginController.php index 7ffcec33db..67765bbf29 100644 --- a/source/Application/Controller/Admin/LoginController.php +++ b/source/Application/Controller/Admin/LoginController.php @@ -44,7 +44,7 @@ public function render() // automatically redirect to SSL login if (!$myConfig->isSsl()) { - $adminUrl = ContainerFacade::getParameter('oxid_shop_admin_url'); + $adminUrl = ContainerFacade::getParameter('oxid_esales.shop_admin_url'); if ($adminUrl && str_starts_with($adminUrl, 'https://')) { Registry::getUtils()->redirect($adminUrl, false, 302); } diff --git a/source/Application/Controller/Admin/ManufacturerMain.php b/source/Application/Controller/Admin/ManufacturerMain.php index 572333ec8f..733aa944c8 100644 --- a/source/Application/Controller/Admin/ManufacturerMain.php +++ b/source/Application/Controller/Admin/ManufacturerMain.php @@ -63,7 +63,7 @@ public function render() } if ($this->getViewConfig()->isAltImageServerConfigured()) { - $this->_aViewData["imageUrl"] = ContainerFacade::getParameter('oxid_alternative_image_url'); + $this->_aViewData["imageUrl"] = ContainerFacade::getParameter('oxid_esales.alternative_image_url'); } if (Registry::getRequest()->getRequestEscapedParameter("aoc")) { diff --git a/source/Application/Controller/Admin/NavigationController.php b/source/Application/Controller/Admin/NavigationController.php index 4c2775998e..d99cf8526a 100644 --- a/source/Application/Controller/Admin/NavigationController.php +++ b/source/Application/Controller/Admin/NavigationController.php @@ -183,7 +183,7 @@ protected function doStartUpChecks() if ( file_exists( Path::join( - ContainerFacade::getParameter('oxid_shop_source_directory'), + ContainerFacade::getParameter('oxid_esales.shop_source_directory'), 'Setup', 'index.php' ) @@ -193,7 +193,7 @@ protected function doStartUpChecks() } // check if config file is writable - $sConfPath = Path::join(ContainerFacade::getParameter('oxid_shop_source_directory'), 'config.inc.php'); + $sConfPath = Path::join(ContainerFacade::getParameter('oxid_esales.shop_source_directory'), 'config.inc.php'); if (!is_readable($sConfPath) || is_writable($sConfPath)) { $messages['warning'] .= ((!empty($messages['warning'])) ? "
" : '') . Registry::getLang()->translateString('SETUP_CONFIGPERMISSIONS_WARNING'); } diff --git a/source/Application/Controller/Admin/NavigationTree.php b/source/Application/Controller/Admin/NavigationTree.php index 50743f8faf..f9118a44d8 100644 --- a/source/Application/Controller/Admin/NavigationTree.php +++ b/source/Application/Controller/Admin/NavigationTree.php @@ -574,10 +574,10 @@ protected function getAdminUrl() { $myConfig = \OxidEsales\Eshop\Core\Registry::getConfig(); - if (($adminUrl = ContainerFacade::getParameter('oxid_shop_admin_url'))) { + if (($adminUrl = ContainerFacade::getParameter('oxid_esales.shop_admin_url'))) { $url = trim($adminUrl, '/'); } else { - $url = trim(ContainerFacade::getParameter('oxid_shop_url'), '/') . '/admin'; + $url = trim(ContainerFacade::getParameter('oxid_esales.shop_url'), '/') . '/admin'; } return \OxidEsales\Eshop\Core\Registry::getUtilsUrl()->processUrl("{$url}/index.php", false); diff --git a/source/Application/Controller/Admin/ShopMain.php b/source/Application/Controller/Admin/ShopMain.php index d9263cdd91..e5b7757f43 100644 --- a/source/Application/Controller/Admin/ShopMain.php +++ b/source/Application/Controller/Admin/ShopMain.php @@ -157,7 +157,7 @@ protected function getNonCopyConfigVars(): array 'sBackTag', 'sUtilModule', ]; - $multiShopTables = ContainerFacade::getParameter('oxid_multi_shop_tables'); + $multiShopTables = ContainerFacade::getParameter('oxid_esales.multi_shop_tables'); foreach ($multiShopTables as $multiShopTable) { $nonCopyVars[] = 'blMallInherit_' . strtolower($multiShopTable); } @@ -205,7 +205,7 @@ protected function copyConfigVars($shop) } $inheritAll = $shop->oxshops__oxisinherited->value ? "true" : "false"; - $multiShopTables = ContainerFacade::getParameter('oxid_multi_shop_tables'); + $multiShopTables = ContainerFacade::getParameter('oxid_esales.multi_shop_tables'); foreach ($multiShopTables as $multiShopTable) { $config->saveShopConfVar("bool", 'blMallInherit_' . strtolower($multiShopTable), $inheritAll, $shop->oxshops__oxid->value); } diff --git a/source/Application/Controller/Admin/ToolsMain.php b/source/Application/Controller/Admin/ToolsMain.php index 7b2c3245f3..7435790572 100644 --- a/source/Application/Controller/Admin/ToolsMain.php +++ b/source/Application/Controller/Admin/ToolsMain.php @@ -31,7 +31,7 @@ public function render() $oAuthUser->loadAdminUser(); $this->_aViewData["blIsMallAdmin"] = $oAuthUser->oxuser__oxrights->value == "malladmin"; - $this->_aViewData['showViewUpdate'] = ContainerFacade::getParameter('oxid_show_update_views_button'); + $this->_aViewData['showViewUpdate'] = ContainerFacade::getParameter('oxid_esales.show_update_views_button'); return "tools_main"; } diff --git a/source/Application/Controller/Admin/VendorMain.php b/source/Application/Controller/Admin/VendorMain.php index c295056373..4af1203a66 100644 --- a/source/Application/Controller/Admin/VendorMain.php +++ b/source/Application/Controller/Admin/VendorMain.php @@ -63,7 +63,7 @@ public function render() } if ($this->getViewConfig()->isAltImageServerConfigured()) { - $this->_aViewData["imageUrl"] = ContainerFacade::getParameter('oxid_alternative_image_url'); + $this->_aViewData["imageUrl"] = ContainerFacade::getParameter('oxid_esales.alternative_image_url'); } if (Registry::getRequest()->getRequestEscapedParameter("aoc")) { diff --git a/source/Application/Controller/Admin/VoucherSerieExport.php b/source/Application/Controller/Admin/VoucherSerieExport.php index 9eb7269046..cc7b5c7bd4 100644 --- a/source/Application/Controller/Admin/VoucherSerieExport.php +++ b/source/Application/Controller/Admin/VoucherSerieExport.php @@ -67,9 +67,9 @@ public function getDownloadUrl() { $myConfig = Registry::getConfig(); - ContainerFacade::getParameter('oxid_shop_admin_url'); - $url = ContainerFacade::getParameter('oxid_shop_admin_url') ?: - ContainerFacade::getParameter('oxid_shop_url') . $myConfig->getConfigParam('sAdminDir'); + ContainerFacade::getParameter('oxid_esales.shop_admin_url'); + $url = ContainerFacade::getParameter('oxid_esales.shop_admin_url') ?: + ContainerFacade::getParameter('oxid_esales.shop_url') . $myConfig->getConfigParam('sAdminDir'); $url = Registry::getUtilsUrl()->processUrl($url . '/index.php'); @@ -101,7 +101,7 @@ protected function getExportFileName() protected function getExportFilePath() { return Path::join( - ContainerFacade::getParameter('oxid_shop_source_directory'), + ContainerFacade::getParameter('oxid_esales.shop_source_directory'), 'export', $this->getExportFileName() ); diff --git a/source/Application/Controller/Admin/WrappingMain.php b/source/Application/Controller/Admin/WrappingMain.php index b208a43c53..45b18ae126 100644 --- a/source/Application/Controller/Admin/WrappingMain.php +++ b/source/Application/Controller/Admin/WrappingMain.php @@ -55,7 +55,7 @@ public function render() } if ($this->getViewConfig()->isAltImageServerConfigured()) { - $this->_aViewData["imageUrl"] = ContainerFacade::getParameter('oxid_alternative_image_url'); + $this->_aViewData["imageUrl"] = ContainerFacade::getParameter('oxid_esales.alternative_image_url'); } return "wrapping_main"; diff --git a/source/Application/Controller/FrontendController.php b/source/Application/Controller/FrontendController.php index 2e83be2341..09136a621e 100644 --- a/source/Application/Controller/FrontendController.php +++ b/source/Application/Controller/FrontendController.php @@ -437,7 +437,7 @@ protected function getComponentNames() if (self::$_aCollectedComponentNames === null) { self::$_aCollectedComponentNames = array_merge($this->_aComponentNames, $this->_aUserComponentNames); - if ($userComponentNames = ContainerFacade::getParameter('oxid_cacheable_user_components')) { + if ($userComponentNames = ContainerFacade::getParameter('oxid_esales.cacheable_user_components')) { self::$_aCollectedComponentNames = array_merge(self::$_aCollectedComponentNames, $userComponentNames); } @@ -470,7 +470,7 @@ protected function processRequest() // forcing to set no index/follow meta $this->forceNoIndex(); - if (ContainerFacade::getParameter('oxid_log_not_seo_urls')) { + if (ContainerFacade::getParameter('oxid_esales.log_not_seo_urls')) { $shopId = Registry::getConfig()->getShopId(); $languageId = Registry::getLang()->getBaseLanguage(); $id = md5(strtolower($requestUrl) . $shopId . $languageId); @@ -2073,7 +2073,7 @@ public function render() $config = Registry::getConfig(); $this->_aViewData["defaultLang"] = $config->getConfigParam('sDefaultLang'); - $this->_aViewData["shopURLParam"] = ContainerFacade::getParameter('oxid_shop_url'); + $this->_aViewData["shopURLParam"] = ContainerFacade::getParameter('oxid_esales.shop_url'); return $this->_sThisTemplate; } diff --git a/source/Application/Model/Article.php b/source/Application/Model/Article.php index cc7ccba94d..e651cd5e37 100644 --- a/source/Application/Model/Article.php +++ b/source/Application/Model/Article.php @@ -2357,7 +2357,7 @@ public function getPictureGallery() $str = Str::getStr(); $pictureCounter = 0; $activePicId = true; - $maxPicPerProduct = ContainerFacade::getParameter('oxid_max_product_picture_count'); + $maxPicPerProduct = ContainerFacade::getParameter('oxid_esales.max_product_picture_count'); for ($i = 1; $i <= $maxPicPerProduct; $i++) { $picture = $this->getPictureUrl($i); @@ -4723,7 +4723,7 @@ protected function deletePics() //deleting custom thumbnail $pictureHandler->deleteThumbnail($this); - for ($i = 1; $i <= ContainerFacade::getParameter('oxid_max_product_picture_count'); $i++) { + for ($i = 1; $i <= ContainerFacade::getParameter('oxid_esales.max_product_picture_count'); $i++) { $pictureHandler->deleteArticleMasterPicture($this, $i); } } diff --git a/source/Application/Model/ArticleList.php b/source/Application/Model/ArticleList.php index a563f77e18..7d0af2c20f 100644 --- a/source/Application/Model/ArticleList.php +++ b/source/Application/Model/ArticleList.php @@ -1149,7 +1149,7 @@ protected function getManufacturerSelect($sManufacturerId) */ protected function canUpdatePrices() { - if (ContainerFacade::getParameter('oxid_cron_enabled')) { + if (ContainerFacade::getParameter('oxid_esales.cron_enabled')) { return false; } $timeToUpdate = Registry::getConfig()->getConfigParam("iTimeToUpdatePrices"); diff --git a/source/Application/Model/MediaUrl.php b/source/Application/Model/MediaUrl.php index e633af0b8a..2757240632 100644 --- a/source/Application/Model/MediaUrl.php +++ b/source/Application/Model/MediaUrl.php @@ -87,7 +87,7 @@ public function getObjectId() public function delete($sOXID = null) { $sFilePath = Path::join( - ContainerFacade::getParameter('oxid_shop_source_directory'), + ContainerFacade::getParameter('oxid_esales.shop_source_directory'), 'out', 'media', basename($this->oxmediaurls__oxurl->value) diff --git a/source/Application/Model/User.php b/source/Application/Model/User.php index 579a1456de..b953347aa1 100644 --- a/source/Application/Model/User.php +++ b/source/Application/Model/User.php @@ -1116,7 +1116,7 @@ public function convertBirthday($aData) */ public function getBoni() { - return ContainerFacade::getParameter('oxid_shop_credit_rating'); + return ContainerFacade::getParameter('oxid_esales.shop_credit_rating'); } /** diff --git a/source/Core/Config.php b/source/Core/Config.php index c832bd3303..afcd45ceb4 100644 --- a/source/Core/Config.php +++ b/source/Core/Config.php @@ -603,9 +603,9 @@ protected function checkSsl() $this->setIsSsl(); if (isset($httpsServerVar) && ($httpsServerVar === 'on' || $httpsServerVar === 'ON' || $httpsServerVar == '1')) { - $this->setIsSsl(ContainerFacade::getParameter('oxid_shop_url') || $this->getConfigParam('sMallSSLShopURL')); + $this->setIsSsl(ContainerFacade::getParameter('oxid_esales.shop_url') || $this->getConfigParam('sMallSSLShopURL')); if ($this->isAdmin() && !$this->_blIsSsl) { - $this->setIsSsl(!is_null(ContainerFacade::getParameter('oxid_shop_admin_url'))); + $this->setIsSsl(!is_null(ContainerFacade::getParameter('oxid_esales.shop_admin_url'))); } } @@ -697,7 +697,7 @@ public function getShopUrl($lang = null, $admin = null) } if (!$url) { - $url = ContainerFacade::getParameter('oxid_shop_url'); + $url = ContainerFacade::getParameter('oxid_esales.shop_url'); } return $url; @@ -727,7 +727,7 @@ public function getCurrentShopUrl($admin = null) $admin = $this->isAdmin(); } if ($admin) { - $url = ContainerFacade::getParameter('oxid_shop_admin_url'); + $url = ContainerFacade::getParameter('oxid_esales.shop_admin_url'); if (!$url) { return $this->getShopUrl() . $this->getConfigParam('sAdminDir') . '/'; } @@ -862,7 +862,7 @@ public function getOutDir($absolute = true) { if ($absolute) { - return Path::join(ContainerFacade::getParameter('oxid_shop_source_directory'), $this->_sOutDir) + return Path::join(ContainerFacade::getParameter('oxid_esales.shop_source_directory'), $this->_sOutDir) . DIRECTORY_SEPARATOR; } else { @@ -909,7 +909,7 @@ public function getAppDir($absolute = true) { if ($absolute) { - return Path::join(ContainerFacade::getParameter('oxid_shop_source_directory'), 'Application') + return Path::join(ContainerFacade::getParameter('oxid_esales.shop_source_directory'), 'Application') . DIRECTORY_SEPARATOR; } else { @@ -933,9 +933,9 @@ public function getOutUrl($ssl = null, $admin = null, $nativeImg = false) if ($nativeImg && !$admin) { $url = $this->getShopUrl(); } else { - $url = ContainerFacade::getParameter('oxid_shop_url'); + $url = ContainerFacade::getParameter('oxid_esales.shop_url'); if (!$url && $admin) { - $url = ContainerFacade::getParameter('oxid_shop_admin_url') . '../'; + $url = ContainerFacade::getParameter('oxid_esales.shop_admin_url') . '../'; } } @@ -1392,7 +1392,7 @@ public function getCurrencyObject($name) */ public function isDemoShop() { - return ContainerFacade::getParameter('oxid_demo_shop_mode'); + return ContainerFacade::getParameter('oxid_esales.demo_shop_mode'); } /** @@ -1417,7 +1417,7 @@ public function getFullEdition() */ public function getPackageInfo() { - $fileName = Path::join(ContainerFacade::getParameter('oxid_shop_source_directory'), 'pkg.info'); + $fileName = Path::join(ContainerFacade::getParameter('oxid_esales.shop_source_directory'), 'pkg.info'); $rev = @file_get_contents($fileName); $rev = str_replace("\n", "
", $rev); @@ -1729,7 +1729,7 @@ public function getActiveViewsIds() */ public function getLogsDir() { - return Path::join(ContainerFacade::getParameter('oxid_shop_source_directory'), 'log'); + return Path::join(ContainerFacade::getParameter('oxid_esales.shop_source_directory'), 'log'); } /** @@ -1751,7 +1751,7 @@ public function isThemeOption($name) */ public function getShopMainUrl() { - return ContainerFacade::getParameter('oxid_shop_url'); + return ContainerFacade::getParameter('oxid_esales.shop_url'); } /** diff --git a/source/Core/DbMetaDataHandler.php b/source/Core/DbMetaDataHandler.php index 6c2c6584d0..b89583bbc7 100644 --- a/source/Core/DbMetaDataHandler.php +++ b/source/Core/DbMetaDataHandler.php @@ -552,7 +552,7 @@ public function updateViews(array $tables = null): bool $shops = $db->getAll('select * from oxshops'); - $tables = $tables ?: ContainerFacade::getParameter('oxid_multi_shop_tables'); + $tables = $tables ?: ContainerFacade::getParameter('oxid_esales.multi_shop_tables'); $success = true; foreach ($shops as $shopValues) { @@ -600,7 +600,7 @@ protected function filterCoreFields($fields) protected function safeGuardAdditionalMultiLanguageTables() { $maxLang = $this->getCurrentMaxLangId(); - $multiLanguageTables = ContainerFacade::getParameter('oxid_multilingual_tables'); + $multiLanguageTables = ContainerFacade::getParameter('oxid_esales.multilingual_tables'); if (!is_array($multiLanguageTables) || empty($multiLanguageTables)) { return; //nothing to do diff --git a/source/Core/DynamicImageGenerator.php b/source/Core/DynamicImageGenerator.php index 96a52ff14d..1edf5dfe7b 100644 --- a/source/Core/DynamicImageGenerator.php +++ b/source/Core/DynamicImageGenerator.php @@ -176,7 +176,7 @@ public function __call($method, $arguments) */ protected function getShopBasePath() { - return ContainerFacade::getParameter('oxid_shop_source_directory') . DIRECTORY_SEPARATOR; + return ContainerFacade::getParameter('oxid_esales.shop_source_directory') . DIRECTORY_SEPARATOR; } /** diff --git a/source/Core/Email.php b/source/Core/Email.php index 89ee1dfc9a..956901e5ba 100644 --- a/source/Core/Email.php +++ b/source/Core/Email.php @@ -411,7 +411,7 @@ public function setSmtp($shop = null) $this->setSmtpAuthInfo($shop->oxshops__oxsmtpuser->value, $shop->oxshops__oxsmtppwd->getRawValue()); } - if (ContainerFacade::getParameter('oxid_smtp_debug_mode')) { + if (ContainerFacade::getParameter('oxid_esales.smtp_debug_mode')) { $this->setSmtpDebug(true); } } @@ -1935,7 +1935,7 @@ protected function getUtilsObjectInstance() */ private function isDebugModeEnabled() { - return ContainerFacade::getParameter('oxid_debug_mode'); + return ContainerFacade::getParameter('oxid_esales.debug_mode'); } /** diff --git a/source/Core/EmailBuilder.php b/source/Core/EmailBuilder.php index d7079f2919..90b5b30ca5 100644 --- a/source/Core/EmailBuilder.php +++ b/source/Core/EmailBuilder.php @@ -117,7 +117,7 @@ protected function getShopInfoAddress() protected function getEmailOriginMessage() { $lang = \OxidEsales\Eshop\Core\Registry::getLang(); - $shopUrl = ContainerFacade::getParameter('oxid_shop_url'); + $shopUrl = ContainerFacade::getParameter('oxid_esales.shop_url'); return "
" . sprintf( $lang->translateString( diff --git a/source/Core/Language.php b/source/Core/Language.php index 65ed2ca129..f81aa19649 100644 --- a/source/Core/Language.php +++ b/source/Core/Language.php @@ -1215,7 +1215,7 @@ public function getMultiLangTables() 'oxvendor', 'oxwrapping', ]; - $configTables = ContainerFacade::getParameter('oxid_multilingual_tables'); + $configTables = ContainerFacade::getParameter('oxid_esales.multilingual_tables'); if (\is_array($configTables)) { $tables = \array_merge($tables, $configTables); } diff --git a/source/Core/PictureHandler.php b/source/Core/PictureHandler.php index 85a44b4dcb..1e985ebc54 100644 --- a/source/Core/PictureHandler.php +++ b/source/Core/PictureHandler.php @@ -276,7 +276,7 @@ protected function getPictureInfo($sFilePath, $sFile, $blAdmin = false, $blSSL = public function getAltImageUrl($filePath, $file) { - $altUrl = ContainerFacade::getParameter('oxid_alternative_image_url') ?: null; + $altUrl = ContainerFacade::getParameter('oxid_esales.alternative_image_url') ?: null; if ($altUrl && !is_null($file)) { $altUrl = Path::join($altUrl, $filePath, $file); diff --git a/source/Core/Session.php b/source/Core/Session.php index 98c9fd6d8e..b07423eb18 100644 --- a/source/Core/Session.php +++ b/source/Core/Session.php @@ -255,7 +255,7 @@ public function start() if (!self::$_blIsNewSession && $blSwapped) { $this->initNewSession(); - if ($this->_sErrorMsg && ContainerFacade::getParameter('oxid_debug_mode')) { + if ($this->_sErrorMsg && ContainerFacade::getParameter('oxid_esales.debug_mode')) { Registry::getUtilsView()->addErrorToDisplay(oxNew(\OxidEsales\Eshop\Core\Exception\StandardException::class, $this->_sErrorMsg)); } } elseif (!$blSwapped) { @@ -819,7 +819,7 @@ protected function forceSessionStart() { return !Registry::getUtils()->isSearchEngine() && ( - ContainerFacade::getParameter('oxid_force_session_start') || + ContainerFacade::getParameter('oxid_esales.force_session_start') || Registry::getRequest()->getRequestEscapedParameter('su') || $this->_blForceNewSession ); @@ -936,7 +936,7 @@ protected function checkCookies($sCookieSid, $aSessCookieSetOnce) //if cookie was there once but now is gone it means we have to reset if ($blSessCookieSetOnce && !$sCookieSid) { - if (ContainerFacade::getParameter('oxid_debug_mode')) { + if (ContainerFacade::getParameter('oxid_esales.debug_mode')) { $this->_sErrorMsg = "Cookie not found, creating new SID...
"; $this->_sErrorMsg .= "Cookie: $sCookieSid
"; $this->_sErrorMsg .= "Session: $blSessCookieSetOnce
"; @@ -1011,7 +1011,7 @@ protected function getCookieSid() */ protected function getRequireSessionWithParams() { - $config = ContainerFacade::getParameter('oxid_session_init_params'); + $config = ContainerFacade::getParameter('oxid_esales.session_init_params'); $defaults = $this->_aRequireSessionWithParams; if (!$config) { return $defaults; @@ -1054,7 +1054,7 @@ protected function isSessionRequiredAction() */ protected function getSessionUseCookies() { - return $this->isAdmin() || ContainerFacade::getParameter('oxid_cookies_session'); + return $this->isAdmin() || ContainerFacade::getParameter('oxid_esales.cookies_session'); } /** @@ -1151,7 +1151,7 @@ protected function setSessionCookie($sessionId): void private function isForceSidBlocked(): bool { - return ContainerFacade::getParameter('oxid_disallow_force_session_id'); + return ContainerFacade::getParameter('oxid_esales.disallow_force_session_id'); } private function canSendSidWithRequest(bool $useForceSid): bool diff --git a/source/Core/ShopControl.php b/source/Core/ShopControl.php index 6ccbced84e..a4d4095505 100644 --- a/source/Core/ShopControl.php +++ b/source/Core/ShopControl.php @@ -502,7 +502,7 @@ protected function runOnce() if (!$runOnceExecuted && !$this->isAdmin() && $config->isProductiveMode()) { // check if setup is still there $setupIndexFile = Path::join( - ContainerFacade::getParameter('oxid_shop_source_directory'), + ContainerFacade::getParameter('oxid_esales.shop_source_directory'), 'Setup', 'index.php' ); @@ -529,7 +529,7 @@ protected function runOnce() */ protected function isDebugMode() { - return ContainerFacade::getParameter('oxid_debug_mode'); + return ContainerFacade::getParameter('oxid_esales.debug_mode'); } /** diff --git a/source/Core/SystemRequirements.php b/source/Core/SystemRequirements.php index 6bd91858d8..3b81a2d4c8 100644 --- a/source/Core/SystemRequirements.php +++ b/source/Core/SystemRequirements.php @@ -319,7 +319,7 @@ public function getPermissionIssuesList($shopPath = null, $minPerm = 777) 'not_writable' => [] ]; - $buildDirectory = ContainerFacade::getParameter('oxid_build_directory'); + $buildDirectory = ContainerFacade::getParameter('oxid_esales.build_directory'); $pathsToCheck = [ $buildDirectory @@ -361,7 +361,7 @@ public function getPermissionIssuesList($shopPath = null, $minPerm = 777) */ protected function getShopSSLHostInfoFromConfig() { - $sslShopURL = ContainerFacade::getParameter('oxid_shop_url'); + $sslShopURL = ContainerFacade::getParameter('oxid_esales.shop_url'); if (preg_match('#^(https?://)?([^/:]+)(:([0-9]+))?(/.*)?$#i', $sslShopURL, $shopUrlComponents)) { $host = $shopUrlComponents[2]; $port = (int) $shopUrlComponents[4]; diff --git a/source/Core/TableViewNameGenerator.php b/source/Core/TableViewNameGenerator.php index 79037e7b2e..bfbfece8f2 100644 --- a/source/Core/TableViewNameGenerator.php +++ b/source/Core/TableViewNameGenerator.php @@ -52,7 +52,7 @@ public function getViewName($table, $languageId = null, $shopId = null) { $config = $this->getConfig(); - if (!ContainerFacade::getParameter('oxid_skip_database_views_usage')) { + if (!ContainerFacade::getParameter('oxid_esales.skip_database_views_usage')) { $language = $this->getLanguage(); $languageId = $languageId !== null ? $languageId : $language->getBaseLanguage(); $shopId = $shopId !== null ? $shopId : $config->getShopId(); diff --git a/source/Core/Utils.php b/source/Core/Utils.php index 053dbd7e24..0d0336d4e3 100644 --- a/source/Core/Utils.php +++ b/source/Core/Utils.php @@ -228,8 +228,8 @@ public function setSearchEngine($isSearchEngine = null, $userAgent = null) startProfile('isSearchEngine'); $isSearchEngine = false; - if (!(ContainerFacade::getParameter('oxid_debug_mode') && $this->isAdmin())) { - $robots = ContainerFacade::getParameter('oxid_search_engine_list'); + if (!(ContainerFacade::getParameter('oxid_esales.debug_mode') && $this->isAdmin())) { + $robots = ContainerFacade::getParameter('oxid_esales.search_engine_list'); $robots = \is_array($robots) ? $robots : []; $userAgent = $userAgent ?: strtolower(getenv('HTTP_USER_AGENT')); @@ -1191,7 +1191,7 @@ public function getCacheFilePath($sCacheName, $blPathOnly = false, $sExtension = { $versionPrefix = $this->getEditionCacheFilePrefix(); - $sPath = realpath(ContainerFacade::getParameter('oxid_build_directory')); + $sPath = realpath(ContainerFacade::getParameter('oxid_esales.build_directory')); if (!$sPath) { return false; @@ -1241,7 +1241,7 @@ public function setLangCache($sCacheName, $aLangCache) $sFileName = $this->getCacheFilePath($sCacheName); $tmpFile = Path::join( - ContainerFacade::getParameter('oxid_build_directory'), + ContainerFacade::getParameter('oxid_esales.build_directory'), basename($sFileName) . uniqid('.temp', true) . '.txt' ); $blRes = file_put_contents($tmpFile, $sCache, LOCK_EX); @@ -1314,7 +1314,7 @@ public function extractDomain($sHost) private function isSeoEnabled(): bool { - return (bool)ContainerFacade::getParameter('oxid_seo_mode'); + return (bool)ContainerFacade::getParameter('oxid_esales.seo_mode'); } private function isSeoDisabledForShopAndLanguage(int $shopId, int $languageId): bool diff --git a/source/Core/UtilsFile.php b/source/Core/UtilsFile.php index a067dbc5c6..bba1f327d8 100644 --- a/source/Core/UtilsFile.php +++ b/source/Core/UtilsFile.php @@ -125,7 +125,7 @@ class UtilsFile extends \OxidEsales\Eshop\Core\Base */ public function __construct() { - if ($picturesCount = ContainerFacade::getParameter('oxid_max_product_picture_count')) { + if ($picturesCount = ContainerFacade::getParameter('oxid_esales.max_product_picture_count')) { $this->_iMaxPicImgCount = $picturesCount; } @@ -365,7 +365,7 @@ public function processFiles($oObject = null, $aFiles = [], $blUseMasterImage = $blDemo = (bool) $oConfig->isDemoShop(); // folder where images will be processed - $sTmpFolder = ContainerFacade::getParameter('oxid_build_directory'); + $sTmpFolder = ContainerFacade::getParameter('oxid_esales.build_directory'); $iNewFilesCounter = 0; $aSource = $aFiles['myfile']['tmp_name']; @@ -473,7 +473,7 @@ public function processFile($filename, $uploadPath) { $fileInfo = $_FILES[$filename]; - $absoluteUploadPath = Path::join(ContainerFacade::getParameter('oxid_shop_source_directory'), $uploadPath); + $absoluteUploadPath = Path::join(ContainerFacade::getParameter('oxid_esales.shop_source_directory'), $uploadPath); //checking params if (!isset($fileInfo['name']) || !isset($fileInfo['tmp_name'])) { @@ -495,7 +495,7 @@ public function processFile($filename, $uploadPath) $extension = $pathInfo['extension']; $filename = $pathInfo['filename']; - $allowedUploadTypes = ContainerFacade::getParameter('oxid_allowed_uploaded_types'); + $allowedUploadTypes = ContainerFacade::getParameter('oxid_esales.allowed_uploaded_types'); $allowedUploadTypes = array_map("strtolower", $allowedUploadTypes); if (!in_array(strtolower($extension), $allowedUploadTypes)) { @@ -670,7 +670,7 @@ private function makePathRelativeToShopSource(string $path): string return Path::makeRelative( $path, - ContainerFacade::getParameter('oxid_shop_source_directory') + ContainerFacade::getParameter('oxid_esales.shop_source_directory') ); } } diff --git a/source/Core/UtilsPic.php b/source/Core/UtilsPic.php index d79df823e2..7027d38122 100644 --- a/source/Core/UtilsPic.php +++ b/source/Core/UtilsPic.php @@ -81,7 +81,7 @@ protected function deletePicture($filename, $masterImagePath) } $removed = $this->removeMasterFile(Path::join($masterImagePath, $filename)); - if (!ContainerFacade::getParameter('oxid_alternative_image_url')) { + if (!ContainerFacade::getParameter('oxid_esales.alternative_image_url')) { $generatedImagePath = str_replace('/master/', '/generated/', $masterImagePath); $files = glob(Path::join($generatedImagePath,'*',$filename)); if (\is_array($files)) { @@ -286,7 +286,7 @@ private function makePathRelativeToShopSource(string $path): string { return Path::makeRelative( $path, - ContainerFacade::getParameter('oxid_shop_source_directory') + ContainerFacade::getParameter('oxid_esales.shop_source_directory') ); } } diff --git a/source/Core/UtilsServer.php b/source/Core/UtilsServer.php index c37aaed6db..6cf17cb3b6 100644 --- a/source/Core/UtilsServer.php +++ b/source/Core/UtilsServer.php @@ -171,7 +171,7 @@ public function loadSessionCookies() protected function getCookiePath($path) { return ContainerFacade::getParameter( - 'oxid_cookie_paths' + 'oxid_esales.cookie_paths' )[ContainerFacade::get(ContextInterface::class)->getCurrentShopId()] ?? $path ?: ''; @@ -186,7 +186,7 @@ protected function getCookieDomain($domain) { return $domain ?: ContainerFacade::getParameter( - 'oxid_cookie_domains' + 'oxid_esales.cookie_domains' )[ContainerFacade::get(ContextInterface::class)->getCurrentShopId()] ?? ''; } @@ -320,7 +320,7 @@ public function isTrustedClientIp() { return in_array( $this->getRemoteAddress(), - ContainerFacade::getParameter('oxid_trusted_ips'), + ContainerFacade::getParameter('oxid_esales.trusted_ips'), true ); } diff --git a/source/Core/UtilsUrl.php b/source/Core/UtilsUrl.php index a0731663a1..9da5d802f5 100644 --- a/source/Core/UtilsUrl.php +++ b/source/Core/UtilsUrl.php @@ -205,7 +205,7 @@ public function cleanUrl($sUrl, $aParams = null) public function addShopHost($url) { if (!preg_match("#^https?://#i", $url)) { - $url = ContainerFacade::getParameter('oxid_shop_url') . $url; + $url = ContainerFacade::getParameter('oxid_esales.shop_url') . $url; } return $url; @@ -533,10 +533,10 @@ protected function getHosts() $this->addLanguageHost($oConfig->getConfigParam('aLanguageSSLURLs'), $this->_aHosts); // current url - $this->addHost(ContainerFacade::getParameter('oxid_shop_url'), $this->_aHosts); + $this->addHost(ContainerFacade::getParameter('oxid_esales.shop_url'), $this->_aHosts); if ($this->isAdmin()) { - $this->addHost(ContainerFacade::getParameter('oxid_shop_admin_url'), $this->_aHosts); + $this->addHost(ContainerFacade::getParameter('oxid_esales.shop_admin_url'), $this->_aHosts); } } diff --git a/source/Core/ViewConfig.php b/source/Core/ViewConfig.php index e1f110375d..990aa26e04 100644 --- a/source/Core/ViewConfig.php +++ b/source/Core/ViewConfig.php @@ -1155,7 +1155,7 @@ public function getModuleUrl($sModule, $sFile = '') $config = Registry::getConfig(); $moduleUrl = str_replace( - rtrim(ContainerFacade::getParameter('oxid_shop_source_directory'), '/'), + rtrim(ContainerFacade::getParameter('oxid_esales.shop_source_directory'), '/'), rtrim($config->getCurrentShopUrl(false), '/'), $this->getModulePath($sModule, $sFile) ); @@ -1208,7 +1208,7 @@ public function showSelectListsInList() */ public function isAltImageServerConfigured() { - return (bool) ContainerFacade::getParameter('oxid_alternative_image_url'); + return (bool) ContainerFacade::getParameter('oxid_esales.alternative_image_url'); } /** @@ -1246,7 +1246,7 @@ public function getActiveTheme() public function getShopLogo() { if (is_null($this->_sShopLogo)) { - $sLogoImage = ContainerFacade::getParameter('oxid_shop_logo'); + $sLogoImage = ContainerFacade::getParameter('oxid_esales.shop_logo'); if (empty($sLogoImage)) { $sLogoImage = "logo_" . strtolower((new Facts())->getEdition()) . ".png"; } @@ -1367,7 +1367,7 @@ private function validateModuleFile(string $filePath, string $moduleId): void { if (!file_exists($filePath)) { $exception = new FileException("Requested file not found for module $moduleId ($filePath)"); - if (ContainerFacade::getParameter('oxid_debug_mode')) { + if (ContainerFacade::getParameter('oxid_esales.debug_mode')) { throw $exception; } else { Registry::getLogger()->error($exception->getMessage(), [$exception]); diff --git a/source/Core/ViewHelper/BaseRegistrator.php b/source/Core/ViewHelper/BaseRegistrator.php index c8aed9edda..03aa151aac 100644 --- a/source/Core/ViewHelper/BaseRegistrator.php +++ b/source/Core/ViewHelper/BaseRegistrator.php @@ -52,7 +52,7 @@ protected function formLocalFileUrl($fullUrl) $parameters = $this->getFileModificationTime($path); } - if (empty($url) && ContainerFacade::getParameter('oxid_debug_mode')) { + if (empty($url) && ContainerFacade::getParameter('oxid_esales.debug_mode')) { $error = "{" . static::TAG_NAME . "} resource not found: " . \OxidEsales\Eshop\Core\Str::getStr()->htmlspecialchars($url); trigger_error($error, E_USER_WARNING); } @@ -89,7 +89,7 @@ protected function getPathByUrl($url) $config = Registry::getConfig(); return str_replace( rtrim($config->getCurrentShopUrl(false), '/'), - rtrim(ContainerFacade::getParameter('oxid_shop_source_directory'), '/'), + rtrim(ContainerFacade::getParameter('oxid_esales.shop_source_directory'), '/'), $url ); } diff --git a/source/Internal/Container/services.yaml b/source/Internal/Container/services.yaml index a1c16453c3..b996f7928b 100644 --- a/source/Internal/Container/services.yaml +++ b/source/Internal/Container/services.yaml @@ -1,13 +1,6 @@ imports: - { resource: bootstrap-services.yaml } -parameters: - oxid_shop_url: '%env(OXID_SHOP_BASE_URL)%' - oxid_shop_admin_url: null - oxid_alternative_image_url: - oxid_shop_logo: - oxid_max_product_picture_count: 12 - services: _defaults: autowire: true diff --git a/source/Internal/Domain/parameter.yaml b/source/Internal/Domain/parameter.yaml index 3991130242..ab3fbfacfe 100644 --- a/source/Internal/Domain/parameter.yaml +++ b/source/Internal/Domain/parameter.yaml @@ -1,4 +1,6 @@ parameters: - oxid_basket_reservation_cleanup_rate: 200 - oxid_seo_mode: true - oxid_shop_credit_rating: 1000 + oxid_esales.shop_logo: + oxid_esales.max_product_picture_count: 12 + oxid_esales.basket_reservation_cleanup_rate: 200 + oxid_esales.seo_mode: true + oxid_esales.shop_credit_rating: 1000 diff --git a/source/Internal/Framework/DIContainer/ContainerBuilder.php b/source/Internal/Framework/DIContainer/ContainerBuilder.php index 6ab6d1afd2..3f37fa1887 100644 --- a/source/Internal/Framework/DIContainer/ContainerBuilder.php +++ b/source/Internal/Framework/DIContainer/ContainerBuilder.php @@ -45,9 +45,7 @@ public function getContainer(): SymfonyContainerBuilder $this->containerBuilder = new SymfonyContainerBuilder(); $this->containerBuilder->setParameter('oxid_esales.current_shop_id', $this->shopId); - $this->containerBuilder->setParameter('oxid_shop_source_directory', $this->basicContext->getSourcePath()); - $this->containerBuilder->setParameter('oxid_cache_directory', $this->basicContext->getCacheDirectory()); - $this->containerBuilder->setParameter('oxid_db_url', $this->basicContext->getDatabaseUrl()); + $this->containerBuilder->setParameter('oxid_esales.shop_source_directory', $this->basicContext->getSourcePath()); $this->containerBuilder->addCompilerPass(new RegisterListenersPass()); $this->containerBuilder->addCompilerPass(new AddConsoleCommandPass()); diff --git a/source/Internal/Framework/Database/Logger/services.yaml b/source/Internal/Framework/Database/Logger/services.yaml index e52eedeeb3..1d5984e36e 100644 --- a/source/Internal/Framework/Database/Logger/services.yaml +++ b/source/Internal/Framework/Database/Logger/services.yaml @@ -1,3 +1,6 @@ +parameters: + oxid_esales.log_admin_queries: false + services: _defaults: autowire: true @@ -13,7 +16,7 @@ services: arguments: $queryLogger: '@OxidEsales\EshopCommunity\Internal\Framework\Database\Logger\QueryLogger' $nullLogger: '@OxidEsales\EshopCommunity\Internal\Framework\Database\Logger\NullLogger' - $logQueriesInAdmin: '%oxid_log_admin_queries%' + $logQueriesInAdmin: '%oxid_esales.log_admin_queries%' OxidEsales\EshopCommunity\Internal\Framework\Database\Logger\QueryFilterInterface: class: OxidEsales\EshopCommunity\Internal\Framework\Database\Logger\QueryFilter diff --git a/source/Internal/Framework/Database/services.yaml b/source/Internal/Framework/Database/services.yaml index d45147bf48..4a3477e32a 100644 --- a/source/Internal/Framework/Database/services.yaml +++ b/source/Internal/Framework/Database/services.yaml @@ -2,10 +2,10 @@ imports: - { resource: Logger/services.yaml } parameters: - oxid_multilingual_tables: [] - oxid_skip_database_views_usage: false - oxid_show_update_views_button: true - oxid_multi_shop_tables: [] + oxid_esales.multilingual_tables: [] + oxid_esales.skip_database_views_usage: false + oxid_esales.show_update_views_button: true + oxid_esales.multi_shop_tables: [] services: _defaults: diff --git a/source/Internal/Framework/Logger/services.yaml b/source/Internal/Framework/Logger/services.yaml index 47c976ae69..95edcdf9fe 100644 --- a/source/Internal/Framework/Logger/services.yaml +++ b/source/Internal/Framework/Logger/services.yaml @@ -1,6 +1,3 @@ -parameters: - oxid_log_level: '%env(OXID_LOG_LEVEL)%' - services: _defaults: autowire: true diff --git a/source/Internal/Framework/Templating/services.yaml b/source/Internal/Framework/Templating/services.yaml index d795a3e58b..72111cf8d4 100644 --- a/source/Internal/Framework/Templating/services.yaml +++ b/source/Internal/Framework/Templating/services.yaml @@ -52,4 +52,4 @@ services: arguments: - '@OxidEsales\EshopCommunity\Internal\Transition\Utility\ContextInterface' - '@oxid_esales.symfony.file_system' - - '%oxid_build_directory%' + - '%oxid_esales.build_directory%' diff --git a/source/Internal/Framework/parameters.yaml b/source/Internal/Framework/parameters.yaml index 33b7ded3af..1f5e5be83a 100644 --- a/source/Internal/Framework/parameters.yaml +++ b/source/Internal/Framework/parameters.yaml @@ -1,12 +1,19 @@ parameters: - oxid_force_session_start: false - oxid_cookies_session: true - oxid_cookie_domains: [] - oxid_cookie_paths: [] - oxid_trusted_ips: [] - oxid_session_init_params: [] - oxid_disallow_force_session_id: false - oxid_allowed_uploaded_types: + oxid_esales.shop_admin_url: null + oxid_esales.force_session_start: false + oxid_esales.session_init_params: [ ] + oxid_esales.disallow_force_session_id: false + oxid_esales.cookies_session: true + oxid_esales.cookie_domains: [] + oxid_esales.cookie_paths: [] + oxid_esales.trusted_ips: [] + oxid_esales.log_not_seo_urls: false + oxid_esales.cacheable_user_components: [] + oxid_esales.demo_shop_mode: false + oxid_esales.smtp_debug_mode: false + oxid_esales.cron_enabled: false + oxid_esales.alternative_image_url: + oxid_esales.allowed_uploaded_types: - 'avi' - 'doc' - 'gif' @@ -18,9 +25,7 @@ parameters: - 'png' - 'ppt' - 'xls' - oxid_log_admin_queries: false - oxid_log_not_seo_urls: false - oxid_search_engine_list: + oxid_esales.search_engine_list: - 'ahrefs' - 'ahrefsbot' - 'applebot' @@ -37,6 +42,4 @@ parameters: - 'sogouspider' - 'twitterbot' - 'yandexbot' - - 'yesco' - oxid_cacheable_user_components: [] - oxid_demo_shop_mode: false + - 'yesco' \ No newline at end of file diff --git a/source/Internal/parameters.yaml b/source/Internal/parameters.yaml index 43ccde051d..e34323678c 100644 --- a/source/Internal/parameters.yaml +++ b/source/Internal/parameters.yaml @@ -1,5 +1,5 @@ parameters: - oxid_build_directory: '%env(OXID_BUILD_DIRECTORY)%' - oxid_debug_mode: '%env(bool:OXID_DEBUG_MODE)%' - oxid_smtp_debug_mode: false - oxid_cron_enabled: false \ No newline at end of file + oxid_esales.build_directory: '%env(OXID_BUILD_DIRECTORY)%' + oxid_esales.shop_url: '%env(OXID_SHOP_BASE_URL)%' + oxid_esales.log_level: '%env(OXID_LOG_LEVEL)%' + oxid_esales.debug_mode: '%env(bool:OXID_DEBUG_MODE)%' diff --git a/source/Setup/Utilities.php b/source/Setup/Utilities.php index e275d4cef7..fef81870d9 100644 --- a/source/Setup/Utilities.php +++ b/source/Setup/Utilities.php @@ -483,7 +483,7 @@ public function getRootDirectory(): string public function getSqlDirectory(): string { return Path::join( - ContainerFacade::getParameter('oxid_shop_source_directory'), + ContainerFacade::getParameter('oxid_esales.shop_source_directory'), self::SETUP_DIRECTORY, self::DATABASE_SQL_DIRECTORY ); diff --git a/tests/Codeception/Acceptance/Admin/ModuleActivationCest.php b/tests/Codeception/Acceptance/Admin/ModuleActivationCest.php index 45ce929131..338d45c945 100644 --- a/tests/Codeception/Acceptance/Admin/ModuleActivationCest.php +++ b/tests/Codeception/Acceptance/Admin/ModuleActivationCest.php @@ -51,7 +51,7 @@ public function moduleActivation(AcceptanceTester $I): void public function moduleActivationInDemoMode(AcceptanceTester $I): void { $I->wantToTest('module activation disabled in demo mode'); - $I->updateProjectConfigurations(['oxid_demo_shop_mode' => true], []); + $I->updateProjectConfigurations(['oxid_esales.demo_shop_mode' => true], []); $this->openModuleOverview($I); diff --git a/tests/Codeception/Acceptance/CheckoutProcessCest.php b/tests/Codeception/Acceptance/CheckoutProcessCest.php index 54264f86a4..93e8848a25 100644 --- a/tests/Codeception/Acceptance/CheckoutProcessCest.php +++ b/tests/Codeception/Acceptance/CheckoutProcessCest.php @@ -438,7 +438,7 @@ public function checkNoSessionCookiesCheckout(AcceptanceTester $I): void $I->wantToTest('checkout process can be completed with cookies disabled'); $I->amGoingTo('disable storing session in cookies via configuration'); - $I->updateProjectConfigurations(['oxid_cookies_session' => false], []); + $I->updateProjectConfigurations(['oxid_esales.cookies_session' => false], []); $I->amGoingTo('go through checkout steps'); (new Basket($I))->addProductToBasketAndOpenUserCheckout('1000', 10); diff --git a/tests/Codeception/Acceptance/SessionHandlingCest.php b/tests/Codeception/Acceptance/SessionHandlingCest.php index 4c98b9bf2a..7700020468 100644 --- a/tests/Codeception/Acceptance/SessionHandlingCest.php +++ b/tests/Codeception/Acceptance/SessionHandlingCest.php @@ -57,7 +57,7 @@ public function checkForceSidWithDisabledForceSid(AcceptanceTester $I): void $userData = Fixtures::get('existingUser'); $I->amGoingTo('disable force_sid via configuration'); - $I->updateProjectConfigurations(['oxid_disallow_force_session_id' => true], []); + $I->updateProjectConfigurations(['oxid_esales.disallow_force_session_id' => true], []); $I->amGoingTo('login to existing user account and grab active session ID'); $this->createUserSession( diff --git a/tests/Integration/Application/Component/BasketComponentTest.php b/tests/Integration/Application/Component/BasketComponentTest.php index db6c94cb7d..0ba7a6dae7 100644 --- a/tests/Integration/Application/Component/BasketComponentTest.php +++ b/tests/Integration/Application/Component/BasketComponentTest.php @@ -65,7 +65,7 @@ public function testInitWitDefaultBasketReservationsCleanupRate(): void public function testInitWitModifiedBasketReservationsCleanupRate(): void { $cleanupRate = 123; - $this->setParameter('oxid_basket_reservation_cleanup_rate', $cleanupRate); + $this->setParameter('oxid_esales.basket_reservation_cleanup_rate', $cleanupRate); $this->attachContainerToContainerFactory(); Registry::getConfig()->reinitialize(); Registry::getConfig()->setConfigParam('blPsBasketReservationEnabled', true); diff --git a/tests/Integration/Application/Model/ArticleListTest.php b/tests/Integration/Application/Model/ArticleListTest.php index 546fe65c26..08b99002f8 100644 --- a/tests/Integration/Application/Model/ArticleListTest.php +++ b/tests/Integration/Application/Model/ArticleListTest.php @@ -85,8 +85,8 @@ public function testUpdateUpcomingPricesWithDefaultCronEnabledSetting(): void public function testUpdateUpcomingPricesWithModifiedCronEnabledSetting(): void { - $this->setParameter('oxid_cron_enabled', true); - $this->setParameter('oxid_build_directory', getenv('OXID_BUILD_DIRECTORY')); + $this->setParameter('oxid_esales.cron_enabled', true); + $this->setParameter('oxid_esales.build_directory', getenv('OXID_BUILD_DIRECTORY')); $this->replaceContainerInstance(); $this->prepareCategories('value'); diff --git a/tests/Integration/Application/Model/UserTest.php b/tests/Integration/Application/Model/UserTest.php index 83662c9ad9..7f6f43cbbe 100644 --- a/tests/Integration/Application/Model/UserTest.php +++ b/tests/Integration/Application/Model/UserTest.php @@ -57,8 +57,8 @@ public function testGetBoniWithDefaultConfig(): void public function testGetBoniWithModifiedConfig(): void { $configValue = 123; - $this->setParameter('oxid_shop_credit_rating', $configValue); - $this->setParameter('oxid_build_directory', getenv('OXID_BUILD_DIRECTORY')); + $this->setParameter('oxid_esales.shop_credit_rating', $configValue); + $this->setParameter('oxid_esales.build_directory', getenv('OXID_BUILD_DIRECTORY')); $this->replaceContainerInstance(); $rating = oxNew(User::class)->getBoni(); diff --git a/tests/Integration/Core/PictureHandlerTest.php b/tests/Integration/Core/PictureHandlerTest.php index 80aaf410c2..2cb99d669f 100644 --- a/tests/Integration/Core/PictureHandlerTest.php +++ b/tests/Integration/Core/PictureHandlerTest.php @@ -29,7 +29,7 @@ public function setUp(): void public function testGetAltImageUrlWithEmptyParameter(): void { $this->createContainer(); - $this->container->setParameter('oxid_alternative_image_url', ''); + $this->container->setParameter('oxid_esales.alternative_image_url', ''); $this->compileContainer(); $this->attachContainerToContainerFactory(); @@ -41,7 +41,7 @@ public function testGetAltImageUrlWithNullFile(): void { $altImageUrlParameter = 'somevalue'; $this->createContainer(); - $this->container->setParameter('oxid_alternative_image_url', $altImageUrlParameter); + $this->container->setParameter('oxid_esales.alternative_image_url', $altImageUrlParameter); $this->compileContainer(); $this->attachContainerToContainerFactory(); diff --git a/tests/Integration/Core/SessionTest.php b/tests/Integration/Core/SessionTest.php index eebe037994..62a597c85d 100644 --- a/tests/Integration/Core/SessionTest.php +++ b/tests/Integration/Core/SessionTest.php @@ -30,7 +30,7 @@ public static function tearDownAfterClass(): void public function testGetSidFromRequestWithForceSidInRequestAndDisabledConfig(): void { - $this->setParameter('oxid_disallow_force_session_id', true); + $this->setParameter('oxid_esales.disallow_force_session_id', true); $this->attachContainerToContainerFactory(); $sessionId = uniqid('session-id-', true); $_GET['force_sid'] = $sessionId; @@ -56,7 +56,7 @@ public function testProcessUrlWithDefaultConfig(): void public function testProcessUrlWithDisabledConfig(): void { - $this->setParameter('oxid_disallow_force_session_id', true); + $this->setParameter('oxid_esales.disallow_force_session_id', true); $this->attachContainerToContainerFactory(); $sessionId = uniqid('session-id-', true); $url = 'https://myshop.abc'; @@ -84,7 +84,7 @@ public function testAllowSessionStartWithSidInRequestAndDefaultConfig(): void public function testAllowSessionStartWithSidInRequestAndDisabledConfig(): void { - $this->setParameter('oxid_disallow_force_session_id', true); + $this->setParameter('oxid_esales.disallow_force_session_id', true); $this->attachContainerToContainerFactory(); $utilsSever = $this->createMock(UtilsServer::class); Registry::set(UtilsServer::class, $utilsSever); @@ -114,7 +114,7 @@ public function testAllowSessionStartWithForceSidInRequestAndDefaultConfig(): vo public function testAllowSessionStartWithForceSidInRequestAndDisabledConfig(): void { - $this->setParameter('oxid_disallow_force_session_id', true); + $this->setParameter('oxid_esales.disallow_force_session_id', true); $this->attachContainerToContainerFactory(); $utilsSever = $this->createMock(UtilsServer::class); Registry::set(UtilsServer::class, $utilsSever); @@ -194,7 +194,7 @@ public function testIsSidNeededWithForceSessionStart(): void { $this->assertFalse(oxNew(Session::class)->isSidNeeded()); - $this->setParameter('oxid_force_session_start', true); + $this->setParameter('oxid_esales.force_session_start', true); $this->attachContainerToContainerFactory(); $needSid = oxNew(Session::class)->isSidNeeded(); @@ -206,7 +206,7 @@ public function testIsSidNeededWithOxidCookiesSession(): void { $this->assertFalse(oxNew(Session::class)->isSidNeeded()); - $this->setParameter('oxid_cookies_session', false); + $this->setParameter('oxid_esales.cookies_session', false); $this->attachContainerToContainerFactory(); $needSid = oxNew(Session::class)->isSidNeeded(); @@ -248,7 +248,7 @@ public function testIsSidNeededWithSessionInitParamsAndParamNotInDefaults(): voi public function testIsSidNeededWithSessionInitParamsAndNewParam(): void { - $this->setParameter('oxid_session_init_params', [ + $this->setParameter('oxid_esales.session_init_params', [ 'cl' => [ 'abc' => true, ] @@ -263,7 +263,7 @@ public function testIsSidNeededWithSessionInitParamsAndNewParam(): void public function testIsSidNeededWithSessionInitParamsAndOverwrittenDefault(): void { - $this->setParameter('oxid_session_init_params', [ + $this->setParameter('oxid_esales.session_init_params', [ 'cl' => [ 'abc' => true, 'register' => false, @@ -280,7 +280,7 @@ public function testIsSidNeededWithSessionInitParamsAndOverwrittenDefault(): voi #[DataProvider('isSidNeededDefaultsDataProvider')] public function testIsSidNeededWithSessionInitParamsAndDefaultsUnchanged(string $param, string $value): void { - $this->setParameter('oxid_session_init_params', [ + $this->setParameter('oxid_esales.session_init_params', [ 'cl' => [ 'abc' => true, ], @@ -303,7 +303,7 @@ public function testIsSidNeededWithNonArrayValueWillSetAnyControllerAsRequiringS $this->assertFalse(oxNew(Session::class)->isSidNeeded()); - $this->setParameter('oxid_session_init_params', [ + $this->setParameter('oxid_esales.session_init_params', [ 'cl' => true, ]); $this->attachContainerToContainerFactory(); diff --git a/tests/Integration/Core/ShopControlTest.php b/tests/Integration/Core/ShopControlTest.php index 141ceaf9e5..4c756da668 100644 --- a/tests/Integration/Core/ShopControlTest.php +++ b/tests/Integration/Core/ShopControlTest.php @@ -23,7 +23,7 @@ final class ShopControlTest extends IntegrationTestCase public function testStartWithExceptionAndDisabledDebugModeWillRedirect(): void { $this->createContainer(); - $this->container->setParameter('oxid_debug_mode', false); + $this->container->setParameter('oxid_esales.debug_mode', false); $this->container->compile(); $this->attachContainerToContainerFactory(); $shopControl = $this->getMockBuilder(ShopControl::class) diff --git a/tests/Integration/Core/SystemRequirementsTest.php b/tests/Integration/Core/SystemRequirementsTest.php index 90de29280d..57b81448c0 100644 --- a/tests/Integration/Core/SystemRequirementsTest.php +++ b/tests/Integration/Core/SystemRequirementsTest.php @@ -20,7 +20,7 @@ final class SystemRequirementsTest extends IntegrationTestCase public function testGetPermissionIssuesList(): void { $this->createContainer(); - $this->container->setParameter('oxid_build_directory', 'some wrong directory'); + $this->container->setParameter('oxid_esales.build_directory', 'some wrong directory'); $this->container->compile(); $this->attachContainerToContainerFactory(); diff --git a/tests/Integration/Core/Utils/UtilsCacheTest.php b/tests/Integration/Core/Utils/UtilsCacheTest.php index ed279be351..dde734951b 100644 --- a/tests/Integration/Core/Utils/UtilsCacheTest.php +++ b/tests/Integration/Core/Utils/UtilsCacheTest.php @@ -49,7 +49,7 @@ public function testSeoIsActiveWithDefaultConfig(): void public function testSeoIsActiveWithModifiedConfig(): void { - $this->setParameter('oxid_seo_mode', false); + $this->setParameter('oxid_esales.seo_mode', false); $this->replaceContainerInstance(); $isActive = oxNew(Utils::class)->seoIsActive(); diff --git a/tests/Integration/Core/Utils/UtilsSearchEngineTest.php b/tests/Integration/Core/Utils/UtilsSearchEngineTest.php index 1fae643322..8295064264 100644 --- a/tests/Integration/Core/Utils/UtilsSearchEngineTest.php +++ b/tests/Integration/Core/Utils/UtilsSearchEngineTest.php @@ -32,8 +32,8 @@ public static function providerSearchEngineNoneAdminMode(): array #[DataProvider('providerSearchEngineNoneAdminMode')] public function testIsSearchEngineNonAdmin(bool $debug, array $robots, string $searchEngine, bool $expected): void { - $this->setParameter('oxid_debug_mode', $debug); - $this->setParameter('oxid_search_engine_list', $robots); + $this->setParameter('oxid_esales.debug_mode', $debug); + $this->setParameter('oxid_esales.search_engine_list', $robots); $this->attachContainerToContainerFactory(); $this->assertSame($expected, (new Utils())->isSearchEngine($searchEngine)); @@ -41,8 +41,8 @@ public function testIsSearchEngineNonAdmin(bool $debug, array $robots, string $s public function testIsSearchEngineAdminAndDebugOn(): void { - $this->setParameter('oxid_debug_mode', true); - $this->setParameter('oxid_search_engine_list', ['googlebot', 'xxx']); + $this->setParameter('oxid_esales.debug_mode', true); + $this->setParameter('oxid_esales.search_engine_list', ['googlebot', 'xxx']); $this->attachContainerToContainerFactory(); $utils = $this->getUtils(); diff --git a/tests/Integration/Core/UtilsFileTest.php b/tests/Integration/Core/UtilsFileTest.php index 276598443d..1ebc06c057 100644 --- a/tests/Integration/Core/UtilsFileTest.php +++ b/tests/Integration/Core/UtilsFileTest.php @@ -68,7 +68,7 @@ public function testProcessFileWithModifiedConfigAndDisallowedFileExtension(): v private function setAllowedFileExtensions(array $parameter): void { $this->createContainer(); - $this->container->setParameter('oxid_allowed_uploaded_types', $parameter); + $this->container->setParameter('oxid_esales.allowed_uploaded_types', $parameter); $this->compileContainer(); $this->attachContainerToContainerFactory(); } diff --git a/tests/Integration/Core/UtilsServerTest.php b/tests/Integration/Core/UtilsServerTest.php index c2fc88cc82..69cdf90473 100644 --- a/tests/Integration/Core/UtilsServerTest.php +++ b/tests/Integration/Core/UtilsServerTest.php @@ -52,7 +52,7 @@ public function testIsTrustedServerWithConfiguredIp(): void $someIp = '255.255.255.255'; $_SERVER['HTTP_CLIENT_IP'] = $someIp; $this->createContainer(); - $this->container->setParameter('oxid_trusted_ips', [$someIp]); + $this->container->setParameter('oxid_esales.trusted_ips', [$someIp]); $this->compileContainer(); $this->attachContainerToContainerFactory(); @@ -66,7 +66,7 @@ public function testIsTrustedServerWithNonTrustedIp(): void $someIp = '255.255.255.255'; $_SERVER['HTTP_CLIENT_IP'] = $someIp; $this->createContainer(); - $this->container->setParameter('oxid_trusted_ips', ['1.2.3.4', '5.6.7.8']); + $this->container->setParameter('oxid_esales.trusted_ips', ['1.2.3.4', '5.6.7.8']); $this->compileContainer(); $this->attachContainerToContainerFactory(); diff --git a/tests/Integration/Core/ViewConfigTest.php b/tests/Integration/Core/ViewConfigTest.php index 029571d32c..1e766abce1 100644 --- a/tests/Integration/Core/ViewConfigTest.php +++ b/tests/Integration/Core/ViewConfigTest.php @@ -30,7 +30,7 @@ public function setUp(): void public function testIsAltImageServerConfiguredWithEmptyParameter(): void { $this->createContainer(); - $this->container->setParameter('oxid_alternative_image_url', ''); + $this->container->setParameter('oxid_esales.alternative_image_url', ''); $this->compileContainer(); $this->attachContainerToContainerFactory(); @@ -42,7 +42,7 @@ public function testIsAltImageServerConfiguredWithEmptyParameter(): void public function testIsAltImageServerConfiguredWithNotEmptyParameter(): void { $this->createContainer(); - $this->container->setParameter('oxid_alternative_image_url', 'someValue'); + $this->container->setParameter('oxid_esales.alternative_image_url', 'someValue'); $this->compileContainer(); $this->attachContainerToContainerFactory(); diff --git a/tests/Integration/Internal/Framework/Console/ConsoleTest.php b/tests/Integration/Internal/Framework/Console/ConsoleTest.php index ac178f33b4..de5c2995c0 100644 --- a/tests/Integration/Internal/Framework/Console/ConsoleTest.php +++ b/tests/Integration/Internal/Framework/Console/ConsoleTest.php @@ -37,6 +37,6 @@ public function testConsoleWillParseEnvVariables(): void $this->runInConsoleAndAssertSuccess(''); - $this->assertEquals($envValue, $this->getParameter('oxid_value')); + $this->assertEquals($envValue, $this->getParameter('oxid_esales.value')); } } diff --git a/tests/Integration/Internal/Framework/Console/Fixtures/services.yaml b/tests/Integration/Internal/Framework/Console/Fixtures/services.yaml index afd260b0dd..53675f9bdd 100644 --- a/tests/Integration/Internal/Framework/Console/Fixtures/services.yaml +++ b/tests/Integration/Internal/Framework/Console/Fixtures/services.yaml @@ -1,2 +1,2 @@ parameters: - oxid_value: '%env(defined:OXID_VALUE)%' + oxid_esales.value: '%env(defined:OXID_VALUE)%' diff --git a/tests/Integration/Internal/Framework/Database/ConnectionFactoryTest.php b/tests/Integration/Internal/Framework/Database/ConnectionFactoryTest.php index a0ffbef5ae..5a62111ed8 100644 --- a/tests/Integration/Internal/Framework/Database/ConnectionFactoryTest.php +++ b/tests/Integration/Internal/Framework/Database/ConnectionFactoryTest.php @@ -68,7 +68,7 @@ private function setContainerForAdminLog(): void { $this->createContainer(); $this->injectContextMock(); - $this->container->setParameter('oxid_log_admin_queries', true); + $this->container->setParameter('oxid_esales.log_admin_queries', true); $this->compileContainer(); $this->attachContainerToContainerFactory(); } diff --git a/tests/Integration/Internal/Framework/Templating/Cache/MultiShopTemplateCacheServiceTest.php b/tests/Integration/Internal/Framework/Templating/Cache/MultiShopTemplateCacheServiceTest.php index 530c0fb0a6..66d4276032 100644 --- a/tests/Integration/Internal/Framework/Templating/Cache/MultiShopTemplateCacheServiceTest.php +++ b/tests/Integration/Internal/Framework/Templating/Cache/MultiShopTemplateCacheServiceTest.php @@ -69,7 +69,7 @@ private function stubContext(): void $this->container = (new TestContainerFactory())->create(); $this->container->set(ContextInterface::class, $context); - $this->container->setParameter('oxid_build_directory', $this->testFixturesDirectory); + $this->container->setParameter('oxid_esales.build_directory', $this->testFixturesDirectory); $this->container->autowire(ContextInterface::class, ContextInterface::class); $this->container->compile(); } diff --git a/tests/Integration/Internal/Framework/Theme/Command/ThemeActivateCommandTest.php b/tests/Integration/Internal/Framework/Theme/Command/ThemeActivateCommandTest.php index 39328a5a02..7d63241e6f 100644 --- a/tests/Integration/Internal/Framework/Theme/Command/ThemeActivateCommandTest.php +++ b/tests/Integration/Internal/Framework/Theme/Command/ThemeActivateCommandTest.php @@ -96,7 +96,7 @@ private function setShopFixtures(): void Registry::getConfig()->setConfigParam('sTheme', 'absolute-dummy-value'); $this->createContainer(); - $this->container->setParameter('oxid_shop_source_directory', "$this->fixtureDirectory/shop/source/"); + $this->container->setParameter('oxid_esales.shop_source_directory', "$this->fixtureDirectory/shop/source/"); $this->compileContainer(); $this->attachContainerToContainerFactory(); } diff --git a/tests/Integration/Internal/Transition/Adapter/TemplateLogic/ScriptLogicTest.php b/tests/Integration/Internal/Transition/Adapter/TemplateLogic/ScriptLogicTest.php index 94544e6a35..647284a809 100644 --- a/tests/Integration/Internal/Transition/Adapter/TemplateLogic/ScriptLogicTest.php +++ b/tests/Integration/Internal/Transition/Adapter/TemplateLogic/ScriptLogicTest.php @@ -29,7 +29,7 @@ public function setup(): void { parent::setUp(); $this->createContainer(); - $this->container->setParameter('oxid_debug_mode', true); + $this->container->setParameter('oxid_esales.debug_mode', true); $this->container->compile(); $this->attachContainerToContainerFactory(); @@ -40,7 +40,7 @@ public function setup(): void public function testIncludeFileNotExists(): void { $this->createContainer(); - $this->container->setParameter('oxid_debug_mode', false); + $this->container->setParameter('oxid_esales.debug_mode', false); $this->container->compile(); $this->attachContainerToContainerFactory(); diff --git a/tests/Integration/Internal/Transition/Utility/ContextTest.php b/tests/Integration/Internal/Transition/Utility/ContextTest.php index b67269e6bc..70edde16a2 100644 --- a/tests/Integration/Internal/Transition/Utility/ContextTest.php +++ b/tests/Integration/Internal/Transition/Utility/ContextTest.php @@ -43,7 +43,7 @@ public function testGetLogLevelWithEmptyEnvWillReturnDefault(): void public function testGetLogFilePathWithConfigSetWillReturnStringStartingWithValue(): void { - $configValue = ContainerFacade::getParameter('oxid_shop_source_directory'); + $configValue = ContainerFacade::getParameter('oxid_esales.shop_source_directory'); $logFilePath = $this->getContext()->getLogFilePath(); diff --git a/tests/Integration/Legacy/Application/Controller/Admin/NavigationTree/NavigationTreeDemoShopTest.php b/tests/Integration/Legacy/Application/Controller/Admin/NavigationTree/NavigationTreeDemoShopTest.php index 997c800282..8797f25353 100644 --- a/tests/Integration/Legacy/Application/Controller/Admin/NavigationTree/NavigationTreeDemoShopTest.php +++ b/tests/Integration/Legacy/Application/Controller/Admin/NavigationTree/NavigationTreeDemoShopTest.php @@ -37,7 +37,7 @@ public static function providerDisabledLinksRemoval(): array #[DataProvider('providerDisabledLinksRemoval')] public function testDisabledLinksRemoval(bool $isDemoShop, string $disabled, int $expected, string $msg): void { - $this->setParameter('oxid_demo_shop_mode', $isDemoShop); + $this->setParameter('oxid_esales.demo_shop_mode', $isDemoShop); $this->attachContainerToContainerFactory(); $navTree = oxNew('oxNavigationTree'); diff --git a/tests/Integration/Legacy/Application/Controller/FrontendController/FrontendComponentTest.php b/tests/Integration/Legacy/Application/Controller/FrontendController/FrontendComponentTest.php index e279377e19..b2d6859fcf 100644 --- a/tests/Integration/Legacy/Application/Controller/FrontendController/FrontendComponentTest.php +++ b/tests/Integration/Legacy/Application/Controller/FrontendController/FrontendComponentTest.php @@ -21,7 +21,7 @@ public function testGetComponentNames(): void { $componentName = get_class($this->getComponentClass()); - $this->setParameter('oxid_cacheable_user_components', [$componentName => 1]); + $this->setParameter('oxid_esales.cacheable_user_components', [$componentName => 1]); $this->attachContainerToContainerFactory(); $componentNames = [ diff --git a/tests/Integration/Legacy/Application/Controller/FrontendController/FrontendSearchEngineTest.php b/tests/Integration/Legacy/Application/Controller/FrontendController/FrontendSearchEngineTest.php index e557fbfb7d..b26f7df120 100644 --- a/tests/Integration/Legacy/Application/Controller/FrontendController/FrontendSearchEngineTest.php +++ b/tests/Integration/Legacy/Application/Controller/FrontendController/FrontendSearchEngineTest.php @@ -56,8 +56,8 @@ public function testRequestProcessingScenarios($productive, bool $seoLogging, bo Registry::getConfig()->setConfigParam('blProductive', $productive); $context = ContainerFacade::get(ContextInterface::class); - $this->setParameter('oxid_log_not_seo_urls', $seoLogging); - $this->setParameter('oxid_build_directory', $context->getCacheDirectory()); + $this->setParameter('oxid_esales.log_not_seo_urls', $seoLogging); + $this->setParameter('oxid_esales.build_directory', $context->getCacheDirectory()); $this->attachContainerToContainerFactory(); $frontend = $this->getFrontendSeoLoggingSpy(); diff --git a/tests/Integration/Legacy/Application/Model/UserTest.php b/tests/Integration/Legacy/Application/Model/UserTest.php index 51cc8e0d49..8165a772cb 100644 --- a/tests/Integration/Legacy/Application/Model/UserTest.php +++ b/tests/Integration/Legacy/Application/Model/UserTest.php @@ -23,7 +23,7 @@ public function testLoginLogoutAdminDemoShop(): void { $this->createAdminUser(); - $this->setParameter('oxid_demo_shop_mode', true); + $this->setParameter('oxid_esales.demo_shop_mode', true); Registry::getConfig()->setAdminMode(true); $user = oxNew(User::class); diff --git a/tests/Integration/Legacy/Core/UtilsFileLocalImagesHandlingTest.php b/tests/Integration/Legacy/Core/UtilsFileLocalImagesHandlingTest.php index 4c794944c8..8ee642a558 100644 --- a/tests/Integration/Legacy/Core/UtilsFileLocalImagesHandlingTest.php +++ b/tests/Integration/Legacy/Core/UtilsFileLocalImagesHandlingTest.php @@ -198,7 +198,7 @@ public function testProcessFilesSetsObjectValue(): void private function prepareTestDirectories(): void { - $this->someTmpDir = ContainerFacade::getParameter('oxid_build_directory'); + $this->someTmpDir = ContainerFacade::getParameter('oxid_esales.build_directory'); $pictureDir = Registry::getConfig()->getPictureDir(false); $uniqueFilename = uniqid('some_image_', true); $this->testFile = sprintf('%s.jpg', $uniqueFilename); diff --git a/tests/Integration/Legacy/Core/WidgetControlTest.php b/tests/Integration/Legacy/Core/WidgetControlTest.php index 320cb87041..d4fdfe7c16 100644 --- a/tests/Integration/Legacy/Core/WidgetControlTest.php +++ b/tests/Integration/Legacy/Core/WidgetControlTest.php @@ -20,7 +20,7 @@ final class WidgetControlTest extends IntegrationTestCase { public function testIfDoesNotAllowToInitiateNonWidgetClass(): void { - if (!ContainerFacade::getParameter('oxid_debug_mode')) { + if (!ContainerFacade::getParameter('oxid_esales.debug_mode')) { $this->markTestSkipped('Test works only in debug mode.'); } diff --git a/tests/Integration/Legacy/Multilanguage/AdditionalTablesTest.php b/tests/Integration/Legacy/Multilanguage/AdditionalTablesTest.php index dbc8881efe..4f10e802d2 100644 --- a/tests/Integration/Legacy/Multilanguage/AdditionalTablesTest.php +++ b/tests/Integration/Legacy/Multilanguage/AdditionalTablesTest.php @@ -78,7 +78,7 @@ private function createMultilanguageTable(): void DatabaseProvider::getDb()->execute($sql); $this->createContainer(); - $this->container->setParameter('oxid_multilingual_tables', ['addtest']); + $this->container->setParameter('oxid_esales.multilingual_tables', ['addtest']); $this->compileContainer(); $this->attachContainerToContainerFactory(); } diff --git a/tests/Integration/Legacy/Url/WidgetUrlTest.php b/tests/Integration/Legacy/Url/WidgetUrlTest.php index 679c1c9a78..c90079739b 100644 --- a/tests/Integration/Legacy/Url/WidgetUrlTest.php +++ b/tests/Integration/Legacy/Url/WidgetUrlTest.php @@ -25,7 +25,7 @@ public function setUp(): void parent::setUp(); $this->createContainer(); - $this->container->setParameter('oxid_shop_url', $this->shopUrl); + $this->container->setParameter('oxid_esales.shop_url', $this->shopUrl); $this->compileContainer(); $this->attachContainerToContainerFactory(); } diff --git a/tests/Unit/Internal/Framework/DIContainer/ContainerBuilderTest.php b/tests/Unit/Internal/Framework/DIContainer/ContainerBuilderTest.php index 5c5719d6d5..e734113a82 100644 --- a/tests/Unit/Internal/Framework/DIContainer/ContainerBuilderTest.php +++ b/tests/Unit/Internal/Framework/DIContainer/ContainerBuilderTest.php @@ -31,11 +31,7 @@ public function testContainerParametersAreSet(): void ); $this->assertEquals( $sourcePath, - $symfonyContainerBuilder->getParameter('oxid_shop_source_directory') - ); - $this->assertEquals( - $cachePath, - $symfonyContainerBuilder->getParameter('oxid_cache_directory') + $symfonyContainerBuilder->getParameter('oxid_esales.shop_source_directory') ); } }