minor #29868 Grammar fix in exception message (michaelKaefer)

fabpot · fabpot · commit aca3d2c90d3a · 2019-01-21T15:45:47.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- Grammar fix in exception message According to https://en.wiktionary.org/wiki/whitespace and https://english.stackexchange.com/questions/25368/what-is-the-plural-form-of-whitespace valid sentences would be: - Whitespace is ... - Whitespaces are ... - Whitespace characters are ... But this is not correct: - Whitespace are ... | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 6e279a0 Grammar fix in exception message
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -161,7 +161,7 @@ private function lexVarname()
         }
 
         if (' ' === $this->data[$this->cursor] || "\t" === $this->data[$this->cursor]) {
-            throw $this->createFormatException('Whitespace are not supported after the variable name');
+            throw $this->createFormatException('Whitespace characters are not supported after the variable name');
         }
 
         if ('=' !== $this->data[$this->cursor]) {
diff --git a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php
@@ -36,7 +36,7 @@ public function getEnvDataWithFormatErrors()
     {
         $tests = [
             ['FOO=BAR BAZ', "A value containing spaces must be surrounded by quotes in \".env\" at line 1.\n...FOO=BAR BAZ...\n             ^ line 1 offset 11"],
-            ['FOO BAR=BAR', "Whitespace are not supported after the variable name in \".env\" at line 1.\n...FOO BAR=BAR...\n     ^ line 1 offset 3"],
+            ['FOO BAR=BAR', "Whitespace characters are not supported after the variable name in \".env\" at line 1.\n...FOO BAR=BAR...\n     ^ line 1 offset 3"],
             ['FOO', "Missing = in the environment variable declaration in \".env\" at line 1.\n...FOO...\n     ^ line 1 offset 3"],
             ['FOO="foo', "Missing quote to end the value in \".env\" at line 1.\n...FOO=\"foo...\n          ^ line 1 offset 8"],
             ['FOO=\'foo', "Missing quote to end the value in \".env\" at line 1.\n...FOO='foo...\n          ^ line 1 offset 8"],

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ private function lexVarname()`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`if (' ' === $this->data[$this->cursor] \|\| "\t" === $this->data[$this->cursor]) {`
`164`		`- throw $this->createFormatException('Whitespace are not supported after the variable name');`
	`164`	`+ throw $this->createFormatException('Whitespace characters are not supported after the variable name');`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`if ('=' !== $this->data[$this->cursor]) {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function getEnvDataWithFormatErrors()`
`36`	`36`	`{`
`37`	`37`	`$tests = [`
`38`	`38`	`['FOO=BAR BAZ', "A value containing spaces must be surrounded by quotes in \".env\" at line 1.\n...FOO=BAR BAZ...\n ^ line 1 offset 11"],`
`39`		`- ['FOO BAR=BAR', "Whitespace are not supported after the variable name in \".env\" at line 1.\n...FOO BAR=BAR...\n ^ line 1 offset 3"],`
	`39`	`+ ['FOO BAR=BAR', "Whitespace characters are not supported after the variable name in \".env\" at line 1.\n...FOO BAR=BAR...\n ^ line 1 offset 3"],`
`40`	`40`	`['FOO', "Missing = in the environment variable declaration in \".env\" at line 1.\n...FOO...\n ^ line 1 offset 3"],`
`41`	`41`	`['FOO="foo', "Missing quote to end the value in \".env\" at line 1.\n...FOO=\"foo...\n ^ line 1 offset 8"],`
`42`	`42`	`['FOO=\'foo', "Missing quote to end the value in \".env\" at line 1.\n...FOO='foo...\n ^ line 1 offset 8"],`