Reapply the Yaml bugfix of symfony#16745

stof · stof · commit d9393d8099c9 · 2015-12-01T17:13:59.000+01:00
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -471,12 +471,14 @@ private function parseValue($value, $exceptionOnInvalidType, $objectSupport, $ob
             return $this->parseBlockScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs($modifiers));
         }
 
-        if ('mapping' === $context && '"' !== $value[0] && "'" !== $value[0] && '[' !== $value[0] && '{' !== $value[0] && '!' !== $value[0] && false !== strpos($value, ': ')) {
-            throw new ParseException('A colon cannot be used in an unquoted mapping value.');
-        }
-
         try {
-            return Inline::parse($value, $exceptionOnInvalidType, $objectSupport, $objectForMap, $this->refs);
+            $parsedValue = Inline::parse($value, $exceptionOnInvalidType, $objectSupport, $objectForMap, $this->refs);
+
+            if ('mapping' === $context && '"' !== $value[0] && "'" !== $value[0] && '[' !== $value[0] && '{' !== $value[0] && '!' !== $value[0] && false !== strpos($parsedValue, ': ')) {
+                throw new ParseException('A colon cannot be used in an unquoted mapping value.');
+            }
+
+            return $parsedValue;
         } catch (ParseException $e) {
             $e->setParsedLine($this->getRealCurrentLineNb() + 1);
             $e->setSnippet($this->currentLine);
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -785,8 +785,8 @@ public function testFloatKeys()
     }
 
     /**
-     * @expectedException Symfony\Component\Yaml\Exception\ParseException
-     * @expectedExceptionMessage A colon cannot be used in an unquoted mapping value.
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     * @expectedExceptionMessage A colon cannot be used in an unquoted mapping value
      */
     public function testColonInMappingValueException()
     {
@@ -796,6 +796,16 @@ public function testColonInMappingValueException()
 
         $this->parser->parse($yaml);
     }
+
+    public function testColonInMappingValueExceptionNotTriggeredByColonInComment()
+    {
+        $yaml = <<<EOT
+foo:
+    bar: foobar # Note: a comment after a colon
+EOT;
+
+        $this->assertSame(array('foo' => array('bar' => 'foobar')), $this->parser->parse($yaml));
+    }
 }
 
 class B

Original file line number	Diff line number	Diff line change
`@@ -785,8 +785,8 @@ public function testFloatKeys()`
`785`	`785`	`}`
`786`	`786`
`787`	`787`	`/**`
`788`		`- * @expectedException Symfony\Component\Yaml\Exception\ParseException`
`789`		`- * @expectedExceptionMessage A colon cannot be used in an unquoted mapping value.`
	`788`	`+ * @expectedException \Symfony\Component\Yaml\Exception\ParseException`
	`789`	`+ * @expectedExceptionMessage A colon cannot be used in an unquoted mapping value`
`790`	`790`	`*/`
`791`	`791`	`public function testColonInMappingValueException()`
`792`	`792`	`{`
`@@ -796,6 +796,16 @@ public function testColonInMappingValueException()`
`796`	`796`
`797`	`797`	`$this->parser->parse($yaml);`
`798`	`798`	`}`
	`799`	`+`
	`800`	`+ public function testColonInMappingValueExceptionNotTriggeredByColonInComment()`
	`801`	`+ {`
	`802`	`+ $yaml = <<<EOT`
	`803`	`+foo:`
	`804`	`+ bar: foobar # Note: a comment after a colon`
	`805`	`+EOT;`
	`806`	`+`
	`807`	`+ $this->assertSame(array('foo' => array('bar' => 'foobar')), $this->parser->parse($yaml));`
	`808`	`+ }`
`799`	`809`	`}`
`800`	`810`
`801`	`811`	`class B`