don't fail when referenced env var does not exist

xabbuh · xabbuh · commit 8026609dc906 · 2019-11-23T15:53:46.000+01:00
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -466,7 +466,7 @@ private function resolveVariables(string $value, array $loadedVars): string
                 $value = '';
             }
 
-            if ('' === $value && isset($matches['default_value'])) {
+            if ('' === $value && isset($matches['default_value']) && '' !== $matches['default_value']) {
                 $unsupportedChars = strpbrk($matches['default_value'], '\'"{$');
                 if (false !== $unsupportedChars) {
                     throw $this->createFormatException(sprintf('Unsupported character "%s" found in the default value of variable "$%s".', $unsupportedChars[0], $name));
diff --git a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php
@@ -172,6 +172,7 @@ public function getEnvData()
             ["FOO=BAR\nBAR=\${NOTDEFINED:=TEST}", ['FOO' => 'BAR', 'NOTDEFINED' => 'TEST', 'BAR' => 'TEST']],
             ["FOO=\nBAR=\${FOO:=TEST}", ['FOO' => 'TEST', 'BAR' => 'TEST']],
             ["FOO=\nBAR=\$FOO:=TEST}", ['FOO' => 'TEST', 'BAR' => 'TEST}']],
+            ["FOO=foo\nFOOBAR=\${FOO}\${BAR}", ['FOO' => 'foo', 'FOOBAR' => 'foo']],
         ];
 
         if ('\\' !== \DIRECTORY_SEPARATOR) {

Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ private function resolveVariables(string $value, array $loadedVars): string`
`466`	`466`	`$value = '';`
`467`	`467`	`}`
`468`	`468`
`469`		`- if ('' === $value && isset($matches['default_value'])) {`
	`469`	`+ if ('' === $value && isset($matches['default_value']) && '' !== $matches['default_value']) {`
`470`	`470`	`$unsupportedChars = strpbrk($matches['default_value'], '\'"{$');`
`471`	`471`	`if (false !== $unsupportedChars) {`
`472`	`472`	`throw $this->createFormatException(sprintf('Unsupported character "%s" found in the default value of variable "$%s".', $unsupportedChars[0], $name));`