Skip to content

Upgrade php-css-parser to v8.4.0 #6800

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 5 commits into from
Mar 3, 2022
Merged

Upgrade php-css-parser to v8.4.0 #6800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58880d1
Remove obsolete php-css-parser-install-composer-plugin
westonruter Feb 24, 2022
fe5a77d
Upgrade php-css-parser to 8.4.0
westonruter Feb 24, 2022
e9e9a3b
Update patches to exclude changes to tests so they can apply when ins…
westonruter Feb 24, 2022
f5290d5
Add composer-exit-on-patch-failure: true
westonruter Feb 24, 2022
ee6f7c7
Bump stylesheet cache group
westonruter Feb 24, 2022
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 @@ -10,7 +10,6 @@ module.exports = function( grunt ) {
'assets',
'back-compat',
'includes',
'php-css-parser-install-composer-plugin',
'src',
'templates',
'uninstall.php',
Expand All @@ -26,7 +25,6 @@ module.exports = function( grunt ) {
// ⚠️ Warning: These paths are passed straight to rm command in the shell, without any escaping.
const productionInstallExcludedFilePatterns = [
'composer.*',
'php-css-parser-install-composer-plugin',
'vendor/*/*/.editorconfig',
'vendor/*/*/.git',
'vendor/*/*/.github',
Expand Down
17 changes: 5 additions & 12 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
"ampproject/amp-toolbox": "0.10.0",
"cweagans/composer-patches": "~1.0",
"fasterimage/fasterimage": "1.5.0",
"sabberworm/php-css-parser": "dev-master#bfdd976"
"sabberworm/php-css-parser": "8.4.0"
},
"require-dev": {
"ampproject/php-css-parser-install-plugin": "*",
"automattic/vipwpcs": "^2.2",
"civicrm/composer-downloads-plugin": "^3.0",
"dealerdirect/phpcodesniffer-composer-installer": "0.7.2",
Expand All @@ -43,12 +42,6 @@
"ext-intl": "Enables use of idn_to_utf8() to convert punycode domains to UTF-8 for use with an AMP Cache.",
"ext-mbstring": "Used by PHP-CSS-Parser when working with stylesheets."
},
"repositories": [
{
"type": "path",
"url": "./php-css-parser-install-composer-plugin"
}
],
"minimum-stability": "dev",
"prefer-stable": true,
"autoload": {
Expand Down Expand Up @@ -77,7 +70,6 @@
},
"config": {
"allow-plugins": {
"ampproject/php-css-parser-install-plugin": true,
"civicrm/composer-downloads-plugin": true,
"cweagans/composer-patches": true,
"dealerdirect/phpcodesniffer-composer-installer": true
Expand All @@ -88,6 +80,7 @@
"sort-packages": true
},
"extra": {
"composer-exit-on-patch-failure": true,
"downloads": {
"phpstan": {
"path": "vendor/bin/phpstan",
Expand All @@ -100,9 +93,9 @@
"Fix ReflectionParameter warnings on PHP 8": "patches/phpunit-mock-objects.patch"
},
"sabberworm/php-css-parser": {
"1. 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",
"2. 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",
"3. 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"
"1. Add additional validation for size unit <https://github.com/sabberworm/PHP-CSS-Parser/pull/350>": "https://github.com/westonruter/PHP-CSS-Parser/commit/5b1d6a4abe43f4311d9b4674913ca665ed8c43aa.diff",
"2. Validate name-start code points for identifier <https://github.com/westonruter/PHP-CSS-Parser/pull/2>": "https://github.com/westonruter/PHP-CSS-Parser/commit/9f96bc97fcb1e848a2f6ca6f658009996883dffc.diff",
"3. Fix parsing CSS selectors which contain commas <https://github.com/westonruter/PHP-CSS-Parser/pull/1>": "https://github.com/westonruter/PHP-CSS-Parser/commit/dc18ba737fd6a611189a5b83729396500676f8dd.diff"
}
}
},
Expand Down
Loading