Variable expansions with a default value should be wrapped in braces

j92 · j92 · commit a12524e22efa · 2019-07-24T20:21:11.000+02:00
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -458,6 +458,10 @@ private function resolveVariables($value)
             }
 
             if ('' === $value && isset($matches['default_value'])) {
+                if ('{' !== $matches['opening_brace']) {
+                    throw $this->createFormatException(sprintf('Missing braces on variable expansion with default value "%s"', $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
@@ -51,6 +51,7 @@ public function getEnvDataWithFormatErrors()
             ["FOO=\nBAR=\${FOO:-\'a{a}a}", "Unsupported character \"'\" found in the default value of variable \"\$FOO\". in \".env\" at line 2.\n...\\nBAR=\${FOO:-\'a{a}a}...\n                       ^ line 2 offset 24"],
             ["FOO=\nBAR=\${FOO:-a\$a}", "Unsupported character \"\$\" found in the default value of variable \"\$FOO\". in \".env\" at line 2.\n...FOO=\\nBAR=\${FOO:-a\$a}...\n                       ^ line 2 offset 20"],
             ["FOO=\nBAR=\${FOO:-a\"a}", "Unclosed braces on variable expansion in \".env\" at line 2.\n...FOO=\\nBAR=\${FOO:-a\"a}...\n                    ^ line 2 offset 17"],
+            ["FOO=\nBAR=\$FOO:-a", "Missing braces on variable expansion with default value \":-a\" in \".env\" at line 2.\n...FOO=\\nBAR=\$FOO:-a...\n                   ^ line 2 offset 16"],
         ];
 
         if ('\\' !== \DIRECTORY_SEPARATOR) {
