bug #21117 [Yaml] add missing indicator character (xabbuh)

nicolas-grekas · nicolas-grekas · commit a89f60bbe83b · 2017-01-02T17:48:41.000+01:00
This PR was merged into the 3.2 branch. Discussion ---------- [Yaml] add missing indicator character | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | The comma was mentioned in the deprecation message, though it actually was never checked before in the condition. Commits ------- 8725e0b [Yaml] add missing indicator character
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -463,7 +463,7 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
                 break;
             }
 
-            if (!isset($mapping[$i + 1]) || !in_array($mapping[$i + 1], array(' ', '[', ']', '{', '}'), true)) {
+            if (!isset($mapping[$i + 1]) || !in_array($mapping[$i + 1], array(' ', ',', '[', ']', '{', '}'), true)) {
                 @trigger_error('Using a colon that is not followed by an indication character (i.e. " ", ",", "[", "]", "{", "}" is deprecated since version 3.2 and will throw a ParseException in 4.0.', E_USER_DEPRECATED);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,7 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar`
`463`	`463`	`break;`
`464`	`464`	`}`
`465`	`465`
`466`		`- if (!isset($mapping[$i + 1]) \|\| !in_array($mapping[$i + 1], array(' ', '[', ']', '{', '}'), true)) {`
	`466`	`+ if (!isset($mapping[$i + 1]) \|\| !in_array($mapping[$i + 1], array(' ', ',', '[', ']', '{', '}'), true)) {`
`467`	`467`	`@trigger_error('Using a colon that is not followed by an indication character (i.e. " ", ",", "[", "]", "{", "}" is deprecated since version 3.2 and will throw a ParseException in 4.0.', E_USER_DEPRECATED);`
`468`	`468`	`}`
`469`	`469`