Improved error message

j92 · j92 · commit 304f52aa7c05 · 2019-07-24T20:33:03.000+02:00
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -459,7 +459,7 @@ 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']));
+                    throw $this->createFormatException(sprintf('Variable expansion "$%s%s" should be wrapped in braces', $name, $matches['default_value']));
                 }
 
                 $unsupportedChars = strpbrk($matches['default_value'], '\'"{$');
diff --git a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php
@@ -51,7 +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"],
+            ["FOO=\nBAR=\$FOO:-a", "Variable expansion \"\$FOO:-a\" should be wrapped in braces in \".env\" at line 2.\n...FOO=\\nBAR=\$FOO:-a...\n                   ^ line 2 offset 16"],
         ];
 
         if ('\\' !== \DIRECTORY_SEPARATOR) {

Original file line number	Diff line number	Diff line change
`@@ -459,7 +459,7 @@ private function resolveVariables($value)`
`459`	`459`
`460`	`460`	`if ('' === $value && isset($matches['default_value'])) {`
`461`	`461`	`if ('{' !== $matches['opening_brace']) {`
`462`		`- throw $this->createFormatException(sprintf('Missing braces on variable expansion with default value "%s"', $matches['default_value']));`
	`462`	`+ throw $this->createFormatException(sprintf('Variable expansion "$%s%s" should be wrapped in braces', $name, $matches['default_value']));`
`463`	`463`	`}`
`464`	`464`
`465`	`465`	`$unsupportedChars = strpbrk($matches['default_value'], '\'"{$');`