Skip to content

Use patches from GitHub to patch PHP-CSS-Parser #5556

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Nov 2, 2020
Merged

Use patches from GitHub to patch PHP-CSS-Parser #5556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc3514a
Use remote patches for patching PHP-CSS-Parser
pierlon Nov 2, 2020
d423707
Update composer.lock
pierlon Nov 2, 2020
3984655
Update build script
pierlon Nov 2, 2020
2551ea8
Update composer.lock
pierlon Nov 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ module.exports = function( grunt ) {
// ⚠️ Warning: These paths are passed straight to rm command in the shell, without any escaping.
const productionVendorExcludedFilePatterns = [
'composer.*',
'patches',
'lib',
'vendor/*/*/.editorconfig',
'vendor/*/*/.git',
Expand Down Expand Up @@ -164,7 +163,6 @@ module.exports = function( grunt ) {
paths.push( 'assets/js/**/*.js' );
paths.push( 'assets/js/**/*.asset.php' );
paths.push( 'assets/css/*.css' );
paths.push( 'patches/*.patch' );

if ( 'development' === process.env.NODE_ENV ) {
paths.push( 'assets/js/**/*.js.map' );
Expand Down
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
},
"patches": {
"sabberworm/php-css-parser": {
"Add additional validation for size unit <https://github.com/sabberworm/PHP-CSS-Parser/pull/193>": "patches/php-css-parser-pull-193.patch",
"Validate name-start code points for identifier <https://github.com/sabberworm/PHP-CSS-Parser/pull/185>": "patches/php-css-parser-pull-185.patch",
"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"
Copy link
Contributor Author

@pierlon pierlon Nov 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@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.

}
}
},
Expand Down
61 changes: 31 additions & 30 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

143 changes: 0 additions & 143 deletions patches/php-css-parser-commit-10a2501.patch
View file
Open in desktop

This file was deleted.

Loading