[Yaml] Allow comments after tab #15747
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Yaml 1.2 space white space is space or tab
In Yaml 1.2 spec white space is space or tab
…into YamlCommentsAfterTab
…into YamlCommentsAfterTab
| @@ -209,7 +209,8 @@ public static function parseScalar($scalar, $delimiters = null, $stringDelimiter | |||
| $i += strlen($output); | |||
|
|
|||
| // remove comments | |||
| if (false !== $strpos = strpos($output, ' #')) { | |||
| if ((false !== $strpos = strpos($output, '#')) && | |||
| ($output[$strpos-1] == ' ' || $output[$strpos-1] == "\t")) { | |||
…into YamlCommentsAfterTab
|
@fabpot Fixed the code style. |
| @@ -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, '#')) && ($output[$strpos - 1] == ' ' || $output[$strpos - 1] == "\t")) { | |||
There was a problem hiding this comment.
you have to use === and the yoda style (' ' === $output[$strpos - 1])
|
@superdav42 Can you also rebase (instead of merge) to get rid of the merge commits? |
|
Can you also paste the part of the YAML configuration that talks about this? Thanks. |
Yaml 1.2 space white space is space or tab
…into YamlCommentsAfterTab
|
@superdav42 you just need to force the push to your feature branch (as explained in our documentation btw). For branches used for PRs, it is fine |
fabpot
added a commit
that referenced
this pull request
Oct 7, 2015
…perdav42) This PR was merged into the 2.3 branch. Discussion ---------- [Yaml] Allow tabs before comments at the end of a line | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT If a yml file has a tab character before a line ending comment the comment will be included in the parsed value. Yaml spec allows tab or space as whitespace characters so we need to check for tab as well. See included test. Recently caused an odd and hard to find bug in our project. See spec: http://www.yaml.org/spec/1.2/spec.html#s-b-comment http://www.yaml.org/spec/1.2/spec.html#s-separate-in-line http://www.yaml.org/spec/1.2/spec.html#s-white This is a new PR replacing #15747 @fabpot Commits ------- d040be7 [Yaml] Allow tabs before comments at the end of a line
fabpot
added a commit
to symfony/yaml
that referenced
this pull request
Oct 7, 2015
…perdav42) This PR was merged into the 2.3 branch. Discussion ---------- [Yaml] Allow tabs before comments at the end of a line | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT If a yml file has a tab character before a line ending comment the comment will be included in the parsed value. Yaml spec allows tab or space as whitespace characters so we need to check for tab as well. See included test. Recently caused an odd and hard to find bug in our project. See spec: http://www.yaml.org/spec/1.2/spec.html#s-b-comment http://www.yaml.org/spec/1.2/spec.html#s-separate-in-line http://www.yaml.org/spec/1.2/spec.html#s-white This is a new PR replacing symfony/symfony#15747 @fabpot Commits ------- d040be7 [Yaml] Allow tabs before comments at the end of a line
fabpot
added a commit
to symfony/yaml
that referenced
this pull request
Oct 10, 2015
…perdav42) This PR was merged into the 2.3 branch. Discussion ---------- [Yaml] Allow tabs before comments at the end of a line | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT If a yml file has a tab character before a line ending comment the comment will be included in the parsed value. Yaml spec allows tab or space as whitespace characters so we need to check for tab as well. See included test. Recently caused an odd and hard to find bug in our project. See spec: http://www.yaml.org/spec/1.2/spec.html#s-b-comment http://www.yaml.org/spec/1.2/spec.html#s-separate-in-line http://www.yaml.org/spec/1.2/spec.html#s-white This is a new PR replacing symfony/symfony#15747 @fabpot Commits ------- d040be7 [Yaml] Allow tabs before comments at the end of a line
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If a yml file has a tab character before a line ending comment the comment will be included in the parsed value. Yaml spec allows tab or space as whitespace characters so we need to check for tab as well. See included test.
Recently caused an odd and hard to find bug in our project.