From 6d3b71cbd92c2c13293cd12c99bfa12620031003 Mon Sep 17 00:00:00 2001
From: ThomasJanda <info@reisacher-software.de>
Date: Wed, 4 Aug 2021 17:05:48 +0200
Subject: [PATCH] fixes

---
 .../Admin/rs_optimize_clear_cache.php         |  1 +
 Application/Model/ActionList.php              |  1 +
 Application/Model/ArticleList.php             |  1 +
 Application/Model/CategoryList.php            |  1 +
 Application/Model/ContentList.php             |  1 +
 Application/Model/CountryList.php             |  1 +
 Application/Model/DeliveryList.php            |  1 +
 Application/Model/DeliverySetList.php         |  1 +
 Application/Model/DiscountList.php            |  1 +
 Application/Model/ManufacturerList.php        |  1 +
 Application/Model/NewsList.php                |  1 +
 Application/Model/PaymentList.php             |  1 +
 Application/Model/ShopList.php                |  1 +
 Application/Model/VendorList.php              |  1 +
 Core/Optimize.php                             | 37 ++++++++++---------
 Core/OptimizeDb.php                           |  8 ++--
 Core/UtilsView.php                            |  2 +-
 Core/ViewHelper/JavaScriptRenderer.php        |  2 +
 Core/ViewHelper/StyleRenderer.php             |  1 +
 Model/ListModel.php                           |  1 +
 20 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/Application/Controller/Admin/rs_optimize_clear_cache.php b/Application/Controller/Admin/rs_optimize_clear_cache.php
index 12a0a2d..eb78ed6 100644
--- a/Application/Controller/Admin/rs_optimize_clear_cache.php
+++ b/Application/Controller/Admin/rs_optimize_clear_cache.php
@@ -18,6 +18,7 @@ public function getFileCount()
         {
             $aList = [];
 
+            /** @var \rs\optimize\Core\OptimizeDb $oOptimize */
             $oOptimize = oxNew(\rs\optimize\Core\OptimizeDb::class);
             $sPath = $oOptimize->getCacheDirectory();
 
diff --git a/Application/Model/ActionList.php b/Application/Model/ActionList.php
index 60b2b90..935ea52 100644
--- a/Application/Model/ActionList.php
+++ b/Application/Model/ActionList.php
@@ -15,6 +15,7 @@ public function selectString($sql, array $parameters = [])
         /**
          * @var \OxidEsales\Eshop\Core\Config          $oConfig
          * @var \OxidEsales\Eshop\Core\Model\ListModel $this
+         * @var \rs\optimize\Core\OptimizeDb $oOptimize
          */
         $oOptimize = oxNew(\rs\optimize\Core\OptimizeDb::class);
         $bDoCache = $oOptimize->shouldCache();
diff --git a/Application/Model/ArticleList.php b/Application/Model/ArticleList.php
index b890e5b..6277af9 100644
--- a/Application/Model/ArticleList.php
+++ b/Application/Model/ArticleList.php
@@ -14,6 +14,7 @@ public function selectString($sql, array $parameters = [])
         /**
          * @var \OxidEsales\Eshop\Core\Config          $oConfig
          * @var \OxidEsales\Eshop\Core\Model\ListModel $this
+         * @var \rs\optimize\Core\OptimizeDb $oOptimize
          */
         $oOptimize = oxNew(\rs\optimize\Core\OptimizeDb::class);
         $bDoCache = $oOptimize->shouldCache();
diff --git a/Application/Model/CategoryList.php b/Application/Model/CategoryList.php
index c932d72..c569847 100644
--- a/Application/Model/CategoryList.php
+++ b/Application/Model/CategoryList.php
@@ -17,6 +17,7 @@ class CategoryList extends CategoryList_parent
      */
     protected function _loadFromDb()
     {
+        /** @var \rs\optimize\Core\OptimizeDb $oOptimize */
         $oOptimize = oxNew(\rs\optimize\Core\OptimizeDb::class);
         $bDoCache = $oOptimize->shouldCache();
 
diff --git a/Application/Model/ContentList.php b/Application/Model/ContentList.php
index c69ce83..b51caaf 100644
--- a/Application/Model/ContentList.php
+++ b/Application/Model/ContentList.php
@@ -12,6 +12,7 @@ class ContentList extends ContentList_parent
 
     protected function _loadFromDb($iType)
     {
+        /** @var \rs\optimize\Core\OptimizeDb $oOptimize */
         $oOptimize = oxNew(\rs\optimize\Core\OptimizeDb::class);
         $bDoCache = $oOptimize->shouldCache();
 
diff --git a/Application/Model/CountryList.php b/Application/Model/CountryList.php
index 363e2ea..ff90eec 100644
--- a/Application/Model/CountryList.php
+++ b/Application/Model/CountryList.php
@@ -23,6 +23,7 @@ public function selectString($sql, array $parameters = [])
         /**
          * @var \OxidEsales\Eshop\Core\Config          $oConfig
          * @var \OxidEsales\Eshop\Core\Model\ListModel $this
+         * @var \rs\optimize\Core\OptimizeDb $oOptimize
          */
         $oOptimize = oxNew(\rs\optimize\Core\OptimizeDb::class);
         $bDoCache = $oOptimize->shouldCache();
diff --git a/Application/Model/DeliveryList.php b/Application/Model/DeliveryList.php
index 9ed783c..8e070e7 100644
--- a/Application/Model/DeliveryList.php
+++ b/Application/Model/DeliveryList.php
@@ -23,6 +23,7 @@ public function selectString($sql, array $parameters = [])
         /**
          * @var \OxidEsales\Eshop\Core\Config          $oConfig
          * @var \OxidEsales\Eshop\Core\Model\ListModel $this
+         * @var \rs\optimize\Core\OptimizeDb $oOptimize
          */
         $oOptimize = oxNew(\rs\optimize\Core\OptimizeDb::class);
         $bDoCache = $oOptimize->shouldCache();
diff --git a/Application/Model/DeliverySetList.php b/Application/Model/DeliverySetList.php
index 24351df..786c143 100644
--- a/Application/Model/DeliverySetList.php
+++ b/Application/Model/DeliverySetList.php
@@ -23,6 +23,7 @@ public function selectString($sql, array $parameters = [])
         /**
          * @var \OxidEsales\Eshop\Core\Config          $oConfig
          * @var \OxidEsales\Eshop\Core\Model\ListModel $this
+         * @var \rs\optimize\Core\OptimizeDb $oOptimize
          */
         $oOptimize = oxNew(\rs\optimize\Core\OptimizeDb::class);
         $bDoCache = $oOptimize->shouldCache();
diff --git a/Application/Model/DiscountList.php b/Application/Model/DiscountList.php
index 0435712..dc05990 100644
--- a/Application/Model/DiscountList.php
+++ b/Application/Model/DiscountList.php
@@ -23,6 +23,7 @@ public function selectString($sql, array $parameters = [])
         /**
          * @var \OxidEsales\Eshop\Core\Config          $oConfig
          * @var \OxidEsales\Eshop\Core\Model\ListModel $this
+         * @var \rs\optimize\Core\OptimizeDb $oOptimize
          */
         $oOptimize = oxNew(\rs\optimize\Core\OptimizeDb::class);
         $bDoCache = $oOptimize->shouldCache();
diff --git a/Application/Model/ManufacturerList.php b/Application/Model/ManufacturerList.php
index 5b6a9e4..fa78161 100644
--- a/Application/Model/ManufacturerList.php
+++ b/Application/Model/ManufacturerList.php
@@ -23,6 +23,7 @@ public function selectString($sql, array $parameters = [])
         /**
          * @var \OxidEsales\Eshop\Core\Config          $oConfig
          * @var \OxidEsales\Eshop\Core\Model\ListModel $this
+         * @var \rs\optimize\Core\OptimizeDb $oOptimize
          */
         $oOptimize = oxNew(\rs\optimize\Core\OptimizeDb::class);
         $bDoCache = $oOptimize->shouldCache();
diff --git a/Application/Model/NewsList.php b/Application/Model/NewsList.php
index 6dd47df..32780ea 100644
--- a/Application/Model/NewsList.php
+++ b/Application/Model/NewsList.php
@@ -23,6 +23,7 @@ public function selectString($sql, array $parameters = [])
         /**
          * @var \OxidEsales\Eshop\Core\Config          $oConfig
          * @var \OxidEsales\Eshop\Core\Model\ListModel $this
+         * @var \rs\optimize\Core\OptimizeDb $oOptimize
          */
         $oOptimize = oxNew(\rs\optimize\Core\OptimizeDb::class);
         $bDoCache = $oOptimize->shouldCache();
diff --git a/Application/Model/PaymentList.php b/Application/Model/PaymentList.php
index 4207cbc..92188d0 100644
--- a/Application/Model/PaymentList.php
+++ b/Application/Model/PaymentList.php
@@ -23,6 +23,7 @@ public function selectString($sql, array $parameters = [])
         /**
          * @var \OxidEsales\Eshop\Core\Config          $oConfig
          * @var \OxidEsales\Eshop\Core\Model\ListModel $this
+         * @var \rs\optimize\Core\OptimizeDb $oOptimize
          */
         $oOptimize = oxNew(\rs\optimize\Core\OptimizeDb::class);
         $bDoCache = $oOptimize->shouldCache();
diff --git a/Application/Model/ShopList.php b/Application/Model/ShopList.php
index 5bca4ac..6225427 100644
--- a/Application/Model/ShopList.php
+++ b/Application/Model/ShopList.php
@@ -23,6 +23,7 @@ public function selectString($sql, array $parameters = [])
         /**
          * @var \OxidEsales\Eshop\Core\Config          $oConfig
          * @var \OxidEsales\Eshop\Core\Model\ListModel $this
+         * @var \rs\optimize\Core\OptimizeDb $oOptimize
          */
         $oOptimize = oxNew(\rs\optimize\Core\OptimizeDb::class);
         $bDoCache = $oOptimize->shouldCache();
diff --git a/Application/Model/VendorList.php b/Application/Model/VendorList.php
index b0d951d..ea00698 100644
--- a/Application/Model/VendorList.php
+++ b/Application/Model/VendorList.php
@@ -23,6 +23,7 @@ public function selectString($sql, array $parameters = [])
         /**
          * @var \OxidEsales\Eshop\Core\Config          $oConfig
          * @var \OxidEsales\Eshop\Core\Model\ListModel $this
+         * @var \rs\optimize\Core\OptimizeDb $oOptimize
          */
         $oOptimize = oxNew(\rs\optimize\Core\OptimizeDb::class);
         $bDoCache = $oOptimize->shouldCache();
diff --git a/Core/Optimize.php b/Core/Optimize.php
index 7139ae7..bf4e636 100644
--- a/Core/Optimize.php
+++ b/Core/Optimize.php
@@ -20,7 +20,7 @@ protected function _getUniqueIdentifier($bViewClass=false)
         $sName = "_".md5(__CLASS__)."_RSOPTIMIZED";
         if($bViewClass)
         {
-            $ids = $this->getConfig()->getActiveViewsIds();
+            $ids = \OxidEsales\Eshop\Core\Registry::getConfig()->getActiveViewsIds();
             $sName = "_".reset($ids).$sName;
         }
 
@@ -44,7 +44,7 @@ protected function _deleteOldFiles($pattern)
      */
     protected function _convertToAbsolutePath($sUrl)
     {
-        $oConfig = $this->getConfig();
+        $oConfig = \OxidEsales\Eshop\Core\Registry::getConfig();
 
         $sTmp = $sUrl;
         $sTmp = str_replace($oConfig->getShopUrl(), "", $sTmp);
@@ -60,7 +60,7 @@ protected function _convertToAbsolutePath($sUrl)
      */
     protected function _convertToUrl($sPath)
     {
-        $oConfig = $this->getConfig();
+        $oConfig = \OxidEsales\Eshop\Core\Registry::getConfig();
 
         $sTmp = $sPath;
         $sTmp = str_replace($oConfig->getConfigParam('sShopDir'), "", $sTmp);
@@ -84,7 +84,7 @@ protected function _checkIfSameDomain($sUrl)
         $sUrl = strtolower($sUrl);
         if(substr($sUrl,0,5)==="http:" || substr($sUrl,0,6)==="https:")
         {
-            $oConfig = $this->getConfig();
+            $oConfig = \OxidEsales\Eshop\Core\Registry::getConfig();
             $sUrlLocal1 = strtolower(rtrim($oConfig->getShopUrl()??"","/"));
             $sUrlLocal2 = strtolower(rtrim($oConfig->getSslShopUrl()??"","/"));
             if(
@@ -117,14 +117,14 @@ protected function _compileCss($sPathSource, $isGroup)
 
         //compile scss
         if ($aPathInfo['extension'] == "scss") {
-            if ((bool)$this->getConfig()
+            if ((bool)\OxidEsales\Eshop\Core\Registry::getConfig()
                 ->getConfigParam('rs-optimize_compile_scss')
             ) {
                 $sSource = $this->_checkStyleScss($sSource, $aPathInfo['dirname']);
             }
         }
 
-        if((bool)$this->getConfig()->getConfigParam('rs-optimize_min_css_image'))
+        if((bool)\OxidEsales\Eshop\Core\Registry::getConfig()->getConfigParam('rs-optimize_min_css_image'))
         {
             $reg = "/(?:url\()(?!['\"]?(?:data|http))['\"]?([^'\"\)\s>]+)/";
             $sSource = preg_replace_callback($reg,function($match) use ($aPathInfo) {
@@ -148,7 +148,7 @@ protected function _compileCss($sPathSource, $isGroup)
 
 
         //minimize
-        if((bool)$this->getConfig()->getConfigParam('rs-optimize_min_css')
+        if((bool)\OxidEsales\Eshop\Core\Registry::getConfig()->getConfigParam('rs-optimize_min_css')
         ) {
             $sSource = $this->_checkStyleMinimize($sSource,
                 $aPathInfo['dirname']);
@@ -165,7 +165,7 @@ protected function _compileCss($sPathSource, $isGroup)
     protected function _getGroups($Suffix)
     {
         //group logic
-        $Groups = $this->getConfig()->getConfigParam('rs-optimize_group_css');
+        $Groups = \OxidEsales\Eshop\Core\Registry::getConfig()->getConfigParam('rs-optimize_group_css');
         if(!is_array($Groups))
             $Groups = [];
 
@@ -183,7 +183,7 @@ protected function _getGroups($Suffix)
                     if(!isset($tmpGroups[$GroupName]))
                     {
                         $tmpGroups[$GroupName]['settings']['group'] = true;
-                        $tmpGroups[$GroupName]['settings']['path'] = $this->getConfig()->getConfigParam('sShopDir')."out/".$GroupName.$Suffix;
+                        $tmpGroups[$GroupName]['settings']['path'] = \OxidEsales\Eshop\Core\Registry::getConfig()->getConfigParam('sShopDir')."out/".$GroupName.$Suffix;
                         $tmpGroups[$GroupName]['settings']['url'] = $this->_convertToUrl($tmpGroups[$GroupName]['settings']['path']);
                     }
                     $tmpGroups[$GroupName]['files'][]=$File;
@@ -204,14 +204,14 @@ protected function _getGroups($Suffix)
     public function checkStyle($aStyle)
     {
         if (
-                ((bool) $this->getConfig()->isAdmin() && !(bool)$this->getConfig()->getConfigParam('rs-optimize_min_css_admin'))
+                ((bool) \OxidEsales\Eshop\Core\Registry::getConfig()->isAdmin() && !(bool)\OxidEsales\Eshop\Core\Registry::getConfig()->getConfigParam('rs-optimize_min_css_admin'))
                 ||
-                ! (bool)$this->getConfig()->getConfigParam('rs-optimize_active_css')
+                ! (bool)\OxidEsales\Eshop\Core\Registry::getConfig()->getConfigParam('rs-optimize_active_css')
         ) {
             return $aStyle;
         }
 
-        $sSuffix = trim($this->getConfig()->getConfigParam('rs-optimize_suffix_css'));
+        $sSuffix = trim(\OxidEsales\Eshop\Core\Registry::getConfig()->getConfigParam('rs-optimize_suffix_css'));
         if ($sSuffix == "now") {
             $sSuffix = time();
         }
@@ -243,13 +243,13 @@ public function checkStyle($aStyle)
                 $sPathSource = $this->_convertToAbsolutePath($sUrlSource);
                 $sPathTarget = $sPathSource.".".md5($sPathSource).".".$sSuffix.$sSuffixFile;
                 $sUrlTarget = $this->_convertToUrl($sPathTarget);
-                $sPathShopRoot = substr($sPathSource,strlen($this->getConfig()->getConfigParam('sShopDir')));
+                $sPathShopRoot = substr($sPathSource,strlen(\OxidEsales\Eshop\Core\Registry::getConfig()->getConfigParam('sShopDir')));
 
                 //test if it is in a group
                 $bFound = false;
                 foreach($aGroups as $sGroupName => $aGroup)
                 {
-                    if(in_array($sPathShopRoot, $aGroup['files']))
+                    if(is_array($aGroup['files']) && in_array($sPathShopRoot, $aGroup['files']))
                     {
                         $item=[];
                         $item['pathSource']=$sPathSource;
@@ -371,6 +371,7 @@ public function checkScripts($aScript)
     {
         $sStyleFinish = [];
         foreach ($aScript as $prio => $aUrlSource) {
+            /** @var array $aUrlSource */
             foreach ($aUrlSource as $sUrlSource) {
                 $sUrlTarget = $this->checkScriptFile($sUrlSource);
                 $sStyleFinish[$prio][] = $sUrlTarget;
@@ -388,7 +389,7 @@ public function checkScripts($aScript)
     public function checkScriptFile($sUrlSource)
     {
 
-        if ( ! (bool)$this->getConfig()
+        if ( ! (bool)\OxidEsales\Eshop\Core\Registry::getConfig()
             ->getConfigParam('rs-optimize_active_js')
         ) {
             return $sUrlSource;
@@ -397,7 +398,7 @@ public function checkScriptFile($sUrlSource)
         if(!$this->_checkIfSameDomain($sUrlSource))
             return $sUrlSource;
 
-        $sSuffix = trim($this->getConfig()->getConfigParam('rs-optimize_suffix_js'));
+        $sSuffix = trim(\OxidEsales\Eshop\Core\Registry::getConfig()->getConfigParam('rs-optimize_suffix_js'));
         if ($sSuffix == "now") {
             $sSuffix = time();
         }
@@ -429,7 +430,7 @@ public function checkScriptFile($sUrlSource)
             $this->_deleteOldFiles($pattern);
 
             //minimize
-            if ((bool)$this->getConfig()->getConfigParam('rs-optimize_min_js')) {
+            if ((bool)\OxidEsales\Eshop\Core\Registry::getConfig()->getConfigParam('rs-optimize_min_js')) {
                 $sSource = $this->_checkJsMinimize($sSource,
                     $aPathInfo['dirname']);
             }
@@ -465,7 +466,7 @@ public function _checkJsMinimize($sSource, $sIncludePath)
      */
     public function checkScriptSnippets($aSource)
     {
-        if ( ! (bool)$this->getConfig()
+        if ( ! (bool)\OxidEsales\Eshop\Core\Registry::getConfig()
             ->getConfigParam('rs-optimize_active_js')
         ) {
             return $aSource;
diff --git a/Core/OptimizeDb.php b/Core/OptimizeDb.php
index ee6577e..71a9fb8 100644
--- a/Core/OptimizeDb.php
+++ b/Core/OptimizeDb.php
@@ -14,7 +14,7 @@ public function canObjectCache($sObjectInListName)
         //echo $sObjectInListName."<br>";
         $bDoCache1 = false;
         $bDoCache2 = false;
-        $oConfig = $this->getConfig();
+        $oConfig = \OxidEsales\Eshop\Core\Registry::getConfig();
 
         if((bool) $oConfig->getConfigParam('rs-optimize_display_names_in_shop_db'))
         {
@@ -76,7 +76,7 @@ public function canObjectCache($sObjectInListName)
     public function shouldCache()
     {
         $bDoCache = true;
-        $oConfig = $this->getConfig();
+        $oConfig = \OxidEsales\Eshop\Core\Registry::getConfig();
         if ($oConfig->isAdmin()) {
             $bDoCache = false;
         }
@@ -103,7 +103,7 @@ public function getCacheDirectory()
         /**
          * @var \OxidEsales\Eshop\Core\Config $oConfig
          */
-        $oConfig = $this->getConfig();
+        $oConfig = \OxidEsales\Eshop\Core\Registry::getConfig();
 
         $sPath = $oConfig->getConfigParam('sCompileDir')."rs-optimize";
         @mkdir($sPath);
@@ -118,7 +118,7 @@ protected function _getPath()
         /**
          * @var \OxidEsales\Eshop\Core\Config $oConfig
          */
-        $oConfig = $this->getConfig();
+        $oConfig = \OxidEsales\Eshop\Core\Registry::getConfig();
 
         $sSuffix = $oConfig->getConfigParam('rs-optimize_suffix_db');
         if($sSuffix == "now")
diff --git a/Core/UtilsView.php b/Core/UtilsView.php
index 894c852..c7ea1ca 100644
--- a/Core/UtilsView.php
+++ b/Core/UtilsView.php
@@ -13,7 +13,7 @@ public function getSmarty($blReload = false)
     {
         $oSmarty = parent::getSmarty($blReload);
 
-        if ((bool)$this->getConfig()->getConfigParam('rs-optimize_minimize_html'))
+        if ((bool)\OxidEsales\Eshop\Core\Registry::getConfig()->getConfigParam('rs-optimize_minimize_html'))
         {
             $oSmarty->load_filter('output', 'trimwhitespace');
         }
diff --git a/Core/ViewHelper/JavaScriptRenderer.php b/Core/ViewHelper/JavaScriptRenderer.php
index fefa008..7b8ec67 100644
--- a/Core/ViewHelper/JavaScriptRenderer.php
+++ b/Core/ViewHelper/JavaScriptRenderer.php
@@ -12,6 +12,7 @@ class JavaScriptRenderer extends JavaScriptRenderer_parent
 {
     protected function formFilesOutput($includes, $widget)
     {
+        /** @var \rs\optimize\Core\OptimizeDb $oOptimize */
         $oOptimize = oxNew(\rs\optimize\Core\Optimize::class);
         $includes = $oOptimize->checkScripts($includes);
 
@@ -20,6 +21,7 @@ protected function formFilesOutput($includes, $widget)
 
     protected function formSnippetsOutput($scripts, $widgetName, $ajaxRequest)
     {
+        /** @var \rs\optimize\Core\OptimizeDb $oOptimize */
         $oOptimize = oxNew(\rs\optimize\Core\Optimize::class);
         $scripts = $oOptimize->checkScriptSnippets($scripts);
 
diff --git a/Core/ViewHelper/StyleRenderer.php b/Core/ViewHelper/StyleRenderer.php
index b6a1fe2..7aad807 100644
--- a/Core/ViewHelper/StyleRenderer.php
+++ b/Core/ViewHelper/StyleRenderer.php
@@ -12,6 +12,7 @@ class StyleRenderer extends StyleRenderer_parent
 {
     protected function formStylesOutput($styles)
     {
+        /** @var \rs\optimize\Core\OptimizeDb $oOptimize */
         $oOptimize = oxNew(\rs\optimize\Core\Optimize::class);
         $styles = $oOptimize->checkStyle($styles);
 
diff --git a/Model/ListModel.php b/Model/ListModel.php
index b7aedff..27e8c27 100644
--- a/Model/ListModel.php
+++ b/Model/ListModel.php
@@ -23,6 +23,7 @@ public function selectString($sql, array $parameters = [])
         /**
          * @var \OxidEsales\Eshop\Core\Config $oConfig
          * @var \OxidEsales\Eshop\Core\Model\ListModel $this
+         * @var \rs\optimize\Core\OptimizeDb $oOptimize
          */
         $oOptimize = oxNew(\rs\optimize\Core\OptimizeDb::class);
         $bDoCache = $oOptimize->shouldCache();