parse omitted inlined mapping values as null

xabbuh · xabbuh · commit c473504a95ec · 2017-03-01T16:35:56.000+01:00
diff --git a/src/Symfony/Component/Yaml/CHANGELOG.md b/src/Symfony/Component/Yaml/CHANGELOG.md
@@ -4,6 +4,8 @@ CHANGELOG
 3.3.0
 -----
 
+ * Omitted mapping values will be parsed as `null`.
+
  * Omitting the key of a mapping is deprecated and will throw a `ParseException` in Symfony 4.0.
 
  * Added support for dumping empty PHP arrays as YAML sequences:
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -318,7 +318,7 @@ public static function parseScalar($scalar, $flags = 0, $delimiters = null, &$i
                 if (preg_match('/[ \t]+#/', $output, $match, PREG_OFFSET_CAPTURE)) {
                     $output = substr($output, 0, $match[0][1]);
                 }
-            } elseif (preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match)) {
+            } elseif (preg_match('/^(.*?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match)) {
                 $output = $match[1];
                 $i += strlen($output);
             } else {
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -702,4 +702,20 @@ public function testOmittedMappingKeyIsParsedAsColon()
     {
         $this->assertSame(array(':' => 'foo'), Inline::parse('{: foo}'));
     }
+
+    /**
+     * @dataProvider getTestsForNullValues
+     */
+    public function testParseMissingMappingValueAsNull($yaml, $expected)
+    {
+        $this->assertSame($expected, Inline::parse($yaml));
+    }
+
+    public function getTestsForNullValues()
+    {
+        return array(
+            'null before closing curly brace' => array('{foo:}', array('foo' => null)),
+            'null before comma' => array('{foo:, bar: baz}', array('foo' => null, 'bar' => 'baz')),
+        );
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ public static function parseScalar($scalar, $flags = 0, $delimiters = null, &$i`
`318`	`318`	`if (preg_match('/[ \t]+#/', $output, $match, PREG_OFFSET_CAPTURE)) {`
`319`	`319`	`$output = substr($output, 0, $match[0][1]);`
`320`	`320`	`}`
`321`		`- } elseif (preg_match('/^(.+?)('.implode('\|', $delimiters).')/', substr($scalar, $i), $match)) {`
	`321`	`+ } elseif (preg_match('/^(.*?)('.implode('\|', $delimiters).')/', substr($scalar, $i), $match)) {`
`322`	`322`	`$output = $match[1];`
`323`	`323`	`$i += strlen($output);`
`324`	`324`	`} else {`