bug #21647 [Yaml] consistently parse omitted keys as the colon (xabbuh)

stof · stof · commit 6ea510f7b4da · 2017-02-17T12:55:10.000+01:00
This PR was merged into the 3.2 branch. Discussion ---------- [Yaml] consistently parse omitted keys as the colon | 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 | Before the changes made in #20335, an empty mapping key was parsed as `:`. This behaviour is not correct according to the spec, but we should keep the parser behaviour consistent to not break backward compatibility (I will deprecate it in a different PR on `master`). Commits ------- e2ebecc consistently parse omitted keys as the colon
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -459,11 +459,11 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
             // key
             $key = self::parseScalar($mapping, $flags, array(':', ' '), array('"', "'"), $i, false);
 
-            if (false === $i = strpos($mapping, ':', $i)) {
+            if (':' !== $key && false === $i = strpos($mapping, ':', $i)) {
                 break;
             }
 
-            if (!isset($mapping[$i + 1]) || !in_array($mapping[$i + 1], array(' ', ',', '[', ']', '{', '}'), true)) {
+            if (':' !== $key && (!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);
             }
 
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -686,4 +686,9 @@ public function testVeryLongQuotedStrings()
 
         $this->assertEquals($longStringWithQuotes, $arrayFromYaml['longStringWithQuotes']);
     }
+
+    public function testOmittedMappingKeyIsParsedAsColon()
+    {
+        $this->assertSame(array(':' => 'foo'), Inline::parse('{: foo}'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -459,11 +459,11 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar`
`459`	`459`	`// key`
`460`	`460`	`$key = self::parseScalar($mapping, $flags, array(':', ' '), array('"', "'"), $i, false);`
`461`	`461`
`462`		`- if (false === $i = strpos($mapping, ':', $i)) {`
	`462`	`+ if (':' !== $key && false === $i = strpos($mapping, ':', $i)) {`
`463`	`463`	`break;`
`464`	`464`	`}`
`465`	`465`
`466`		`- if (!isset($mapping[$i + 1]) \|\| !in_array($mapping[$i + 1], array(' ', ',', '[', ']', '{', '}'), true)) {`
	`466`	`+ if (':' !== $key && (!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`
Original file line number	Diff line number	Diff line change
`@@ -686,4 +686,9 @@ public function testVeryLongQuotedStrings()`
`686`	`686`
`687`	`687`	`$this->assertEquals($longStringWithQuotes, $arrayFromYaml['longStringWithQuotes']);`
`688`	`688`	`}`
	`689`	`+`
	`690`	`+ public function testOmittedMappingKeyIsParsedAsColon()`
	`691`	`+ {`
	`692`	`+ $this->assertSame(array(':' => 'foo'), Inline::parse('{: foo}'));`
	`693`	`+ }`
`689`	`694`	`}`