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

ExtraEmptyLinesFixer bugfix #68

Merged
merged 3 commits into from
May 29, 2012
Merged

Conversation

Seldaek
Copy link
Contributor

@Seldaek Seldaek commented May 28, 2012

There was an issue in heredocs/nowdocs containing {, } or 1. The regex wouldn't match and they weren't safe anymore.

/cc @adrienbrault

@Seldaek
Copy link
Contributor Author

Seldaek commented May 28, 2012

Meh. Seems like this is segfaulting again (not in the tests, but when running it on some code..)

@Seldaek
Copy link
Contributor Author

Seldaek commented May 28, 2012

Ok. Seems to work fine for me now. Please test it on some large codebase before merging though.

@adrienbrault
Copy link
Contributor

No segfault over here

fabpot added a commit that referenced this pull request May 29, 2012
Commits
-------

d881a84 Fix segfault
f22dfc0 Fix ExtraEmptyLinesFixer regex for nowdocs and small cleanup of to_fix group
5102b4a Add failing test: if nowdoc contains { } or 1 the regex fails to match and strips extra lines

Discussion
----------

ExtraEmptyLinesFixer bugfix

There was an issue in heredocs/nowdocs containing {, } or 1. The regex wouldn't match and they weren't safe anymore.

/cc @adrienbrault

---------------------------------------------------------------------------

by Seldaek at 2012-05-28T14:14:14Z

Meh. Seems like this is segfaulting again (not in the tests, but when running it on some code..)

---------------------------------------------------------------------------

by Seldaek at 2012-05-28T14:37:40Z

Ok. Seems to work fine for me now. Please test it on some large codebase before merging though.

---------------------------------------------------------------------------

by adrienbrault at 2012-05-28T14:50:24Z

No segfault over here
@fabpot fabpot merged commit d881a84 into PHP-CS-Fixer:master May 29, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants