Skip to content

Account for existing env() methods and use them as a default where po… #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 24, 2021
Merged

Account for existing env() methods and use them as a default where po… #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/Configuration/DotEnvConfiguration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,14 @@ public function __construct($path = '.')
*/
private function env($key, $default = null)
{
$value = $_ENV[$key] ?? null;

// Fallback for frameworks like Laravel as the $_ENV method might not work in all
// circumstances. ie when running scheduled jobs.
if (function_exists('env') && is_callable('env')) {
$value = call_user_func('env', $key) ?? null;
} else {
$value = $_ENV[$key] ?? null;
}

if ($value === false) {
return $default;
Expand Down