feat: move env variables "str_starts_with"

Pascal Querner · Pascal Querner · commit f24bb9fae0bb · 2025-06-16T11:21:27.000+02:00
diff --git a/app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php b/app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php
@@ -190,7 +190,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;
     }
@@ -220,10 +224,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
`@@ -190,7 +190,11 @@ public function setEnvStore(array $envStorage): void`
`190`	`190`	`public function getEnv(): array`
`191`	`191`	`{`
`192`	`192`	`if (empty($this->envStore)) {`
`193`		`- $this->envStore = getenv();`
	`193`	`+ $env = getenv();`
	`194`	`+ $env = array_filter($env, function ($key) {`
	`195`	`+ return str_starts_with($key, static::ENV_STARTS_WITH);`
	`196`	`+ }, ARRAY_FILTER_USE_KEY);`
	`197`	`+ $this->envStore = $env;`
`194`	`198`	`}`
`195`	`199`	`return $this->envStore;`
`196`	`200`	`}`
`@@ -220,10 +224,6 @@ protected function getConfigKey(string $configKey): array`
`220`	`224`
`221`	`225`	`protected function isConfigKeyValid(string $configKey): bool`
`222`	`226`	`{`
`223`		`- if (!str_starts_with($configKey, static::ENV_STARTS_WITH)) {`
`224`		`- return false;`
`225`		`- }`
`226`		`-`
`227`	`227`	`$sectionGroupFieldRegexp = sprintf('([%s]*)', implode('', static::ALLOWED_CHARS));`
`228`	`228`	`$allowedChars = sprintf('[%s]', implode('', static::ALLOWED_CHARS));`
`229`	`229`	`$regexp = '/' . static::ENV_STARTS_WITH . static::ENV_KEY_SEPARATOR . '(WEBSITES' . static::ENV_KEY_SEPARATOR`