Commit24d9c2f

committed

Show the first actual unsupported character in the error message

1 parent642374f commit24d9c2fCopy full SHA for 24d9c2f

File tree

-5

lines changed

-5

lines changed

Lines changed: 0 additions & 1 deletion

This file was deleted.

Lines changed: 3 additions & 2 deletions

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);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@ public function getEnvDataWithFormatErrors()`
`48`	`48`	`['FOO!',"Missing = in the environment variable declaration in\".env\" at line 1.\n...FOO!...\n ^ line 1 offset 3"],`
`49`	`49`	`['FOO=$(echo foo',"Missing closing parenthesis. in\".env\" at line 1.\n...FOO=$(echo foo...\n ^ line 1 offset 14"],`
`50`	`50`	`['FOO=$(echo foo'."\n","Missing closing parenthesis. in\".env\" at line 1.\n...FOO=$(echo foo\\n...\n ^ line 1 offset 14"],`
`51`		`- ["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"],`
`52`		`- ["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"],`
	`51`	`+ ["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"],`
	`52`	`+ ["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"],`
`53`	`53`	`["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"],`
`54`	`54`	`];`
`55`	`55`

Comments

(0)