Updated the regex and improved the error message

j92 · j92 · commit 642374fbc29e · 2019-07-13T10:33:23.000+02:00
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -427,7 +427,7 @@ private function resolveVariables($value)
             (?!\()                                # no opening parenthesis
             (?P<opening_brace>\{)?                # optional brace
             (?P<name>'.self::VARNAME_REGEX.')?    # var name
-            (?P<default_value>:-[^\}]+)?          # optional default value
+            (?P<default_value>:-[^\}]++)?         # optional default value
             (?P<closing_brace>\})?                # optional closing brace
         /x';
 
@@ -458,8 +458,8 @@ private function resolveVariables($value)
             }
 
             if ('' === $value && isset($matches['default_value'])) {
-                if (strpbrk($matches['default_value'], '\'"{}$')) {
-                    throw $this->createFormatException('Invalid character in default value');
+                if (false !== strpbrk($matches['default_value'], '\'"{$')) {
+                    throw $this->createFormatException(sprintf('Unsupported character found in the default value of variable "$%s".', $name));
                 }
 
                 $value = substr($matches['default_value'], 2);
diff --git a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php
@@ -48,8 +48,8 @@ public function getEnvDataWithFormatErrors()
             ['FOO!', "Missing = in the environment variable declaration in \".env\" at line 1.\n...FOO!...\n     ^ line 1 offset 3"],
             ['FOO=$(echo foo', "Missing closing parenthesis. in \".env\" at line 1.\n...FOO=$(echo foo...\n                ^ line 1 offset 14"],
             ['FOO=$(echo foo'."\n", "Missing closing parenthesis. in \".env\" at line 1.\n...FOO=$(echo foo\\n...\n                ^ line 1 offset 14"],
-            ["FOO=\nBAR=\${FOO:-\'a{a}a}", "Invalid character in default value in \".env\" at line 2.\n...\\nBAR=\${FOO:-\'a{a}a}...\n                       ^ line 2 offset 24"],
-            ["FOO=\nBAR=\${FOO:-a\$a}", "Invalid character in default value in \".env\" at line 2.\n...FOO=\\nBAR=\${FOO:-a\$a}...\n                       ^ line 2 offset 20"],
+            ["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"],
         ];
 
