Use patches from GitHub to patch PHP-CSS-Parser#5556
Merged
westonruter merged 4 commits intodevelopfrom Nov 2, 2020
Merged
Conversation
pierlon
added
dependencies
westonruter
approved these changes
Nov 2, 2020
pierlon
commented
Nov 2, 2020
| "Fix parsing CSS selectors which contain commas <https://github.com/westonruter/PHP-CSS-Parser/pull/1>": "patches/php-css-parser-commit-10a2501.patch" | ||
| "Add additional validation for size unit <https://github.com/sabberworm/PHP-CSS-Parser/pull/193>": "https://github.com/sabberworm/PHP-CSS-Parser/compare/3bc5ded67d77a52b81608cfc97f23b1bb0678e2f%5E...468da3441945e9c1bf402a3340b1d8326723f7d9.patch", | ||
| "Validate name-start code points for identifier <https://github.com/sabberworm/PHP-CSS-Parser/pull/185>": "https://github.com/sabberworm/PHP-CSS-Parser/compare/d42b64793f2edaffeb663c63e9de79069cdc0831%5E...113df5d55e94e21c6402021dfa959924941d4c29.patch", | ||
| "Fix parsing CSS selectors which contain commas <https://github.com/westonruter/PHP-CSS-Parser/pull/1>": "https://github.com/westonruter/PHP-CSS-Parser/compare/master...10a2501c119abafced3e4014aa3c0a3453a86f67.patch" |
Contributor
Author
There was a problem hiding this comment.
@westonruter I'm using master as the head for this patch because westonruter/PHP-CSS-Parser#1 includes a merge commit that would include a lot of unnecessary changes not relevant to the changes in the PR.
Contributor
Author
Contributor
|
Plugin builds for 2551ea8 are ready 🛎️!
|
swissspidy
approved these changes
Nov 2, 2020
Contributor
Author
|
|
pierlon
force-pushed
the
enhancement/composer-remote-patches
branch
from
6eb83a7 to
2551ea8
Compare
westonruter
pushed a commit
that referenced
this pull request
Nov 2, 2020
Member
Contributor
|
@pierlon Any suggestions for QA testing this? |
Contributor
Author
|
Running |
westonruter
added
the
Changelogged
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Summary
In GoogleForCreators/web-stories-wp#5082 @westonruter & @swissspidy discussed the idea of using patches from GitHub instead of providing ones locally. The advantage with this approach is that the remote patches are easier to update, and it would resolve the issue of other packages not being able to apply our local patches (see cweagans/composer-patches#315).
While working on this I found out the remote patch from MyIntervals/PHP-CSS-Parser#193 was not being applied cleanly, so I had to rebase with the latest changes from the
masterbranch for it to succeed.Checklist