consistently parse omitted keys as the colon

xabbuh · xabbuh · commit b1988f77267d · 2017-02-17T12:07:26.000+01:00
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -477,11 +477,15 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = ar
             // key
             $key = self::parseScalar($mapping, $flags, 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) {
+                throw new ParseException('A mapping without a key is invalid.');
+            }
+
+            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,24 @@ public function testVeryLongQuotedStrings()
 
         $this->assertEquals($longStringWithQuotes, $arrayFromYaml['longStringWithQuotes']);
     }
+
+    public function testBooleanMappingKeysAreConvertedToStrings()
+    {
+        $this->assertSame(array('false' => 'foo'), Inline::parse('{false: foo}'));
+    }
+
+    public function testTheEmptyStringIsAValidMappingKey()
+    {
+        $this->assertSame(array('' => 'foo'), Inline::parse('{ "": foo }'));
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Omitting the key of a mapping is deprecated and will throw a ParseException in 4.0.
+     */
+    public function testMappingKeysCannotBeOmitted()
+    {
+        Inline::parse('{: foo}');
+        $this->assertSame(array(':' => 'foo'), Inline::parse('{: foo}'));
+    }
 }
