Skip to content

Commit 2950487

Browse files
pierlonwestonruter
authored andcommitted
Use patches from GitHub to patch PHP-CSS-Parser (#5556)
1 parent 8fa8c2c commit 2950487

File tree

6 files changed

+44
-956
lines changed

6 files changed

+44
-956
lines changed

Gruntfile.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ module.exports = function( grunt ) {
2525
// ⚠️ Warning: These paths are passed straight to rm command in the shell, without any escaping.
2626
const productionVendorExcludedFilePatterns = [
2727
'composer.*',
28-
'patches',
2928
'lib',
3029
'vendor/*/*/.editorconfig',
3130
'vendor/*/*/.git',
@@ -164,7 +163,6 @@ module.exports = function( grunt ) {
164163
paths.push( 'assets/js/**/*.js' );
165164
paths.push( 'assets/js/**/*.asset.php' );
166165
paths.push( 'assets/css/*.css' );
167-
paths.push( 'patches/*.patch' );
168166

169167
if ( 'development' === process.env.NODE_ENV ) {
170168
paths.push( 'assets/js/**/*.js.map' );

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
},
5353
"patches": {
5454
"sabberworm/php-css-parser": {
55-
"Add additional validation for size unit <https://github.com/sabberworm/PHP-CSS-Parser/pull/193>": "patches/php-css-parser-pull-193.patch",
56-
"Validate name-start code points for identifier <https://github.com/sabberworm/PHP-CSS-Parser/pull/185>": "patches/php-css-parser-pull-185.patch",
57-
"Fix parsing CSS selectors which contain commas <https://github.com/westonruter/PHP-CSS-Parser/pull/1>": "patches/php-css-parser-commit-10a2501.patch"
55+
"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",
56+
"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",
57+
"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"
5858
}
5959
}
6060
},

composer.lock

Lines changed: 41 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)