OXDEV-7248 Rename and restructure DI parameters

OXID-eSales · Nov 8, 2024 · f0ea5cd · f0ea5cd
1 parent 164ab90
commit f0ea5cd
Show file tree

Hide file tree

Showing 87 changed files with 199 additions and 207 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'])) ? "<br>" : '') . Registry::getLang()->translateString('SETUP_CONFIGPERMISSIONS_WARNING');
         }

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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');
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,7 +73,7 @@ public function init() @@
                         }
                     }
                     $basketReservations->discardUnusedReservations(
-                        ContainerFacade::getParameter('oxid_basket_reservation_cleanup_rate')
+                        ContainerFacade::getParameter('oxid_esales.basket_reservation_cleanup_rate')
                     );
                 }
             }
@@ Expand Down @@