envLoader: fix loading from scopes

Author: Pascal Querner

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

@@ -638,7 +638,9 @@ public function isOverwrittenByEnvVariable(string $path): bool
     {
         /** @var Mage_Core_Helper_EnvironmentConfigLoader $environmentConfigLoaderHelper */
         $environmentConfigLoaderHelper = Mage::helper('core/environmentConfigLoader');
-        $path = $this->getScope() . '/' . $path;
+        $store = Mage::app()->getRequest()->getParam('store');
+        $scope = $this->getScope();
+        $path = "$scope/$store/$path";
         return $environmentConfigLoaderHelper->hasPath($path);
     }
 

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

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

app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php

@@ -82,7 +82,7 @@ public function overrideEnvironment(Varien_Simplexml_Config $xmlConfig)
 
                 case static::CONFIG_KEY_WEBSITES:
                 case static::CONFIG_KEY_STORES:
-                    [$unused1, $unused2, $code, $section, $group, $field] = $configKeyParts;
+                    [$unused1, $unused2, $storeCode, $section, $group, $field] = $configKeyParts;
                     $path = $this->buildPath($section, $group, $field);
                     $storeCode = strtolower($storeCode);
                     $scope = strtolower($scope);
@@ -130,9 +130,11 @@ public function hasPath(string $wantedPath): bool
 
                 case static::CONFIG_KEY_WEBSITES:
                 case static::CONFIG_KEY_STORES:
-                    list($unused1, $unused2, $storeCode, $section, $group, $field) = $configKeyParts;
+                    [$unused1, $unused2, $storeCode, $section, $group, $field] = $configKeyParts;
                     $path = $this->buildPath($section, $group, $field);
-                    $nodePath = $this->buildNodePath($scope, $path);
+                    $storeCode = strtolower($storeCode);
+                    $scope = strtolower($scope);
+                    $nodePath = sprintf('%s/%s/%s', $scope, $storeCode, $path);
                     $config[$nodePath] = $value;
                     break;
             }
@@ -142,9 +144,9 @@ public function hasPath(string $wantedPath): bool
         return $hasConfig;
     }
 
-    public function getAsArray(string $wantedScope): array
+    public function getAsArray(string $wantedStore): array
     {
-        $data = Mage::registry("config_env_array_$wantedScope");
+        $data = Mage::registry("config_env_array_$wantedStore");
         if ($data !== null) {
             return $data;
         }
@@ -157,26 +159,20 @@ public function getAsArray(string $wantedScope): array
             }
 
             list($configKeyParts, $scope) = $this->getConfigKey($configKey);
-            if (strtolower($scope) !== strtolower($wantedScope)) {
-                continue;
-            }
 
             switch ($scope) {
-                case static::CONFIG_KEY_DEFAULT:
-                    list($unused1, $unused2, $section, $group, $field) = $configKeyParts;
-                    $path = $this->buildPath($section, $group, $field);
-                    $config[$path] = $value;
-                    break;
-
                 case static::CONFIG_KEY_WEBSITES:
                 case static::CONFIG_KEY_STORES:
-                    list($unused1, $unused2, $storeCode, $section, $group, $field) = $configKeyParts;
+                    [$unused1, $unused2, $storeCode, $section, $group, $field] = $configKeyParts;
+                    if (strtolower($storeCode) !== strtolower($wantedStore)) {
+                        break;
+                    }
                     $path = $this->buildPath($section, $group, $field);
                     $config[$path] = $value;
                     break;
             }
         }
-        Mage::register("config_env_array_$wantedScope", $config);
+        Mage::register("config_env_array_$wantedStore", $config);
         return $config;
     }
 
@@ -212,8 +208,11 @@ protected function setCache(Mage_Core_Model_Store $store, $value, string $path):
         $refProperty = $refObject->getProperty('_configCache');
         $refProperty->setAccessible(true);
         $configCache = $refProperty->getValue($store);
+        if (!is_array($configCache)) {
+            $configCache = [];
+        }
         $configCache[$path] = $value;
-        $refProperty->setValue($store, $configCache);
+        $store->setConfigCache($configCache);
     }
 
     protected function getConfigKey(string $configKey): array