feat: move env variables "str_starts_with"

Pascal Querner · Pascal Querner · commit 99a4836a6269 · 2025-02-17T22:17:29.000+01:00
diff --git a/app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php b/app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php
@@ -197,7 +197,11 @@ public function setEnvStore(array $envStorage): void
     public function getEnv(): array
     {
         if (empty($this->envStore)) {
-            $this->envStore = getenv();
+            $env = getenv();
+            $env = array_filter($env, function ($key) {
+                return str_starts_with($key, static::ENV_STARTS_WITH);
+            }, ARRAY_FILTER_USE_KEY);
+            $this->envStore = $env;
         }
         return $this->envStore;
     }
@@ -227,10 +231,6 @@ protected function getConfigKey(string $configKey): array
 
     protected function isConfigKeyValid(string $configKey): bool
     {
-        if (!str_starts_with($configKey, static::ENV_STARTS_WITH)) {
-            return false;
-        }
-
         $sectionGroupFieldRegexp = sprintf('([%s]*)', implode('', static::ALLOWED_CHARS));
         $allowedChars = sprintf('[%s]', implode('', static::ALLOWED_CHARS));
         $regexp = '/' . static::ENV_STARTS_WITH . static::ENV_KEY_SEPARATOR . '(WEBSITES' . static::ENV_KEY_SEPARATOR

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,11 @@ public function setEnvStore(array $envStorage): void`
`197`	`197`	`public function getEnv(): array`
`198`	`198`	`{`
`199`	`199`	`if (empty($this->envStore)) {`
`200`		`- $this->envStore = getenv();`
	`200`	`+ $env = getenv();`
	`201`	`+ $env = array_filter($env, function ($key) {`
	`202`	`+ return str_starts_with($key, static::ENV_STARTS_WITH);`
	`203`	`+ }, ARRAY_FILTER_USE_KEY);`
	`204`	`+ $this->envStore = $env;`
`201`	`205`	`}`
`202`	`206`	`return $this->envStore;`
`203`	`207`	`}`
`@@ -227,10 +231,6 @@ protected function getConfigKey(string $configKey): array`
`227`	`231`
`228`	`232`	`protected function isConfigKeyValid(string $configKey): bool`
`229`	`233`	`{`
`230`		`- if (!str_starts_with($configKey, static::ENV_STARTS_WITH)) {`
`231`		`- return false;`
`232`		`- }`
`233`		`-`
`234`	`234`	`$sectionGroupFieldRegexp = sprintf('([%s]*)', implode('', static::ALLOWED_CHARS));`
`235`	`235`	`$allowedChars = sprintf('[%s]', implode('', static::ALLOWED_CHARS));`
`236`	`236`	`$regexp = '/' . static::ENV_STARTS_WITH . static::ENV_KEY_SEPARATOR . '(WEBSITES' . static::ENV_KEY_SEPARATOR`