Fixed incorrect behavior for mappings inside multiline string

guiguiboy · guiguiboy · commit ff8d4ba3fd53 · 2018-10-02T21:43:53.000+02:00
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -376,14 +376,16 @@ private function doParse(string $value, int $flags)
                     $previousLineWasTerminatedWithBackslash = false;
                     $value = '';
 
-                    foreach ($this->lines as $line) {
+                    foreach ($this->lines as $multiLineIncrement => $line) {
                         // If the indentation is not consistent at offset 0, it is to be considered as a ParseError
                         if (0 === $this->offset && !$deprecatedUsage && isset($line[0]) && ' ' === $line[0]) {
                             throw new ParseException('Unable to parse.', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);
                         }
 
-                        if ($this->offset >= 1 && strpos($this->currentLine, ':') && $this->isNextLineIndented()) {
-                            @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);
+                        $nextLine = $this->lines[$multiLineIncrement + 1] ?? false;
+
+                        if ($this->offset >= 1 && $this->isNextLineIndented() && ($nextLine && strpos($nextLine, ': '))) {
+                            @trigger_error('Support for mapping keys in multiline blocks is deprecated since version 4.1.', 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,9 +527,9 @@ public function testObjectsSupportDisabledWithExceptions()
 
     /**
      * @group legacy
-     * @expectedDeprecation Support for indented blocks after definition is deprecated since version 4.1. Use same level of indentation to fix this issue.
+     * @expectedDeprecation Support for mapping keys in multiline blocks is deprecated since version 4.1.
      */
-    public function testMappingKeyWithAdditionalStringThrowsException()
+    public function testMappingKeyInMultiLineStringTriggersDeprecationNotice()
     {
         $yaml = <<<'EOF'
 data:
@@ -749,9 +749,10 @@ public function testMultiLineStringLastResortParsing()
   You can have things that don't look like strings here
   true
   yes you can
+  with a: colon
 EOT;
         $expected = array(
-            'test' => 'You can have things that don\'t look like strings here true yes you can',
+            'test' => 'You can have things that don\'t look like strings here true yes you can with a: colon',
         );
 
         $this->assertSame($expected, $this->parser->parse($yaml));
