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

Backport all of 3.0 to 2.x without phpcsutils #213

Merged
merged 7 commits into from
Nov 10, 2020
Merged

Conversation

sirbrillig
Copy link
Owner

@sirbrillig sirbrillig commented Oct 29, 2020

Although PHPCSUtils presents an amazing mechanism for this package to improve its compatibility and reduce false positives, as a project it remains in an alpha state and in the meantime it blocks this package from all the features added since the 2.x branch. Notably, PHP 7.4 support and improved scope detection.

This PR backports the entirety of the 3.0 branch to 2.x with the PHPCSUtils imports replaced with custom local versions that, while certainly less effective and complete than the PHPCSUtils versions, at least make the tests pass.

This would allow us to release version 2.10.0 with a lot of improvements and keep 3.0 waiting on the PHPCSUtils release cycle (which itself is waiting on PHPCS).

@sirbrillig sirbrillig changed the base branch from master to 2.x-legacy October 29, 2020 19:26
@sirbrillig sirbrillig changed the base branch from 2.x-legacy to master October 29, 2020 19:27
composer.json Show resolved Hide resolved
@sirbrillig
Copy link
Owner Author

Before I do anything with this I'm going to run it on a bunch of real code to see how well it works. Just because the tests pass does not guarantee I didn't miss some issues. Bonus: this will serve to give us more test cases!

@sirbrillig sirbrillig mentioned this pull request Nov 6, 2020
@sirbrillig sirbrillig changed the base branch from master to 2.10 November 10, 2020 22:14
@sirbrillig
Copy link
Owner Author

All my testing seems to imply that this works just as well as 3.0. I'm sure there's more edge cases but we can handle those in patch releases.

@sirbrillig sirbrillig merged commit bcb9c56 into 2.10 Nov 10, 2020
@sirbrillig sirbrillig deleted the try-backport-all-3.0 branch November 10, 2020 22:15
@sirbrillig
Copy link
Owner Author

I did have to undo these two PRs, which are also breaking changes:

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.

2 participants