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

Fix PHP-CSS-Parser patching #5082

Merged
merged 3 commits into from
Nov 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 22 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"ext-json": "*",
"ext-libxml": "*",
"ext-mbstring": "*",
"ampproject/amp-wp": "^2.0.4",
"ampproject/amp-wp": "^2.0.5",
"civicrm/composer-downloads-plugin": "^3.0",
"cweagans/composer-patches": "^1.6",
"mcaskill/composer-exclude-files": "^2.0",
Expand All @@ -23,7 +23,6 @@
},
"require-dev": {
"automattic/vipwpcs": "^2.1",
"civicrm/composer-downloads-plugin": "^3.0",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7",
"php-stubs/wordpress-stubs": "^5.5",
"phpcompatibility/phpcompatibility-wp": "^2.1",
Expand Down Expand Up @@ -53,14 +52,28 @@
"type": "phar"
}
},
"enable-patching": false,
"exclude-from-files": [
"ampproject/amp-wp/back-compat/back-compat.php",
"ampproject/amp-wp/includes/amp-helper-functions.php",
"ampproject/amp-wp/includes/admin/functions.php",
"ampproject/amp-wp/includes/deprecated.php",
"ampproject/amp-wp/docs/includes/register-wp-cli-commands.php"
]
],
"patches": {
"sabberworm/php-css-parser": {
"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",
"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"
}
},
"patches-ignore": {
"ampproject/amp-wp": {
"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"
}
}
}
},
"autoload": {
"psr-4": {
Expand All @@ -83,6 +96,11 @@
"type": "vcs",
"url": "https://github.com/ampproject/amp-wp",
"no-api": true
},
{
"type": "vcs",
"url": "https://github.com/sabberworm/PHP-CSS-Parser.git",
"no-api": true
}
],
"minimum-stability": "dev",
Expand Down
9 changes: 7 additions & 2 deletions composer.lock

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

This file was deleted.

Loading