[Yaml] Allow tabs before comments at the end of a line

superdav42 · superdav42 · commit 4fb5c1230ad0 · 2015-09-14T11:34:28.000-06:00
In Yaml 1.2 spec white space is space or tab
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -209,7 +209,7 @@ public static function parseScalar($scalar, $delimiters = null, $stringDelimiter
                 $i += strlen($output);
 
                 // remove comments
-                if (false !== $strpos = strpos($output, ' #')) {
+                if ((false !== $strpos = strpos($output, ' #')) || (false !== $strpos = strpos($output, "\t#"))) {
                     $output = rtrim(substr($output, 0, $strpos));
                 }
             } elseif (preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match)) {
diff --git a/src/Symfony/Component/Yaml/Tests/Fixtures/sfComments.yml b/src/Symfony/Component/Yaml/Tests/Fixtures/sfComments.yml
@@ -7,8 +7,10 @@ yaml: |
     ex2: "foo # bar" # comment
     ex3: 'foo # bar' # comment
     ex4: foo # comment
+    ex5: foo	#	comment with tab before  
+    ex6: foo#foo # comment here
 php: |
-    array('ex1' => 'foo # bar', 'ex2' => 'foo # bar', 'ex3' => 'foo # bar', 'ex4' => 'foo')
+    array('ex1' => 'foo # bar', 'ex2' => 'foo # bar', 'ex3' => 'foo # bar', 'ex4' => 'foo', 'ex5' => 'foo', 'ex6' => 'foo#foo')
 ---
 test: Comments in the middle
 brief: >

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ public static function parseScalar($scalar, $delimiters = null, $stringDelimiter`
`209`	`209`	`$i += strlen($output);`
`210`	`210`
`211`	`211`	`// remove comments`
`212`		`- if (false !== $strpos = strpos($output, ' #')) {`
	`212`	`+ if ((false !== $strpos = strpos($output, ' #')) \|\| (false !== $strpos = strpos($output, "\t#"))) {`
`213`	`213`	`$output = rtrim(substr($output, 0, $strpos));`
`214`	`214`	`}`
`215`	`215`	`} elseif (preg_match('/^(.+?)('.implode('\|', $delimiters).')/', substr($scalar, $i), $match)) {`