envLoader: fix tests, fix scope default

Author: Pascal Querner

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

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

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

@@ -146,6 +146,9 @@ public function hasPath(string $wantedPath): bool
 
     public function getAsArray(string $wantedStore): array
     {
+        if (empty($wantedStore)) {
+            $wantedStore = 'default';
+        }
         $data = Mage::registry("config_env_array_$wantedStore");
         if ($data !== null) {
             return $data;
@@ -161,6 +164,11 @@ public function getAsArray(string $wantedStore): array
             list($configKeyParts, $scope) = $this->getConfigKey($configKey);
 
             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:
                     [$unused1, $unused2, $storeCode, $section, $group, $field] = $configKeyParts;

tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php

@@ -114,20 +114,24 @@ public function testEnvOverridesForValidConfigKeys(array $config): void
         $xml = new Varien_Simplexml_Config();
         $xml->loadString($xmlStruct);
 
+
         $loader = new Mage_Core_Helper_EnvironmentConfigLoader();
         /** @phpstan-ignore method.internal */
         $loader->setEnvStore([
             'OPENMAGE_CONFIG_OVERRIDE_ALLOWED' => 1,
             $config['env_path'] => $config['value'],
         ]);
+        Mage::unregister('current_env_config');
         $loader->overrideEnvironment($xml);
 
         $configPath = $config['xml_path'];
         $defaultValue = $xmlDefault->getNode($configPath);
         $valueAfterOverride = $xml->getNode($configPath);
 
         // assert
-        static::assertNotSame((string) $defaultValue, (string) $valueAfterOverride, 'Default value was not overridden.');
+        $expected = (string) $defaultValue;
+        $actual = (string) $valueAfterOverride;
+        static::assertNotSame($expected, $actual, 'Default value was not overridden.');
     }
 
     public function envOverridesCorrectConfigKeysDataProvider(): Generator
@@ -216,35 +220,36 @@ public function testAsArray(array $config): void
             'OPENMAGE_CONFIG_OVERRIDE_ALLOWED' => 1,
             $config['env_path'] => 1,
         ]);
-        $actual = $loader->getAsArray($config['scope']);
+        $store = $config['store'];
+        $actual = $loader->getAsArray($store);
         $expected = $config['expected'];
         static::assertSame($expected, $actual);
     }
 
     public function envAsArrayDataProvider(): Generator
     {
-        yield 'defaultScope' => [
+        yield 'default' => [
             [
                 'env_path'  => 'OPENMAGE_CONFIG__DEFAULT__GENERAL__STORE_INFORMATION__NAME',
-                'scope'  => 'default',
+                'store'  => '', // or 'default', which will be used internally, but this is how \Mage_Adminhtml_Model_Config_Data::_validate defines it
                 'expected'  => [
                     'general/store_information/name' => 1,
                 ],
             ],
         ];
-        yield 'storeScope' => [
+        yield 'store' => [
             [
                 'env_path'  => 'OPENMAGE_CONFIG__STORES__GERMAN__GENERAL__STORE_INFORMATION__NAME',
-                'scope'  => 'stores',
+                'store'  => 'german',
                 'expected'  => [
                     'general/store_information/name' => 1,
                 ],
             ],
         ];
-        yield 'invalidScope' => [
+        yield 'invalidStore' => [
             [
                 'env_path'  => '',
-                'scope'  => 'foo',
+                'store'  => 'foo',
                 'expected'  => [],
             ],
         ];
@@ -283,7 +288,7 @@ public function envHasPathDataProvider(): Generator
         yield 'hasPath store' => [
             [
                 'env_path'  => 'OPENMAGE_CONFIG__STORES__GERMAN__GENERAL__STORE_INFORMATION__NAME',
-                'xml_path'  => 'stores/general/store_information/name',
+                'xml_path'  => 'stores/german/general/store_information/name',
                 'expected'  => true,
             ],
         ];
@@ -313,11 +318,14 @@ public function testEnvDoesNotOverrideForInvalidConfigKeys(array $config): void
         $xml->loadString($xmlStruct);
 
         $defaultValue = 'test_default';
-        static::assertSame($defaultValue, (string) $xml->getNode(self::XML_PATH_DEFAULT));
+        $actual = (string) $xml->getNode(self::XML_PATH_DEFAULT);
+        static::assertSame($defaultValue, $actual);
         $defaultWebsiteValue = 'test_website';
-        static::assertSame($defaultWebsiteValue, (string) $xml->getNode(self::XML_PATH_WEBSITE));
+        $actual = (string) $xml->getNode(self::XML_PATH_WEBSITE);
+        static::assertSame($defaultWebsiteValue, $actual);
         $defaultStoreValue = 'test_store';
-        static::assertSame($defaultStoreValue, (string) $xml->getNode(self::XML_PATH_STORE));
+        $actual = (string) $xml->getNode(self::XML_PATH_STORE);
+        static::assertSame($defaultStoreValue, $actual);
 
         $loader = new Mage_Core_Helper_EnvironmentConfigLoader();
         /** @phpstan-ignore method.internal */