bug #9274 [Yaml] Fixed the escaping of strings starting with a dash when dumping (stof)

fabpot · fabpot · commit b599598bb39a · 2013-10-11T06:56:07.000+02:00
This PR was merged into the 2.2 branch. Discussion ---------- [Yaml] Fixed the escaping of strings starting with a dash when dumping Dashes need to be escaped in character sets in regexes as they are used to specify a range otherwise. It fixes the dumper bug reported in #9039 (the parsing issue is not fix here) | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | partially #9039 | License | MIT | Doc PR | n/a Commits ------- af369ae [Yaml] Fixed the escaping of strings starting with a dash when dumping
diff --git a/src/Symfony/Component/Yaml/Escaper.php b/src/Symfony/Component/Yaml/Escaper.php
@@ -71,7 +71,7 @@ public static function escapeWithDoubleQuotes($value)
      */
     public static function requiresSingleQuoting($value)
     {
-        return preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] | \A[ - ? | < > = ! % @ ` ]/x', $value);
+        return preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] | \A[ \- ? | < > = ! % @ ` ]/x', $value);
     }
 
     /**
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Yaml\Tests;
 
-use Symfony\Component\Yaml\Yaml;
 use Symfony\Component\Yaml\Inline;
 
 class InlineTest extends \PHPUnit_Framework_TestCase
@@ -31,11 +30,11 @@ public function testDump()
             $this->assertEquals($yaml, Inline::dump($value), sprintf('::dump() converts a PHP structure to an inline YAML (%s)', $yaml));
         }
 
-        foreach ($this->getTestsForParse() as $yaml => $value) {
+        foreach ($this->getTestsForParse() as $value) {
             $this->assertEquals($value, Inline::parse(Inline::dump($value)), 'check consistency');
         }
 
-        foreach ($testsForDump as $yaml => $value) {
+        foreach ($testsForDump as $value) {
             $this->assertEquals($value, Inline::parse(Inline::dump($value)), 'check consistency');
         }
     }
@@ -205,6 +204,9 @@ protected function getTestsForDump()
 
             "'a \"string\" with ''quoted strings inside'''" => 'a "string" with \'quoted strings inside\'',
 
+            "'-dash'" => '-dash',
+            "'-'" => '-',
+
             // sequences
             '[foo, bar, false, null, 12]' => array('foo', 'bar', false, null, 12),
             '[\'foo,bar\', \'foo bar\']' => array('foo,bar', 'foo bar'),

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public static function escapeWithDoubleQuotes($value)`
`71`	`71`	`*/`
`72`	`72`	`public static function requiresSingleQuoting($value)`
`73`	`73`	`{`
`74`		- return preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] \| \A[ - ? \| < > = ! % @ ` ]/x', $value);
	`74`	+ return preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] \| \A[ \- ? \| < > = ! % @ ` ]/x', $value);
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Yaml\Tests;`
`13`	`13`
`14`		`-use Symfony\Component\Yaml\Yaml;`
`15`	`14`	`use Symfony\Component\Yaml\Inline;`
`16`	`15`
`17`	`16`	`class InlineTest extends \PHPUnit_Framework_TestCase`
`@@ -31,11 +30,11 @@ public function testDump()`
`31`	`30`	`$this->assertEquals($yaml, Inline::dump($value), sprintf('::dump() converts a PHP structure to an inline YAML (%s)', $yaml));`
`32`	`31`	`}`
`33`	`32`
`34`		`- foreach ($this->getTestsForParse() as $yaml => $value) {`
	`33`	`+ foreach ($this->getTestsForParse() as $value) {`
`35`	`34`	`$this->assertEquals($value, Inline::parse(Inline::dump($value)), 'check consistency');`
`36`	`35`	`}`
`37`	`36`
`38`		`- foreach ($testsForDump as $yaml => $value) {`
	`37`	`+ foreach ($testsForDump as $value) {`
`39`	`38`	`$this->assertEquals($value, Inline::parse(Inline::dump($value)), 'check consistency');`
`40`	`39`	`}`
`41`	`40`	`}`
`@@ -205,6 +204,9 @@ protected function getTestsForDump()`
`205`	`204`
`206`	`205`	`"'a \"string\" with ''quoted strings inside'''" => 'a "string" with \'quoted strings inside\'',`
`207`	`206`
	`207`	`+ "'-dash'" => '-dash',`
	`208`	`+ "'-'" => '-',`
	`209`	`+`
`208`	`210`	`// sequences`
`209`	`211`	`'[foo, bar, false, null, 12]' => array('foo', 'bar', false, null, 12),`
`210`	`212`	`'[\'foo,bar\', \'foo bar\']' => array('foo,bar', 'foo bar'),`