Added deprecation notice when mappings found inside a multiline string

guiguiboy · guiguiboy · commit d95792d6bf19 · 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,15 +376,13 @@ private function doParse(string $value, int $flags)
                     $previousLineWasTerminatedWithBackslash = false;
                     $value = '';
 
-                    foreach ($this->lines as $multiLineIncrement => $line) {
+                    foreach ($this->lines as $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);
                         }
 
-                        $nextLine = $this->lines[$multiLineIncrement + 1] ?? false;
-
-                        if ($this->offset >= 1 && $this->isNextLineIndented() && ($nextLine && strpos($nextLine, ': '))) {
+                        if ($this->offset >= 1 && strpos($line, ': ')) {
                             @trigger_error('Support for mapping keys in multiline blocks is deprecated since version 4.1.', E_USER_DEPRECATED);
                         }
 
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -749,10 +749,9 @@ 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 with a: colon',
+            'test' => 'You can have things that don\'t look like strings here true yes you can',
         );
 
         $this->assertSame($expected, $this->parser->parse($yaml));
