Skip to content

[Dotenv] Handle dynamic variables in multiple .env files #48636

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

Open
wants to merge 6 commits into
base: 7.4
Choose a base branch
from
Open

[Dotenv] Handle dynamic variables in multiple .env files #48636

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e7c9e4a
Added dynamic multi .env file config
valx76 Dec 13, 2022
c36aefa
Merge branch '6.3' into fix_multi_env_dynamic_var
valx76 Dec 14, 2022
8d9ca1a
Applied coding standard patch
valx76 Dec 14, 2022
ee8c198
Added tests
valx76 Dec 15, 2022
bcd3b0c
Applied coding standard patch
valx76 Dec 15, 2022
81a6277
Merge remote-tracking branch 'upstream/6.3' into fix_multi_env_dynami…
valx76 Dec 15, 2022
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
Prev Previous commit
Next Next commit
Applied coding standard patch
  • Loading branch information
@valx76
valx76 committed Dec 14, 2022
commit 8d9ca1af6f574bb92d5ce74d19279d953689ca03
12 changes: 6 additions & 6 deletions src/Symfony/Component/Dotenv/Dotenv.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,9 @@ public function populate(array $values, bool $overrideExistingVars = false): voi
/**
* Parses the contents of an .env file.
*
* @param string $data The data to be parsed
* @param string $path The original file name where data where stored (used for more meaningful error messages)
* @param bool $needsValueResolution true when the value resolution needs to be done automatically
* @param string $data The data to be parsed
* @param string $path The original file name where data where stored (used for more meaningful error messages)
* @param bool $needsValueResolution true when the value resolution needs to be done automatically
*
* @throws FormatException when a file has a syntax error
*/
Expand Down Expand Up @@ -369,7 +369,7 @@ private function lexValue(bool $needsValueResolution): string
if ($needsValueResolution) {
$resolvedValue = $this->resolveVariables($resolvedValue, $loadedVars);
}

$resolvedValue = $this->resolveCommands($resolvedValue, $loadedVars);
$resolvedValue = str_replace('\\\\', '\\', $resolvedValue);
$v .= $resolvedValue;
Expand All @@ -396,7 +396,7 @@ private function lexValue(bool $needsValueResolution): string
if ($needsValueResolution) {
$resolvedValue = $this->resolveVariables($resolvedValue, $loadedVars);
}

$resolvedValue = $this->resolveCommands($resolvedValue, $loadedVars);
$resolvedValue = str_replace('\\\\', '\\', $resolvedValue);

Expand Down Expand Up @@ -596,7 +596,7 @@ private function resolveAllVariables(): void
unset($loadedVars['']);

foreach ($_ENV as $name => $value) {
if ($name === 'SYMFONY_DOTENV_VARS') {
if ('SYMFONY_DOTENV_VARS' === $name) {
continue;
}

Expand Down