Show the first actual unsupported character in the error message

j92 · j92 · commit e59d8e74658d · 2019-07-13T13:42:50.000+02:00
diff --git a/src/Symfony/Component/Dotenv/.env b/src/Symfony/Component/Dotenv/.env
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -458,8 +458,9 @@ private function resolveVariables($value)
             }
 
             if ('' === $value && isset($matches['default_value'])) {
-                if (false !== strpbrk($matches['default_value'], '\'"{$')) {
-                    throw $this->createFormatException(sprintf('Unsupported character found in the default value of variable "$%s".', $name));
+                $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));
                 }
 
                 $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}", "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}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"],
         ];
 

Original file line number	Diff line number	Diff line change
`@@ -458,8 +458,9 @@ private function resolveVariables($value)`
`458`	`458`	`}`
`459`	`459`
`460`	`460`	`if ('' === $value && isset($matches['default_value'])) {`
`461`		`- if (false !== strpbrk($matches['default_value'], '\'"{$')) {`
`462`		`- throw $this->createFormatException(sprintf('Unsupported character found in the default value of variable "$%s".', $name));`
	`461`	`+ $unsupportedChars = strpbrk($matches['default_value'], '\'"{$');`
	`462`	`+ if (false !== $unsupportedChars) {`
	`463`	`+ throw $this->createFormatException(sprintf('Unsupported character "%s" found in the default value of variable "$%s".', $unsupportedChars[0], $name));`
`463`	`464`	`}`
`464`	`465`
`465`	`466`	`$value = substr($matches['default_value'], 2);`