[Yaml] Simplified multi-line mapping condition + updated changelog and upgrade file accordingly

guiguiboy · guiguiboy · commit b11e52256b5d · 2019-01-05T14:04:04.000+01:00
diff --git a/UPGRADE-4.3.md b/UPGRADE-4.3.md
@@ -5,3 +5,8 @@ Config
 ------
 
  * Deprecated using environment variables with `cannotBeEmpty()` if the value is validated with `validate()`
+
+Yaml
+----
+
+ * Using a mapping inside a multi-line string is deprecated and will throw a `ParseException` in 5.0.
diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
@@ -277,5 +277,5 @@ Workflow
 Yaml
 ----
 
- * The parser is now stricter and will trigger a deprecation notice when a 
+ * The parser is now stricter and will throw a `ParseException` when a 
    mapping is found inside a multi-line string.
diff --git a/src/Symfony/Component/Yaml/CHANGELOG.md b/src/Symfony/Component/Yaml/CHANGELOG.md
@@ -1,11 +1,10 @@
 CHANGELOG
 =========
 
-5.0.0
+4.3.0
 -----
 
- * The parser is now stricter and will trigger a deprecation notice when a 
-   mapping is found inside a multi-line string.
+ * Using a mapping inside a multi-line string is deprecated and will throw a `ParseException` in 5.0.
 
 4.2.0
 -----
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -391,8 +391,8 @@ private function doParse(string $value, int $flags)
                             throw new ParseException('Unable to parse.', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);
                         }
 
-                        if ($this->offset >= 1 && strpos($line, ': ')) {
-                            @trigger_error('Support for mapping keys in multiline blocks is deprecated since version 4.1.', E_USER_DEPRECATED);
+                        if (false !== strpos($line, ': ')) {
+                            @trigger_error('Support for mapping keys in multiline blocks is deprecated since version 4.3 and will throw a ParseException in 5.0.', E_USER_DEPRECATED);
                         }
 
                         if ('' === trim($line)) {
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -527,7 +527,7 @@ public function testObjectsSupportDisabledWithExceptions()
 
     /**
      * @group legacy
-     * @expectedDeprecation Support for mapping keys in multiline blocks is deprecated since version 4.1.
+     * @expectedDeprecation Support for mapping keys in multiline blocks is deprecated since version 4.3 and will throw a ParseException in 5.0.
      */
     public function testMappingKeyInMultiLineStringTriggersDeprecationNotice()
     {

Original file line number	Diff line number	Diff line change
`@@ -391,8 +391,8 @@ private function doParse(string $value, int $flags)`
`391`	`391`	`throw new ParseException('Unable to parse.', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);`
`392`	`392`	`}`
`393`	`393`
`394`		`- if ($this->offset >= 1 && strpos($line, ': ')) {`
`395`		`- @trigger_error('Support for mapping keys in multiline blocks is deprecated since version 4.1.', E_USER_DEPRECATED);`
	`394`	`+ if (false !== strpos($line, ': ')) {`
	`395`	`+ @trigger_error('Support for mapping keys in multiline blocks is deprecated since version 4.3 and will throw a ParseException in 5.0.', E_USER_DEPRECATED);`
`396`	`396`	`}`
`397`	`397`
`398`	`398`	`if ('' === trim($line)) {`
Original file line number	Diff line number	Diff line change
`@@ -527,7 +527,7 @@ public function testObjectsSupportDisabledWithExceptions()`
`527`	`527`
`528`	`528`	`/**`
`529`	`529`	`* @group legacy`
`530`		`- * @expectedDeprecation Support for mapping keys in multiline blocks is deprecated since version 4.1.`
	`530`	`+ * @expectedDeprecation Support for mapping keys in multiline blocks is deprecated since version 4.3 and will throw a ParseException in 5.0.`
`531`	`531`	`*/`
`532`	`532`	`public function testMappingKeyInMultiLineStringTriggersDeprecationNotice()`
`533`	`533`	`{`