Prefix calls to getenv() during config resolution

paulbalandan · web-flow · commit 266401cedfe1 · 2021-04-12T21:50:22.000+08:00
diff --git a/system/Config/BaseConfig.php b/system/Config/BaseConfig.php
@@ -134,6 +134,7 @@ protected function initEnvValue(&$property, string $name, string $prefix, string
 	protected function getEnvValue(string $property, string $prefix, string $shortPrefix)
 	{
 		$shortPrefix = ltrim($shortPrefix, '\\');
+
 		switch (true)
 		{
 			case array_key_exists("{$shortPrefix}.{$property}", $_ENV):
@@ -145,7 +146,9 @@ protected function getEnvValue(string $property, string $prefix, string $shortPr
 			case array_key_exists("{$prefix}.{$property}", $_SERVER):
 				return $_SERVER["{$prefix}.{$property}"];
 			default:
-				$value = getenv($property);
+				$value = getenv("{$shortPrefix}.{$property}");
+				$value = $value === false ? getenv("{$prefix}.{$property}") : $value;
+
 				return $value === false ? null : $value;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,7 @@ protected function initEnvValue(&$property, string $name, string $prefix, string`
`134`	`134`	`protected function getEnvValue(string $property, string $prefix, string $shortPrefix)`
`135`	`135`	`{`
`136`	`136`	`$shortPrefix = ltrim($shortPrefix, '\\');`
	`137`	`+`
`137`	`138`	`switch (true)`
`138`	`139`	`{`
`139`	`140`	`case array_key_exists("{$shortPrefix}.{$property}", $_ENV):`
`@@ -145,7 +146,9 @@ protected function getEnvValue(string $property, string $prefix, string $shortPr`
`145`	`146`	`case array_key_exists("{$prefix}.{$property}", $_SERVER):`
`146`	`147`	`return $_SERVER["{$prefix}.{$property}"];`
`147`	`148`	`default:`
`148`		`- $value = getenv($property);`
	`149`	`+ $value = getenv("{$shortPrefix}.{$property}");`
	`150`	`+ $value = $value === false ? getenv("{$prefix}.{$property}") : $value;`
	`151`	`+`
`149`	`152`	`return $value === false ? null : $value;`
`150`	`153`	`}`
`151`	`154`	`}`