8000 don't fail when referenced env var does not exist · symfony/symfony@8026609 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8026609

Browse files
xabbuhxabbuh
committed
don't fail when referenced env var does not exist
1 parent a8a9e69 commit 8026609

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

‎src/Symfony/Component/Dotenv/Dotenv.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ private function resolveVariables(string $value, array $loadedVars): string
466466
$value = '';
467467
}
468468

469-
if ('' === $value && isset($matches['default_value'])) {
469+
if ('' === $value && isset($matches['default_value']) && '' !== $matches['default_value']) {
470470
$unsupportedChars = strpbrk($matches['default_value'], '\'"{$');
471471
if (false !== $unsupportedChars) {
472472
throw $this->createFormatException(sprintf('Unsupported character "%s" found in the default value of variable "$%s".', $unsupportedChars[0], $name));

‎src/Symfony/Component/Dotenv/Tests/DotenvTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ public function getEnvData()
172172
["FOO=BAR\nBAR=\${NOTDEFINED:=TEST}", ['FOO' => 'BAR', 'NOTDEFINED' => 'TEST', 'BAR' => 'TEST']],
173173
["FOO=\nBAR=\${FOO:=TEST}", ['FOO' => 'TEST', 'BAR' => 'TEST']],
174174
["FOO=\nBAR=\$FOO:=TEST}", ['FOO' => 'TEST', 'BAR' => 'TEST}']],
175+
["FOO=foo\nFOOBAR=\${FOO}\${BAR}", ['FOO' => 'foo', 'FOOBAR' => 'foo']],
175176
];
176177

177178
if ('\\' !== \DIRECTORY_SEPARATOR) {

0 commit comments

Comments
 (0)
0