Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Yaml] recognize when a block scalar is left #17159

Merged
merged 1 commit into from Jan 4, 2016
Merged

Conversation

xabbuh
Copy link
Member

@xabbuh xabbuh commented Dec 28, 2015

Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets #17116
License MIT
Doc PR

The parser did not recognize when the block scalar was completely parsed
and thus treated following comments as they need to be kept leading to
parse errors on the following lines.

The parser did not recognize when the block scalar was completely parsed
and thus treated following comments as they need to be kept leading to
parse errors on the following lines.
@xabbuh
Copy link
Member Author

xabbuh commented Jan 4, 2016

ping @symfony/deciders

@fabpot
Copy link
Member

fabpot commented Jan 4, 2016

Thank you @xabbuh.

@stof
Copy link
Member

stof commented Jan 4, 2016

👍

@fabpot fabpot merged commit 3a22165 into symfony:2.3 Jan 4, 2016
fabpot added a commit that referenced this pull request Jan 4, 2016
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] recognize when a block scalar is left

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #17116
| License       | MIT
| Doc PR        |

The parser did not recognize when the block scalar was completely parsed
and thus treated following comments as they need to be kept leading to
parse errors on the following lines.

Commits
-------

3a22165 [Yaml] recognize when a block scalar is left
@stof
Copy link
Member

stof commented Jan 4, 2016

We should check why form tests are failing though. We might have merged a buggy PR.

@xabbuh xabbuh deleted the issue-17116 branch January 4, 2016 11:16
@xabbuh
Copy link
Member Author

xabbuh commented Jan 4, 2016

@stof see #17248

This was referenced Jan 14, 2016
@fabpot fabpot mentioned this pull request Feb 3, 2016
nicolas-grekas added a commit that referenced this pull request Aug 14, 2018
This PR was merged into the 3.4 branch.

Discussion
----------

[Yaml] clean up unused code

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

The removed lines were added in #17159 to be able to detect comment lines without running into parse errors. Part of that was reverted in #25241 when the logic was overhauled leading to now useless initialisation of variables that are never evaluated.

Commits
-------

a7672bd clean up unused code
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants