Refactor

OpenMage · Oct 8, 2024 · ec2c8a9 · ec2c8a9
1 parent cd03fc9
commit ec2c8a9
Show file tree

Hide file tree

Showing 7 changed files with 208 additions and 160 deletions.
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php
@@ -55,6 +55,15 @@ public function render(Varien_Data_Form_Element_Abstract $element)
             $checkboxLabel = $this->__('Use Default');
         }
 
+        $envConfig = Mage::getConfig()->getEnvOverriddenConfigPaths();
+        $envConfigIds = array_combine(str_replace('/', '_', array_keys($envConfig)), array_values($envConfig), );
+        if (array_key_exists($element->getId(), $envConfigIds)) {
+            $addInheritCheckbox = false;
+            $element->setDisabled(true);
+            $element->setScopeLabel('[ENV]]');
+            $element->setValue($envConfigIds[$element->getId()]);
+        }
+
         if ($addInheritCheckbox) {
             $inherit = $element->getInherit() == 1 ? 'checked="checked"' : '';
             if ($inherit) {

diff --git a/app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php b/app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php
@@ -56,6 +56,10 @@ class Mage_Core_Helper_EnvironmentConfigLoader extends Mage_Core_Helper_Abstract
      */
     public function overrideEnvironment(Varien_Simplexml_Config $xmlConfig)
     {
+        if (!$xmlConfig instanceof Mage_Core_Model_Config) {
+//            return;
+        }
+
         $env = $this->getEnv();
 
         foreach ($env as $configKey => $value) {
@@ -66,20 +70,25 @@ public function overrideEnvironment(Varien_Simplexml_Config $xmlConfig)
             list($configKeyParts, $scope) = $this->getConfigKey($configKey);
 
             switch ($scope) {
+                default:
                 case static::CONFIG_KEY_DEFAULT:
                     list($unused1, $unused2, $section, $group, $field) = $configKeyParts;
                     $path = $this->buildPath($section, $group, $field);
-                    $xmlConfig->setNode($this->buildNodePath($scope, $path), $value);
+                    $nodePath = $this->buildNodePath($scope, $path);
+                    $xmlConfig->setNode('stores/' . $nodePath, $value);
                     break;
 
                 case static::CONFIG_KEY_WEBSITES:
                 case static::CONFIG_KEY_STORES:
                     list($unused1, $unused2, $code, $section, $group, $field) = $configKeyParts;
                     $path = $this->buildPath($section, $group, $field);
                     $nodePath = sprintf('%s/%s/%s', strtolower($scope), strtolower($code), $path);
-                    $xmlConfig->setNode($nodePath, $value);
                     break;
             }
+
+            $xmlConfig->addEnvOverriddenConfigPaths($path, $value);
+            $xmlConfig->addEnvOverriddenConfigPaths($nodePath, $value);
+            $xmlConfig->setNode($nodePath, $value);
         }
     }
 
@@ -94,6 +103,7 @@ public function setEnvStore(array $envStorage): void
     public function getEnv(): array
     {
         if (empty($this->envStore)) {
+            // phpcs:ignore Ecg.Security.ForbiddenFunction.Found
             $this->envStore = getenv();
         }
         return $this->envStore;
@@ -144,5 +154,6 @@ protected function buildPath(string $section, string $group, string $field): str
     protected function buildNodePath(string $scope, string $path): string
     {
         return strtolower($scope) . '/' . $path;
+//        return 'stores/' . strtolower($scope) . '/' . $path;
     }
 }
diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php
@@ -249,6 +249,11 @@ class Mage_Core_Model_Config extends Mage_Core_Model_Config_Base
      */
     protected $_allowedModules = [];
 
+    /**
+     * Config paths overloaded by ENV
+     */
+    protected array $envOverriddenConfigPaths = [];
+
     /**
      * Class construct
      *
@@ -739,7 +744,7 @@ public function getSectionNode($path)
      * Returns node found by the $path and scope info
      *
      * @inheritDoc
-     * @return Mage_Core_Model_Config_Element
+     * @return Mage_Core_Model_Config_Element|false
      */
     public function getNode($path = null, $scope = '', $scopeCode = null)
     {
@@ -1822,4 +1827,15 @@ protected function _isNodeNameHasUpperCase(Mage_Core_Model_Config_Element $event
     {
         return (strtolower($event->getName()) !== (string)$event->getName());
     }
+
+    public function getEnvOverriddenConfigPaths(): array
+    {
+        return $this->envOverriddenConfigPaths;
+    }
+
+    public function addEnvOverriddenConfigPaths(string $path, string $value): Mage_Core_Model_Config
+    {
+        $this->envOverriddenConfigPaths[$path] = $value;
+        return $this;
+    }
 }
diff --git a/app/code/core/Mage/Core/Model/Store.php b/app/code/core/Mage/Core/Model/Store.php
@@ -337,13 +337,22 @@ public function getCode()
      */
     public function getConfig($path)
     {
+        $config = Mage::getConfig();
+        $fullPath = 'stores/' . $this->getCode() . '/' . $path;
+
+        $envConfig = $config->getEnvOverriddenConfigPaths();
+        if (array_key_exists($fullPath, $envConfig)) {
+            return $envConfig[$fullPath];
+        }
+
+        if (array_key_exists($path, $envConfig)) {
+            return $envConfig[$path];
+        }
+
         if (isset($this->_configCache[$path])) {
             return $this->_configCache[$path];
         }
 
-        $config = Mage::getConfig();
-
-        $fullPath = 'stores/' . $this->getCode() . '/' . $path;
         $data = $config->getNode($fullPath);
         if (!$data && !Mage::isInstalled()) {
             $data = $config->getNode('default/' . $path);

diff --git a/lib/Varien/Data/Form/Element/Abstract.php b/lib/Varien/Data/Form/Element/Abstract.php
@@ -29,6 +29,8 @@
  * @method bool getNoSpan()
  * @method $this setName(string $value)
  * @method bool getRequired()
+ * @method string getScopeLabel()
+ * @method $this setScopeLabel(string $value)
  * @method string getValue()
  * @method array getValues()
  * @method $this setValues(array|int|string $value)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -25,6 +25,21 @@
         </testsuite>
     </testsuites>
 
+    <php>
+        <env name="OPENMAGE_CONFIG__DEFAULT__GENERAL__STORE_INFORMATION__NAME" value="ENV default"/>
+        <env name="OPENMAGE_CONFIG__DEFAULT__GENERAL__FOO-BAR__NAME" value="ENV default dashes"/>
+        <env name="OPENMAGE_CONFIG__DEFAULT__GENERAL__FOO_BAR__NAME" value="ENV default underscore"/>
+        <env name="OPENMAGE_CONFIG__DEFAULT__GENERAL__ST" value="ENV default invalid"/>
+        <env name="OPENMAGE_CONFIG__WEBSITES__BASE__GENERAL__STORE_INFORMATION__NAME" value="ENV website"/>
+        <env name="OPENMAGE_CONFIG__WEBSITES__BASE-AT__GENERAL__STORE_INFORMATION__NAME" value="ENV website dashes"/>
+        <env name="OPENMAGE_CONFIG__WEBSITES__BASE_CH__GENERAL__STORE_INFORMATION__NAME" value="ENV website underscore"/>
+        <env name="OPENMAGE_CONFIG__WEBSITES__BASE__GENERAL__ST" value="ENV website invalid"/>
+        <env name="OPENMAGE_CONFIG__STORES__GERMAN__GENERAL__STORE_INFORMATION__NAME" value="ENV store"/>
+        <env name="OPENMAGE_CONFIG__STORES__GERMAN-AT__GENERAL__STORE_INFORMATION__NAME" value="ENV store dashes"/>
+        <env name="OPENMAGE_CONFIG__STORES__GERMAN_CH__GENERAL__STORE_INFORMATION__NAME" value="ENV store underscore"/>
+        <env name="OPENMAGE_CONFIG__STORES__GERMAN__GENERAL__ST" value="ENV store invalid"/>
+    </php>
+
     <coverage
         includeUncoveredFiles="true"
         processUncoveredFiles="false"