Added deprecation notice when defining an indented block after a definition

guiguiboy · guiguiboy · commit 083d19edc087 · 2018-07-13T14:37:46.000+02:00
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -383,7 +383,7 @@ private function doParse(string $value, int $flags)
                         }
 
                         if ($this->offset >= 1 && preg_match('/:/', $this->currentLine) && $this->isNextLineIndented()) {
-                            throw new ParseException('Indented blocks after definition are not allowed', $this->currentLineNb + 1, $this->currentLine, $this->filename);
+                            @trigger_error('Support for indented blocks after definition is deprecated since version 4.1. Use same level of indentation to fix this issue.', E_USER_DEPRECATED);
                         }
 
                         if ('' === trim($line)) {
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -526,7 +526,8 @@ public function testObjectsSupportDisabledWithExceptions()
     }
 
     /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     * @group legacy
+     * @expectedDeprecation Support for indented blocks after definition is deprecated since version 4.1. Use same level of indentation to fix this issue.
      */
     public function testMappingKeyWithAdditionalStringThrowsException()
     {

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ private function doParse(string $value, int $flags)`
`383`	`383`	`}`
`384`	`384`
`385`	`385`	`if ($this->offset >= 1 && preg_match('/:/', $this->currentLine) && $this->isNextLineIndented()) {`
`386`		`- throw new ParseException('Indented blocks after definition are not allowed', $this->currentLineNb + 1, $this->currentLine, $this->filename);`
	`386`	`+ @trigger_error('Support for indented blocks after definition is deprecated since version 4.1. Use same level of indentation to fix this issue.', E_USER_DEPRECATED);`
`387`	`387`	`}`
`388`	`388`
`389`	`389`	`if ('' === trim($line)) {`
Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,8 @@ public function testObjectsSupportDisabledWithExceptions()`
`526`	`526`	`}`
`527`	`527`	`5E9C`
`528`	`528`	`/**`
`529`		`- * @expectedException \Symfony\Component\Yaml\Exception\ParseException`
	`529`	`+ * @group legacy`
	`530`	`+ * @expectedDeprecation Support for indented blocks after definition is deprecated since version 4.1. Use same level of indentation to fix this issue.`
`530`	`531`	`*/`
`531`	`532`	`public function testMappingKeyWithAdditionalStringThrowsException()`
`532`	`533`	`{`