trim spaces from unquoted scalar values

xabbuh · xabbuh · commit 5e70ee898e32 · 2018-01-20T15:02:12.000+01:00
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -286,6 +286,7 @@ public static function parseScalar(string $scalar, int $flags = 0, array $delimi
             } elseif (Parser::preg_match('/^(.*?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match)) {
                 $output = $match[1];
                 $i += strlen($output);
+                $output = trim($output);
             } else {
                 throw new ParseException(sprintf('Malformed inline YAML string: %s.', $scalar), self::$parsedLineNumber + 1, null, self::$parsedFilename);
             }
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -252,9 +252,9 @@ public function testParseUnquotedScalarStartingWithReservedIndicator($indicator)
     {
         if (method_exists($this, 'expectExceptionMessage')) {
             $this->expectException(ParseException::class);
-            $this->expectExceptionMessage(sprintf('cannot start a plain scalar; you need to quote the scalar at line 1 (near "%sfoo ").', $indicator));
+            $this->expectExceptionMessage(sprintf('cannot start a plain scalar; you need to quote the scalar at line 1 (near "%sfoo").', $indicator));
         } else {
-            $this->setExpectedException(ParseException::class, sprintf('cannot start a plain scalar; you need to quote the scalar at line 1 (near "%sfoo ").', $indicator));
+            $this->setExpectedException(ParseException::class, sprintf('cannot start a plain scalar; you need to quote the scalar at line 1 (near "%sfoo").', $indicator));
         }
 
         Inline::parse(sprintf('{ foo: %sfoo }', $indicator));
@@ -272,9 +272,9 @@ public function testParseUnquotedScalarStartingWithScalarIndicator($indicator)
     {
         if (method_exists($this, 'expectExceptionMessage')) {
             $this->expectException(ParseException::class);
-            $this->expectExceptionMessage(sprintf('cannot start a plain scalar; you need to quote the scalar at line 1 (near "%sfoo ").', $indicator));
+            $this->expectExceptionMessage(sprintf('cannot start a plain scalar; you need to quote the scalar at line 1 (near "%sfoo").', $indicator));
         } else {
-            $this->setExpectedException(ParseException::class, sprintf('cannot start a plain scalar; you need to quote the scalar at line 1 (near "%sfoo ").', $indicator));
+            $this->setExpectedException(ParseException::class, sprintf('cannot start a plain scalar; you need to quote the scalar at line 1 (near "%sfoo").', $indicator));
         }
 
         Inline::parse(sprintf('{ foo: %sfoo }', $indicator));
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1602,6 +1602,10 @@ public function taggedValuesProvider()
 - !quz {foo: bar, quz: !bar {one: bar}}
 YAML
             ),
+            'spaces-around-tag-value-in-sequence' => array(
+                array(new TaggedValue('foo', 'bar')),
+                '[ !foo bar ]',
+            ),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -286,6 +286,7 @@ public static function parseScalar(string $scalar, int $flags = 0, array $delimi`
`286`	`286`	`} elseif (Parser::preg_match('/^(.*?)('.implode('\|', $delimiters).')/', substr($scalar, $i), $match)) {`
`287`	`287`	`$output = $match[1];`
`288`	`288`	`$i += strlen($output);`
	`289`	`+ $output = trim($output);`
`289`	`290`	`} else {`
`290`	`291`	`throw new ParseException(sprintf('Malformed inline YAML string: %s.', $scalar), self::$parsedLineNumber + 1, null, self::$parsedFilename);`
`291`	`292`	`}`
Original file line number	Diff line number	Diff line change
`@@ -252,9 +252,9 @@ public function testParseUnquotedScalarStartingWithReservedIndicator($indicator)`
`252`	`252`	`{`
`253`	`253`	`if (method_exists($this, 'expectExceptionMessage')) {`
`254`	`254`	`$this->expectException(ParseException::class);`
`255`		`- $this->expectExceptionMessage(sprintf('cannot start a plain scalar; you need to quote the scalar at line 1 (near "%sfoo ").', $indicator));`
	`255`	`+ $this->expectExceptionMessage(sprintf('cannot start a plain scalar; you need to quote the scalar at line 1 (near "%sfoo").', $indicator));`
`256`	`256`	`} else {`
`257`		`- $this->setExpectedException(ParseException::class, sprintf('cannot start a plain scalar; you need to quote the scalar at line 1 (near "%sfoo ").', $indicator));`
	`257`	`+ $this->setExpectedException(ParseException::class, sprintf('cannot start a plain scalar; you need to quote the scalar at line 1 (near "%sfoo").', $indicator));`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`Inline::parse(sprintf('{ foo: %sfoo }', $indicator));`
`@@ -272,9 +272,9 @@ public function testParseUnquotedScalarStartingWithScalarIndicator($indicator)`
`272`	`272`	`{`
`273`	`273`	`if (method_exists($this, 'expectExceptionMessage')) {`
`274`	`274`	`$this->expectException(ParseException::class);`
`275`		`- $this->expectExceptionMessage(sprintf('cannot start a plain scalar; you need to quote the scalar at line 1 (near "%sfoo ").', $indicator));`
	`275`	`+ $this->expectExceptionMessage(sprintf('cannot start a plain scalar; you need to quote the scalar at line 1 (near "%sfoo").', $indicator));`
`276`	`276`	`} else {`
`277`		`- $this->setExpectedException(ParseException::class, sprintf('cannot start a plain scalar; you need to quote the scalar at line 1 (near "%sfoo ").', $indicator));`
	`277`	`+ $this->setExpectedException(ParseException::class, sprintf('cannot start a plain scalar; you need to quote the scalar at line 1 (near "%sfoo").', $indicator));`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`Inline::parse(sprintf('{ foo: %sfoo }', $indicator));`