Commitc473504

committed

parse omitted inlined mapping values as null

1 parent36dacbc commitc473504Copy full SHA for c473504

File tree

+19

-1

lines changed

+19

-1

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ CHANGELOG`
`4`	`4`	`3.3.0`
`5`	`5`	`-----`
`6`	`6`
	`7`	+* Omitted mapping values will be parsed as`null`.
	`8`	`+`
`7`	`9`	* Omitting the key of a mapping is deprecated and will throw a`ParseException` in Symfony 4.0.
`8`	`10`
`9`	`11`	`* Added support for dumping empty PHP arrays as YAML sequences:`

Lines changed: 1 addition & 1 deletion

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 {`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -702,4 +702,20 @@ public function testOmittedMappingKeyIsParsedAsColon()`
`702`	`702`	`{`
`703`	`703`	`$this->assertSame(array(':' =>'foo'), Inline::parse('{: foo}'));`
`704`	`704`	`}`
	`705`	`+`
	`706`	`+/**`
	`707`	`+ * @dataProvider getTestsForNullValues`
	`708`	`+ */`
	`709`	`+publicfunctiontestParseMissingMappingValueAsNull($yaml,$expected)`
	`710`	`+ {`
	`711`	`+$this->assertSame($expected, Inline::parse($yaml));`
	`712`	`+ }`
	`713`	`+`
	`714`	`+publicfunctiongetTestsForNullValues()`
	`715`	`+ {`
	`716`	`+returnarray(`
	`717`	`+'null before closing curly brace' =>array('{foo:}',array('foo' =>null)),`
	`718`	`+'null before comma' =>array('{foo:, bar: baz}',array('foo' =>null,'bar' =>'baz')),`
	`719`	`+ );`
	`720`	`+ }`
`705`	`721`	`}`

Comments

(0)