Skip to content
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

Jump to bottom

Use ->loadEnv() instead of ->load() to support the 'standard' Symfony… #1974

Merged
merged 4 commits into from
Oct 14, 2020
Merged

Use ->loadEnv() instead of ->load() to support the 'standard' Symfony… #1974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3cca417
Use ->loadEnv() instead of ->load() to support the 'standard' Symfony…
simongroenewolt Oct 9, 2020
8f7b6f4
add local .env config files to .gitignore
simongroenewolt Oct 9, 2020
e6e13b4
Better way to git ignore local .env config files
simongroenewolt Oct 9, 2020
0bfa601
Update loadEnv() to bootEnv() to better match the setup as used by th…
simongroenewolt Oct 13, 2020
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ appveyor.yml
/config/routes/local
!/config/routes/local/_import_dev.yaml
.php-version
/.env.local
/.env.*.local

###> symfony/framework-bundle ###
/public/bundles/
Expand Down
2 changes: 1 addition & 1 deletion bin/console
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if (!isset($_SERVER['APP_ENV'])) {
if (!class_exists(Dotenv::class)) {
throw new \RuntimeException('APP_ENV environment variable is not defined. You need to define environment variables for configuration or add "symfony/dotenv" as a Composer dependency to load variables from a .env file.');
}
(new Dotenv())->load(__DIR__.'/../.env');
(new Dotenv())->bootEnv(__DIR__.'/../.env');
}

$input = new ArgvInput();
Expand Down
4 changes: 2 additions & 2 deletions public/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

require __DIR__.'/../vendor/autoload.php';

// The check is to ensure we don't use .env in production
// If APP_ENV is set Dotenv is skipped (so .env / .env.local etc. are _not_ processed)
if (! isset($_SERVER['APP_ENV'])) {
if (! class_exists(Dotenv::class)) {
throw new \RuntimeException('APP_ENV environment variable is not defined. You need to define environment variables for configuration or add "symfony/dotenv" as a Composer dependency to load variables from a .env file.');
}
(new Dotenv())->load(__DIR__.'/../.env');
(new Dotenv())->bootEnv(__DIR__.'/../.env');
}

$env = $_SERVER['APP_ENV'] ?? 'dev';
Expand Down