Skip to content

Commit 283ea75

Browse files
committed
Fix issue with child processes where $_ENV is not set
1 parent 34a674a commit 283ea75

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

src/Config.php

+14-5
Original file line numberDiff line numberDiff line change
@@ -235,14 +235,16 @@ public static function initEnv($directory = null)
235235
}
236236

237237
// Define main Yii environment variables
238-
if (getenv('YII_DEBUG') !== false) {
239-
define('YII_DEBUG', (bool)getenv('YII_DEBUG'));
238+
$debug = self::env('YII_DEBUG', false);
239+
if ($debug !== false) {
240+
define('YII_DEBUG', (bool)$debug);
240241
if (YII_DEBUG) {
241242
error_reporting(E_ALL);
242243
}
243244
}
244-
if (getenv('YII_ENV') !== false) {
245-
define('YII_ENV', getenv('YII_ENV'));
245+
$env = self::env('YII_ENV', false);
246+
if ($env !== false) {
247+
define('YII_ENV', $env);
246248
}
247249
}
248250

@@ -261,7 +263,14 @@ public static function env($name, $default = null, $required = false)
261263
if ($required) {
262264
\Dotenv::required($name);
263265
}
264-
return getenv($name) === false ? $default : getenv($name);
266+
if (array_key_exists($name, $_ENV)) {
267+
return $_ENV[$name];
268+
}
269+
if (array_key_exists($name, $_SERVER)) {
270+
return $_SERVER[$name];
271+
}
272+
$value = getenv($name);
273+
return $value === false ? $default : $value;
265274
}
266275

267276
}

0 commit comments

Comments
 (0)