diff --git a/Gruntfile.js b/Gruntfile.js index 953fa837581..36d01f0cd39 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -10,7 +10,6 @@ module.exports = function( grunt ) { 'assets', 'back-compat', 'includes', - 'php-css-parser-install-composer-plugin', 'src', 'templates', 'uninstall.php', @@ -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', diff --git a/composer.json b/composer.json index 725c6beeffe..f2c919ae7ac 100644 --- a/composer.json +++ b/composer.json @@ -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", @@ -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": { @@ -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 @@ -88,6 +80,7 @@ "sort-packages": true }, "extra": { + "composer-exit-on-patch-failure": true, "downloads": { "phpstan": { "path": "vendor/bin/phpstan", @@ -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/compare/3bc5ded67d77a52b81608cfc97f23b1bb0678e2f%5E...468da3441945e9c1bf402a3340b1d8326723f7d9.patch", - "2. Validate name-start code points for identifier ": "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/compare/master...10a2501c119abafced3e4014aa3c0a3453a86f67.patch" + "1. Add additional validation for size unit ": "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/commit/9f96bc97fcb1e848a2f6ca6f658009996883dffc.diff", + "3. Fix parsing CSS selectors which contain commas ": "https://github.com/westonruter/PHP-CSS-Parser/commit/dc18ba737fd6a611189a5b83729396500676f8dd.diff" } } }, diff --git a/composer.lock b/composer.lock index d8f2666308f..a779b98fc36 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "227177e7ef90ce3237a26bfe954a79c8", + "content-hash": "9f48e9e973598a741cd17589f5b38565", "packages": [ { "name": "ampproject/amp-toolbox", @@ -62,12 +62,12 @@ } }, "autoload": { - "psr-4": { - "AmpProject\\": "src/" - }, "files": [ "include/compatibility-fixes.php" - ] + ], + "psr-4": { + "AmpProject\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -189,30 +189,33 @@ }, { "name": "sabberworm/php-css-parser", - "version": "dev-master", + "version": "8.4.0", "source": { "type": "git", "url": "https://github.com/sabberworm/PHP-CSS-Parser.git", - "reference": "bfdd976" + "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/bfdd976", - "reference": "bfdd976", + "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/e41d2140031d533348b2192a83f02d8dd8a71d30", + "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30", "shasum": "" }, "require": { - "php": ">=5.3.2" + "ext-iconv": "*", + "php": ">=5.6.20" }, "require-dev": { "codacy/coverage": "^1.4", "phpunit/phpunit": "^4.8.36" }, - "default-branch": true, + "suggest": { + "ext-mbstring": "for parsing UTF-8 CSS" + }, "type": "library", "autoload": { "psr-4": { - "Sabberworm\\CSS\\": "lib/Sabberworm/CSS/" + "Sabberworm\\CSS\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -233,9 +236,9 @@ ], "support": { "issues": "https://github.com/sabberworm/PHP-CSS-Parser/issues", - "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/master" + "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/8.4.0" }, - "time": "2021-08-01T19:34:12+00:00" + "time": "2021-12-11T13:40:54+00:00" }, { "name": "willwashburn/stream", @@ -290,36 +293,6 @@ } ], "packages-dev": [ - { - "name": "ampproject/php-css-parser-install-plugin", - "version": "dev-main", - "dist": { - "type": "path", - "url": "./php-css-parser-install-composer-plugin", - "reference": "ed89dbc5de10f6ed5339ed00a03fad952515bb64" - }, - "require": { - "composer-plugin-api": "^2.0" - }, - "require-dev": { - "composer/composer": "^2.0" - }, - "type": "composer-plugin", - "extra": { - "class": "AmpProject\\AmpWP\\PhpCssParserInstall\\Plugin" - }, - "autoload": { - "psr-4": { - "AmpProject\\AmpWP\\PhpCssParserInstall\\": "./src" - } - }, - "license": [ - "GPL-2.0-or-later" - ], - "transport-options": { - "relative": true - } - }, { "name": "antecedent/patchwork", "version": "2.1.14", @@ -649,12 +622,12 @@ } }, "autoload": { - "psr-4": { - "Brain\\Monkey\\": "src/" - }, "files": [ "inc/api.php" - ] + ], + "psr-4": { + "Brain\\Monkey\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1268,12 +1241,12 @@ } }, "autoload": { - "psr-4": { - "GuzzleHttp\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1330,12 +1303,12 @@ } }, "autoload": { - "psr-4": { - "GuzzleHttp\\Promise\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3363,15 +3336,16 @@ }, "conflict": { "3f/pygmentize": "<1.2", - "adodb/adodb-php": "<5.20.12", + "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3", "akaunting/akaunting": "<2.1.13", "alterphp/easyadmin-extension-bundle": ">=1.2,<1.2.11|>=1.3,<1.3.1", "amazing/media2click": ">=1,<1.3.3", "amphp/artax": "<1.0.6|>=2,<2.0.6", "amphp/http": "<1.0.1", "amphp/http-client": ">=4,<4.4", + "anchorcms/anchor-cms": "<=0.12.7", "api-platform/core": ">=2.2,<2.2.10|>=2.3,<2.3.6", - "area17/twill": "<=2.5.2", + "area17/twill": "<1.2.5|>=2,<2.5.3", "asymmetricrypt/asymmetricrypt": ">=0,<9.9.99", "aws/aws-sdk-php": ">=3,<3.2.1", "bagisto/bagisto": "<0.1.5", @@ -3382,11 +3356,13 @@ "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3", "bolt/bolt": "<3.7.2", "bolt/core": "<4.1.13", + "bottelet/flarepoint": "<2.2.1", "brightlocal/phpwhois": "<=4.2.5", "buddypress/buddypress": "<7.2.1", "bugsnag/bugsnag-laravel": ">=2,<2.0.2", + "bytefury/crater": "<6.0.2", "cachethq/cachet": "<2.5.1", - "cakephp/cakephp": ">=1.3,<1.3.18|>=2,<2.4.99|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3,<3.5.18|>=3.6,<3.6.15|>=3.7,<3.7.7", + "cakephp/cakephp": "<4.0.6", "cardgate/magento2": "<2.0.33", "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4", "cartalyst/sentry": "<=2.1.6", @@ -3395,13 +3371,14 @@ "cesnet/simplesamlphp-module-proxystatistics": "<3.1", "codeception/codeception": "<3.1.3|>=4,<4.1.22", "codeigniter/framework": "<=3.0.6", + "codeigniter4/framework": "<4.1.8", "codiad/codiad": "<=2.8.4", "composer/composer": "<1.10.23|>=2-alpha.1,<2.1.9", - "concrete5/concrete5": "<8.5.5", + "concrete5/concrete5": "<9", "concrete5/core": "<8.5.7", "contao-components/mediaelement": ">=2.14.2,<2.21.1", "contao/core": ">=2,<3.5.39", - "contao/core-bundle": ">=4,<4.4.56|>=4.5,<4.9.18|>=4.10,<4.11.7|= 4.10.0", + "contao/core-bundle": "<4.9.18|>=4.10,<4.11.7|= 4.10.0", "contao/listing-bundle": ">=4,<4.4.8", "craftcms/cms": "<3.7.14", "croogo/croogo": "<3.0.7", @@ -3418,15 +3395,15 @@ "doctrine/mongodb-odm": ">=1,<1.0.2", "doctrine/mongodb-odm-bundle": ">=2,<3.0.1", "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4", - "dolibarr/dolibarr": "<14|>= 3.3.beta1, < 13.0.2", + "dolibarr/dolibarr": "<=14.0.5|>= 3.3.beta1, < 13.0.2", "dompdf/dompdf": ">=0.6,<0.6.2", "drupal/core": ">=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4", "drupal/drupal": ">=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4", "dweeves/magmi": "<=0.7.24", "ecodev/newsletter": "<=4", - "elgg/elgg": "<3.3.22", + "elgg/elgg": "<3.3.24|>=4,<4.0.5", "endroid/qr-code-bundle": "<3.4.2", - "enshrined/svg-sanitize": "<0.13.1", + "enshrined/svg-sanitize": "<0.15", "erusev/parsedown": "<1.7.2", "ether/logs": "<3.0.4", "ezsystems/demobundle": ">=5.4,<5.4.6.1", @@ -3440,7 +3417,7 @@ "ezsystems/ezplatform-rest": ">=1.2,<=1.2.2|>=1.3,<1.3.8", "ezsystems/ezplatform-richtext": ">=2.3,<=2.3.7", "ezsystems/ezplatform-user": ">=1,<1.0.1", - "ezsystems/ezpublish-kernel": "<=6.13.8.1|>=7,<=7.5.15.1", + "ezsystems/ezpublish-kernel": "<=6.13.8.1|>=7,<7.5.26", "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.6,<=2019.3.5.1", "ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3", "ezsystems/repository-forms": ">=2.3,<2.3.2.1", @@ -3463,50 +3440,58 @@ "friendsoftypo3/mediace": ">=7.6.2,<7.6.5", "froala/wysiwyg-editor": "<3.2.7", "fuel/core": "<1.8.1", - "getgrav/grav": "<=1.7.24", + "gaoming13/wechat-php-sdk": "<=1.10.2", + "getgrav/grav": "<1.7.28", "getkirby/cms": "<3.5.8", "getkirby/panel": "<2.5.14", "gilacms/gila": "<=1.11.4", "globalpayments/php-sdk": "<2", + "google/protobuf": "<3.15", "gos/web-socket-bundle": "<1.10.4|>=2,<2.6.1|>=3,<3.3", "gree/jose": "<=2.2", "gregwar/rst": "<1.0.3", - "grumpydictator/firefly-iii": "<5.6.3", + "grumpydictator/firefly-iii": "<5.6.5", "guzzlehttp/guzzle": ">=4-rc.2,<4.2.4|>=5,<5.3.1|>=6,<6.2.1", "helloxz/imgurl": "<=2.31", + "hillelcoren/invoice-ninja": "<5.3.35", "hjue/justwriting": "<=1", "hov/jobfair": "<1.0.13|>=2,<2.0.2", "ibexa/post-install": "<=1.0.4", - "icecoder/icecoder": "<=8", + "icecoder/icecoder": "<=8.1", "illuminate/auth": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.10", "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.99999|>=4.2,<=4.2.99999|>=5,<=5.0.99999|>=5.1,<=5.1.99999|>=5.2,<=5.2.99999|>=5.3,<=5.3.99999|>=5.4,<=5.4.99999|>=5.5,<=5.5.49|>=5.6,<=5.6.99999|>=5.7,<=5.7.99999|>=5.8,<=5.8.99999|>=6,<6.18.31|>=7,<7.22.4", "illuminate/database": "<6.20.26|>=7,<7.30.5|>=8,<8.40", "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15", - "illuminate/view": ">=7,<7.1.2", + "illuminate/view": "<6.20.42|>=7,<7.30.6|>=8,<8.75", "impresscms/impresscms": "<=1.4.2", "in2code/femanager": "<5.5.1|>=6,<6.3.1", "intelliants/subrion": "<=4.2.1", "ivankristianto/phpwhois": "<=4.3", + "jackalope/jackalope-doctrine-dbal": "<1.7.4", "james-heinrich/getid3": "<1.9.21", "joomla/archive": "<1.1.10", "joomla/session": "<1.3.1", + "jsdecena/laracom": "<2.0.9", "jsmitty12/phpwhois": "<5.1", "kazist/phpwhois": "<=4.2.6", - "kevinpapst/kimai2": "<1.16.3", + "kevinpapst/kimai2": "<1.16.7", "kitodo/presentation": "<3.1.2", "klaviyo/magento2-extension": ">=1,<3", "kreait/firebase-php": ">=3.2,<3.8.1", "la-haute-societe/tcpdf": "<6.2.22", + "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1", "laminas/laminas-http": "<2.14.2", - "laravel/framework": "<6.20.26|>=7,<7.30.5|>=8,<8.40", + "laravel/framework": "<6.20.42|>=7,<7.30.6|>=8,<8.75", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", + "latte/latte": "<2.10.8", "lavalite/cms": "<=5.8", "lcobucci/jwt": ">=3.4,<3.4.6|>=4,<4.0.4|>=4.1,<4.1.5", "league/commonmark": "<0.18.3", "league/flysystem": "<1.1.4|>=2,<2.1.1", "lexik/jwt-authentication-bundle": "<2.10.7|>=2.11,<2.11.3", - "librenms/librenms": "<=21.11", + "librenms/librenms": "<22.2", "limesurvey/limesurvey": "<3.27.19", + "livehelperchat/livehelperchat": "<=3.91", "livewire/livewire": ">2.2.4,<2.2.6", "lms/routes": "<2.1.1", "localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2", @@ -3517,18 +3502,20 @@ "marcwillmann/turn": "<0.3.3", "mautic/core": "<4|= 2.13.1", "mediawiki/core": ">=1.27,<1.27.6|>=1.29,<1.29.3|>=1.30,<1.30.2|>=1.31,<1.31.9|>=1.32,<1.32.6|>=1.32.99,<1.33.3|>=1.33.99,<1.34.3|>=1.34.99,<1.35", - "microweber/microweber": "<1.2.8", + "microweber/microweber": "<1.2.11", "miniorange/miniorange-saml": "<1.4.3", "mittwald/typo3_forum": "<1.2.1", "modx/revolution": "<2.8", "monolog/monolog": ">=1.8,<1.12", - "moodle/moodle": "<3.5.17|>=3.7,<3.7.9|>=3.8,<3.8.8|>=3.9,<3.9.5|>=3.10-beta,<3.10.2", + "moodle/moodle": "<3.9.11|>=3.10-beta,<3.10.8|>=3.11,<3.11.5", + "mustache/mustache": ">=2,<2.14.1", "namshi/jose": "<2.2", "neoan3-apps/template": "<1.1.1", "neos/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6", "neos/form": ">=1.2,<4.3.3|>=5,<5.0.9|>=5.1,<5.1.3", "neos/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.9.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<3.3.23|>=4,<4.0.17|>=4.1,<4.1.16|>=4.2,<4.2.12|>=4.3,<4.3.3", "neos/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5", + "netgen/tagsbundle": ">=3.4,<3.4.11|>=4,<4.0.15", "nette/application": ">=2,<2.0.19|>=2.1,<2.1.13|>=2.2,<2.2.10|>=2.3,<2.3.14|>=2.4,<2.4.16|>=3,<3.0.6", "nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13", "nilsteampassnet/teampass": "<=2.1.27.36", @@ -3539,7 +3526,7 @@ "october/cms": "= 1.1.1|= 1.0.471|= 1.0.469|>=1.0.319,<1.0.469", "october/october": ">=1.0.319,<1.0.466|>=2.1,<2.1.12", "october/rain": "<1.0.472|>=1.1,<1.1.2", - "october/system": "<1.0.472|>=1.1.1,<1.1.5|>=2.1,<2.1.12", + "october/system": "<1.0.473|>=1.1,<1.1.6|>=2.1,<2.1.12", "onelogin/php-saml": "<2.10.4", "oneup/uploader-bundle": "<1.9.3|>=2,<2.1.5", "opencart/opencart": "<=3.0.3.2", @@ -3547,7 +3534,7 @@ "openmage/magento-lts": "<19.4.15|>=20,<20.0.13", "orchid/platform": ">=9,<9.4.4", "oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7", - "oro/platform": ">=1.7,<1.7.4", + "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<4.2.8", "padraic/humbug_get_contents": "<1.1.2", "pagarme/pagarme-php": ">=0,<3", "pagekit/pagekit": "<=1.0.18", @@ -3561,19 +3548,21 @@ "phpfastcache/phpfastcache": "<6.1.5|>=7,<7.1.2|>=8,<8.0.7", "phpmailer/phpmailer": "<6.5", "phpmussel/phpmussel": ">=1,<1.6", - "phpmyadmin/phpmyadmin": "<4.9.6|>=5,<5.0.3", + "phpmyadmin/phpmyadmin": "<4.9.8|>=5,<5.0.3|>=5.1,<5.1.2", "phpoffice/phpexcel": "<1.8.2", "phpoffice/phpspreadsheet": "<1.16", "phpseclib/phpseclib": "<2.0.31|>=3,<3.0.7", + "phpservermon/phpservermon": "<=3.5.2", "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5.0.10,<5.6.3", "phpwhois/phpwhois": "<=4.2.5", "phpxmlrpc/extras": "<0.6.1", - "pimcore/pimcore": "<10.1.3", - "pocketmine/pocketmine-mp": "<3.15.4", + "pimcore/pimcore": "<10.3.1", + "pocketmine/pocketmine-mp": "<4.0.7", "pressbooks/pressbooks": "<5.18", "prestashop/autoupgrade": ">=4,<4.10.1", "prestashop/contactform": ">1.0.1,<4.3", "prestashop/gamification": "<2.3.2", + "prestashop/prestashop": ">=1.7,<=1.7.8.2", "prestashop/productcomments": ">=4,<4.2.1", "prestashop/ps_emailsubscription": "<2.6.1", "prestashop/ps_facetedsearch": "<3.4.1", @@ -3581,12 +3570,15 @@ "privatebin/privatebin": "<1.2.2|>=1.3,<1.3.2", "propel/propel": ">=2-alpha.1,<=2-alpha.7", "propel/propel1": ">=1,<=1.7.1", - "pterodactyl/panel": "<1.6.6", + "pterodactyl/panel": "<1.7", + "ptrofimov/beanstalk_console": "<1.7.14", "pusher/pusher-php-server": "<2.2.1", "pwweb/laravel-core": "<=0.3.6-beta", "rainlab/debugbar-plugin": "<3.1", + "remdex/livehelperchat": "<3.93", "rmccue/requests": ">=1.6,<1.8", "robrichards/xmlseclibs": "<3.0.4", + "rudloff/alltube": "<3.0.1", "sabberworm/php-css-parser": ">=1,<1.0.1|>=2,<2.0.1|>=3,<3.0.1|>=4,<4.0.1|>=5,<5.0.9|>=5.1,<5.1.3|>=5.2,<5.2.1|>=6,<6.0.2|>=7,<7.0.4|>=8,<8.0.1|>=8.1,<8.1.1|>=8.2,<8.2.1|>=8.3,<8.3.1", "sabre/dav": ">=1.6,<1.6.99|>=1.7,<1.7.11|>=1.8,<1.8.9", "scheb/two-factor-bundle": ">=0,<3.26|>=4,<4.11", @@ -3595,14 +3587,14 @@ "shopware/core": "<=6.4.6", "shopware/platform": "<=6.4.6", "shopware/production": "<=6.3.5.2", - "shopware/shopware": "<5.7.6", - "showdoc/showdoc": "<2.9.13", - "silverstripe/admin": "<4.8.1", + "shopware/shopware": "<5.7.7", + "showdoc/showdoc": "<=2.10.2", + "silverstripe/admin": ">=1,<1.8.1", "silverstripe/assets": ">=1,<1.4.7|>=1.5,<1.5.2", "silverstripe/cms": "<4.3.6|>=4.4,<4.4.4", "silverstripe/comments": ">=1.3,<1.9.99|>=2,<2.9.99|>=3,<3.1.1", "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3", - "silverstripe/framework": "<4.7.4", + "silverstripe/framework": "<4.10.1", "silverstripe/graphql": "<3.5.2|>=4-alpha.1,<4-alpha.2", "silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1", "silverstripe/restfulserver": ">=1,<1.0.9|>=2,<2.0.4", @@ -3615,17 +3607,18 @@ "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", "simplito/elliptic-php": "<1.0.6", "slim/slim": "<2.6", - "smarty/smarty": "<3.1.39", - "snipe/snipe-it": "<5.3.3", + "smarty/smarty": "<3.1.43|>=4,<4.0.3", + "snipe/snipe-it": "<5.3.10", "socalnick/scn-social-auth": "<1.15.2", "socialiteproviders/steam": "<1.1", + "spipu/html2pdf": "<5.2.4", "spoonity/tcpdf": "<6.2.22", "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", - "ssddanbrown/bookstack": "<21.11.2", + "ssddanbrown/bookstack": "<21.12.1", "stormpath/sdk": ">=0,<9.9.99", "studio-42/elfinder": "<2.1.59", "subrion/cms": "<=4.2.1", - "sulu/sulu": "<1.6.43|>=2,<2.0.10|>=2.1,<2.1.1", + "sulu/sulu": "= 2.4.0-RC1|<1.6.44|>=2,<2.2.18|>=2.3,<2.3.8", "swiftmailer/swiftmailer": ">=4,<5.4.5", "sylius/admin-bundle": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2", "sylius/grid": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1", @@ -3641,7 +3634,7 @@ "symfony/dependency-injection": ">=2,<2.0.17|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/error-handler": ">=4.4,<4.4.4|>=5,<5.0.4", "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", - "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", + "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7|>=5.3.14,<=5.3.14|>=5.4.3,<=5.4.3|>=6.0.3,<=6.0.3|= 6.0.3|= 5.4.3|= 5.3.14", "symfony/http-foundation": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7", "symfony/http-kernel": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.4.13|>=5,<5.1.5|>=5.2,<5.3.12", "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", @@ -3659,7 +3652,7 @@ "symfony/security-guard": ">=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8", "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8|>=5.3,<5.3.2", "symfony/serializer": ">=2,<2.0.11|>=4.1,<4.4.35|>=5,<5.3.12", - "symfony/symfony": ">=2,<3.4.49|>=4,<4.4.35|>=5,<5.3.12", + "symfony/symfony": ">=2,<3.4.49|>=4,<4.4.35|>=5,<5.3.12|>=5.3.14,<=5.3.14|>=5.4.3,<=5.4.3|>=6.0.3,<=6.0.3", "symfony/translation": ">=2,<2.0.17", "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3", "symfony/var-exporter": ">=4.2,<4.2.12|>=4.3,<4.3.8", @@ -3668,16 +3661,18 @@ "t3/dce": ">=2.2,<2.6.2", "t3g/svg-sanitizer": "<1.0.3", "tecnickcom/tcpdf": "<6.2.22", + "terminal42/contao-tablelookupwizard": "<3.3.5", "thelia/backoffice-default-template": ">=2.1,<2.1.2", "thelia/thelia": ">=2.1-beta.1,<2.1.3", "theonedemon/phpwhois": "<=4.2.5", "tinymce/tinymce": "<5.10", "titon/framework": ">=0,<9.9.99", + "topthink/framework": "<6.0.9", "topthink/think": "<=6.0.9", "topthink/thinkphp": "<=3.2.3", "tribalsystems/zenario": "<8.8.53370", "truckersmp/phpwhois": "<=4.3.1", - "twig/twig": "<1.38|>=2,<2.7", + "twig/twig": "<1.38|>=2,<2.14.11|>=3,<3.3.8", "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.29|>=10,<10.4.19|>=11,<11.5", "typo3/cms-backend": ">=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1", "typo3/cms-core": ">=6.2,<=6.2.56|>=7,<=7.6.52|>=8,<=8.7.41|>=9,<9.5.29|>=10,<10.4.19|>=11,<11.5", @@ -3688,6 +3683,8 @@ "typo3/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5", "typo3fluid/fluid": ">=2,<2.0.8|>=2.1,<2.1.7|>=2.2,<2.2.4|>=2.3,<2.3.7|>=2.4,<2.4.4|>=2.5,<2.5.11|>=2.6,<2.6.10", "ua-parser/uap-php": "<3.8", + "unisharp/laravel-filemanager": "<=2.3", + "userfrosting/userfrosting": ">=0.3.1,<4.6.3", "usmanhalalit/pixie": "<1.0.3|>=2,<2.0.2", "vanilla/safecurl": "<0.9.2", "verot/class.upload.php": "<=1.0.3|>=2,<=2.0.4", @@ -3699,6 +3696,7 @@ "wikimedia/parsoid": "<0.12.2", "willdurand/js-translation-bundle": "<2.1.1", "wp-cli/wp-cli": "<2.5", + "yetiforce/yetiforce-crm": "<=6.3", "yidashi/yii2cmf": "<=2", "yii2mod/yii2-cms": "<1.9.2", "yiisoft/yii": ">=1.1.14,<1.1.15", @@ -5065,12 +5063,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Idn\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Idn\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5150,12 +5148,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -5234,12 +5232,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5391,12 +5389,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5671,12 +5669,12 @@ ] }, "autoload": { - "psr-4": { - "": "src/" - }, "files": [ "config-command.php" - ] + ], + "psr-4": { + "": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5747,12 +5745,12 @@ ] }, "autoload": { - "psr-4": { - "": "src/" - }, "files": [ "core-command.php" - ] + ], + "psr-4": { + "": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5805,12 +5803,12 @@ ] }, "autoload": { - "psr-4": { - "": "src/" - }, "files": [ "eval-command.php" - ] + ], + "psr-4": { + "": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5868,12 +5866,12 @@ ] }, "autoload": { - "psr-4": { - "": "src/" - }, "files": [ "export-command.php" - ] + ], + "psr-4": { + "": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -6018,12 +6016,12 @@ } }, "autoload": { - "psr-4": { - "Mustangostang\\": "src/" - }, "files": [ "includes/functions.php" - ] + ], + "psr-4": { + "Mustangostang\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -6061,12 +6059,12 @@ }, "type": "library", "autoload": { - "psr-0": { - "cli": "lib/" - }, "files": [ "lib/cli/cli.php" - ] + ], + "psr-0": { + "cli": "lib/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -6471,7 +6469,6 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "sabberworm/php-css-parser": 20, "roave/security-advisories": 20 }, "prefer-stable": true, diff --git a/includes/sanitizers/class-amp-style-sanitizer.php b/includes/sanitizers/class-amp-style-sanitizer.php index 4135cab6d0d..1a42b72fe34 100644 --- a/includes/sanitizers/class-amp-style-sanitizer.php +++ b/includes/sanitizers/class-amp-style-sanitizer.php @@ -1645,7 +1645,7 @@ private function fetch_external_stylesheet( $url ) { */ private function get_parsed_stylesheet( $stylesheet, $options = [] ) { $cached = true; - $cache_group = 'amp-parsed-stylesheet-v38'; // This should be bumped whenever the PHP-CSS-Parser is updated or parsed format is updated. + $cache_group = 'amp-parsed-stylesheet-v39'; // This should be bumped whenever the PHP-CSS-Parser is updated or parsed format is updated. $use_transients = $this->should_use_transient_caching(); // @todo If ValidationExemption::is_px_verified_for_node( $this->current_node ) then keep !important. diff --git a/php-css-parser-install-composer-plugin/composer.json b/php-css-parser-install-composer-plugin/composer.json deleted file mode 100644 index f466a68782c..00000000000 --- a/php-css-parser-install-composer-plugin/composer.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "ampproject/php-css-parser-install-plugin", - "type": "composer-plugin", - "license": "GPL-2.0-or-later", - "require": { - "composer-plugin-api": "^2.0" - }, - "require-dev": { - "composer/composer": "^2.0" - }, - "autoload": { - "psr-4": { - "AmpProject\\AmpWP\\PhpCssParserInstall\\": "./src" - } - }, - "extra": { - "class": "AmpProject\\AmpWP\\PhpCssParserInstall\\Plugin" - } -} diff --git a/php-css-parser-install-composer-plugin/src/Plugin.php b/php-css-parser-install-composer-plugin/src/Plugin.php deleted file mode 100644 index c910a324ad1..00000000000 --- a/php-css-parser-install-composer-plugin/src/Plugin.php +++ /dev/null @@ -1,227 +0,0 @@ - 'methodName') - * * array('eventName' => array('methodName', $priority)) - * * array('eventName' => array(array('methodName1', $priority), array('methodName2')) - * - * @return array The event names to listen to - */ - public static function getSubscribedEvents() { - return [ - ScriptEvents::PRE_AUTOLOAD_DUMP => 'onPreAutoloadDump', - ]; - } - - /** - * Patch the package before the autoload file is generated. - * - * @param Event $event Composer event. - */ - public static function onPreAutoloadDump( Event $event ) { - $package_locker = $event->getComposer()->getLocker(); - $local_repository = $event->getComposer()->getRepositoryManager()->getLocalRepository(); - - self::patchComposerLockFile( $package_locker ); - self::patchPackage( $local_repository ); - } - - /** - * Patch the `composer.lock` file to use the correct dependency requirements and `psr-4` namespace. - * - * @param Locker $package_locker Package locker instance. - */ - private static function patchComposerLockFile( Locker $package_locker ) { - $lock_data = $package_locker->getLockData(); - - if ( ! isset( $lock_data['packages'] ) ) { - return; - } - - $package_key = array_search( self::CSS_PARSER_PACKAGE_NAME, array_column( $lock_data['packages'], 'name' ), true ); - - if ( ! $package_key ) { - return; - } - - unset( $lock_data['packages'][ $package_key ]['suggest'] ); - $lock_data['packages'][ $package_key ]['require'] = [ - 'php' => '>=5.3.2', - ]; - - $lock_data['packages'][ $package_key ]['autoload']['psr-4']['Sabberworm\\CSS\\'] = 'lib/Sabberworm/CSS/'; - - $package_locker->setLockData( - self::getLockedRepository( $lock_data['packages'], $lock_data['aliases'] )->getPackages(), - self::getLockedRepository( $lock_data['packages-dev'], $lock_data['aliases'] )->getPackages(), - $lock_data['platform'], - $lock_data['platform-dev'], - $lock_data['aliases'], - $lock_data['minimum-stability'], - $lock_data['stability-flags'], - $lock_data['prefer-stable'], - $lock_data['prefer-lowest'], - $lock_data['platform-overrides'] - ); - } - - /** - * Patch package to point to the correct `psr-4` namespace so that it can be autoloaded. - * - * @param InstalledRepositoryInterface $local_repository Local repository instance. - */ - private static function patchPackage( InstalledRepositoryInterface $local_repository ) { - $package = $local_repository->findPackage( self::CSS_PARSER_PACKAGE_NAME, '*' ); - - if ( ! $package ) { - return; - } - - $root_package = $package instanceof CompleteAliasPackage ? $package->getAliasOf() : $package; - - $root_package->setRequires( - [ - 'php' => new Link( - self::CSS_PARSER_PACKAGE_NAME, - 'php', - new Constraint( '>=', '5.3.2' ), - Link::TYPE_REQUIRE, - '>=5.3.2' - ), - ] - ); - - $root_package->setAutoload( - [ - 'psr-4' => [ - 'Sabberworm\\CSS\\' => 'lib/Sabberworm/CSS/', - ], - ] - ); - } - - /** - * Converts string array representation of locked packages into a \Composer\Repository\LockArrayRepository object. - * - * Adapted from \Composer\Package\Locker::getLockedRepository(). - * - * @param array $locked_packages Array of locked packages. - * @param array|null $locked_aliases Array of locked package aliases. - * - * @return array|LockArrayRepository - */ - private static function getLockedRepository( array $locked_packages, $locked_aliases ) { - $loader = new ArrayLoader( null, true ); - $packages = new LockArrayRepository(); - - if ( empty( $locked_packages ) ) { - return $packages; - } - - if ( isset( $locked_packages[0]['name'] ) ) { - $package_by_name = []; - foreach ( $locked_packages as $info ) { - $package = $loader->load( $info ); - $packages->addPackage( $package ); - $package_by_name[ $package->getName() ] = $package; - - if ( $package instanceof AliasPackage ) { - $package_by_name[ $package->getAliasOf()->getName() ] = $package->getAliasOf(); - } - } - - if ( $locked_aliases ) { - foreach ( $locked_aliases as $alias ) { - if ( isset( $package_by_name[ $alias['package'] ] ) ) { - if ( $package_by_name[ $alias['package'] ] instanceof CompletePackageInterface ) { - $alias_pkg = new CompleteAliasPackage( $package_by_name[ $alias['package'] ], $alias['alias_normalized'], $alias['alias'] ); - } else { - $alias_pkg = new AliasPackage( $package_by_name[ $alias['package'] ], $alias['alias_normalized'], $alias['alias'] ); - } - $alias_pkg->setRootPackageAlias( true ); - $packages->addPackage( $alias_pkg ); - } - } - } - - return $packages; - } - - return []; - } -}