Fix environment loader

.github/workflows/cypress.yml

@@ -21,7 +21,7 @@ jobs:
           autostart: false
 
       # install DDEV configuration
-      - run: ddev config --project-type=magento --php-version=8.1 --webserver-type=${{ matrix.webserver }} --web-environment="MAGE_IS_DEVELOPER_MODE=1"
+      - run: ddev config --project-type=magento --php-version=8.1 --webserver-type=${{ matrix.webserver }} --web-environment="MAGE_IS_DEVELOPER_MODE=1,OPENMAGE_CONFIG_OVERRIDE_ALLOWED=1,OPENMAGE_CONFIG__DEFAULT__GENERAL__STORE_INFORMATION__NAME=ENV name default,OPENMAGE_CONFIG__WEBSITES__BASE__GENERAL__STORE_INFORMATION__PHONE=ENV phone website,OPENMAGE_CONFIG__STORES__GERMAN__GENERAL__STORE_INFORMATION__ADDRESS=ENV address store"
 
       # install composer dependencies
       - run: ddev composer install

app/code/core/Mage/Adminhtml/Block/System/Config/Form.php

@@ -20,6 +20,8 @@ class Mage_Adminhtml_Block_System_Config_Form extends Mage_Adminhtml_Block_Widge
 
     public const SCOPE_STORES   = 'stores';
 
+    public const SCOPE_ENV      = 'env';
+
     /**
      * Config data array
      *
@@ -73,6 +75,7 @@ public function __construct()
             self::SCOPE_DEFAULT  => Mage::helper('adminhtml')->__('[GLOBAL]'),
             self::SCOPE_WEBSITES => Mage::helper('adminhtml')->__('[WEBSITE]'),
             self::SCOPE_STORES   => Mage::helper('adminhtml')->__('[STORE VIEW]'),
+            self::SCOPE_ENV      => Mage::helper('adminhtml')->__('[ENV]'),
         ];
     }
 
@@ -380,7 +383,7 @@ public function initFields($fieldset, $group, $section, $fieldPrefix = '', $labe
                     }
                 }
 
-                $field = $fieldset->addField($id, $fieldType, [
+                $elementFieldData = [
                     'name'                  => $name,
                     'label'                 => $label,
                     'comment'               => $comment,
@@ -396,7 +399,15 @@ public function initFields($fieldset, $group, $section, $fieldPrefix = '', $labe
                     'scope_label'           => $this->getScopeLabel($element),
                     'can_use_default_value' => $this->canUseDefaultValue((int) $element->show_in_default),
                     'can_use_website_value' => $this->canUseWebsiteValue((int) $element->show_in_website),
-                ]);
+                ];
+                if ($this->isOverwrittenByEnvVariable($path)) {
+                    $elementFieldData['scope_label'] = $this->_scopeLabels[self::SCOPE_ENV];
+                    $elementFieldData['disabled'] = 1;
+                    $elementFieldData['can_use_default_value'] = 0;
+                    $elementFieldData['can_use_website_value'] = 0;
+                }
+
+                $field = $fieldset->addField($id, $fieldType, $elementFieldData);
                 $this->_prepareFieldOriginalData($field, $element);
 
                 if (isset($element->validate)) {
@@ -645,6 +656,32 @@ public function getScope()
         return $scope;
     }
 
+    /**
+     * Returns true if element was overwritten by ENV variable
+     */
+    public function isOverwrittenByEnvVariable(string $path): bool
+    {
+        /** @var Mage_Core_Helper_EnvironmentConfigLoader $environmentConfigLoaderHelper */
+        $environmentConfigLoaderHelper = Mage::helper('core/environmentConfigLoader');
+
+        $scope      = $this->getScope();
+        $store      = Mage::app()->getRequest()->getParam('store');
+        $website    = Mage::app()->getRequest()->getParam('website');
+
+        if ($store && $website) {
+            $path = "$scope/$store/$path";
+            return $environmentConfigLoaderHelper->hasPath($path);
+        }
+
+        if ($website) {
+            $path = "$scope/$website/$path";
+            return $environmentConfigLoaderHelper->hasPath($path);
+        }
+
+        $path = "$scope/$path";
+        return $environmentConfigLoaderHelper->hasPath($path);
+    }
+
     /**
      * Retrieve label for scope
      *

app/code/core/Mage/Adminhtml/Model/Config/Data.php

@@ -355,6 +355,14 @@ protected function _getPathConfig($path, $full = true)
             }
         }
 
+        if (!$full) {
+            /** @var Mage_Core_Helper_EnvironmentConfigLoader $environmentConfigLoaderHelper */
+            $environmentConfigLoaderHelper = Mage::helper('core/environmentConfigLoader');
+            $store = $this->getStore();
+            $envConfig = $environmentConfigLoaderHelper->getAsArray($store);
+            $config = array_merge($config, $envConfig);
+        }
+
         return $config;
     }