symfony
diff --git a/‎src/Symfony/Component/Yaml/Inline.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Yaml/Inline.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Yaml/Inline.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Yaml/Inline.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Yaml/Tests/InlineTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Yaml/Tests/InlineTest.php
+16Lines changed: 16 additions & 0 deletions b/‎src/Symfony/Component/Yaml/Tests/InlineTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Yaml/Tests/InlineTest.php
+16Lines changed: 16 additions & 0 deletions
@@ -309,7 +309,7 @@ public static function parseScalar($scalar, $flags = 0, $delimiters = null, $str
                 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 {
@@ -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);
             }
 
 
@@ -676,4 +676,20 @@ public function testNotSupportedMissingValue()
     {
         Inline::parse('{this, is not, supported}');
     }
+
+    /**
+     * @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
`@@ -309,7 +309,7 @@ public static function parseScalar($scalar, $flags = 0, $delimiters = null, $str`
`309`	`309`	`if (preg_match('/[ \t]+#/', $output, $match, PREG_OFFSET_CAPTURE)) {`
`310`	`310`	`$output = substr($output, 0, $match[0][1]);`
`311`	`311`	`}`
`312`		`- } elseif (preg_match('/^(.+?)('.implode('\|', $delimiters).')/', substr($scalar, $i), $match)) {`
	`312`	`+ } elseif (preg_match('/^(.*?)('.implode('\|', $delimiters).')/', substr($scalar, $i), $match)) {`
`313`	`313`	`$output = $match[1];`
`314`	`314`	`$i += strlen($output);`
`315`	`315`	`} else {`
`@@ -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`