From 454d8b9ba50829b8f52e7d4aae9bef4330e110ab Mon Sep 17 00:00:00 2001 From: Pascal Birchler Date: Thu, 26 Oct 2023 16:13:04 +0200 Subject: [PATCH 1/4] Fix lock file --- package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index e403ec27f9e3..d477c7c9a11a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13156,9 +13156,9 @@ } }, "node_modules/@wordpress/hooks": { - "version": "3.43.0", - "resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-3.43.0.tgz", - "integrity": "sha512-SHSiyFUEsggihl0pDvY1l72q+fHMDyFHtIR3GCt0uV2ifctvoa/PIYdVwrxpGQaGdNEV25XCZ4kNldqJmfTddw==", + "version": "3.44.0", + "resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-3.44.0.tgz", + "integrity": "sha512-rWYI98Nu2S8D0bfHeoc8Lj43vZr59lFn3tGuDMnr0dZ1vDZXOiNSIPMn7qncmCuErFxWBbyXkax6mnam7Ds6jw==", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -13178,12 +13178,12 @@ } }, "node_modules/@wordpress/i18n": { - "version": "4.43.0", - "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.43.0.tgz", - "integrity": "sha512-XHU/vGgI+pgjJU9WzWDHke1u948z8i3OPpKUNdxc/gMcTkKaKM4D8DW1+VMSQHyU6pneP8+ph7EF+1RIehP3lQ==", + "version": "4.44.0", + "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.44.0.tgz", + "integrity": "sha512-90SY4//QgqoKLf3HK0vNk+D/PGwK+0KOMuIwnkwKDKBw+Vr/Vusg6qiEngVc/BETfuG9ssDtAiNEBSMm8+YGYA==", "dependencies": { "@babel/runtime": "^7.16.0", - "@wordpress/hooks": "^3.43.0", + "@wordpress/hooks": "^3.44.0", "gettext-parser": "^1.3.1", "memize": "^2.1.0", "sprintf-js": "^1.1.1", From 8fb7d89d854622a6eca8cf10506e5ca33d551307 Mon Sep 17 00:00:00 2001 From: Pascal Birchler Date: Thu, 26 Oct 2023 16:13:29 +0200 Subject: [PATCH 2/4] Composer update --- composer.lock | 68 ++++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/composer.lock b/composer.lock index 5fe9d47c30ee..cbc419d8dc30 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "ampproject/amp-toolbox", - "version": "0.11.3", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/ampproject/amp-toolbox-php.git", - "reference": "56c812508f5ebe538036d75cf0c21de094b316d3" + "reference": "c79a0fe558a3c042aee4789bbf33376cca7a733d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ampproject/amp-toolbox-php/zipball/56c812508f5ebe538036d75cf0c21de094b316d3", - "reference": "56c812508f5ebe538036d75cf0c21de094b316d3", + "url": "https://api.github.com/repos/ampproject/amp-toolbox-php/zipball/c79a0fe558a3c042aee4789bbf33376cca7a733d", + "reference": "c79a0fe558a3c042aee4789bbf33376cca7a733d", "shasum": "" }, "require": { @@ -48,6 +48,7 @@ "mck89/peast": "Needed to minify the AMP script.", "nette/php-generator": "Needed to generate the validator spec PHP classes and interfaces." }, + "default-branch": true, "bin": [ "bin/amp" ], @@ -76,9 +77,9 @@ "description": "A collection of AMP tools making it easier to publish and host AMP pages with PHP.", "support": { "issues": "https://github.com/ampproject/amp-toolbox-php/issues", - "source": "https://github.com/ampproject/amp-toolbox-php/tree/0.11.3" + "source": "https://github.com/ampproject/amp-toolbox-php/tree/main" }, - "time": "2023-02-07T23:27:03+00:00" + "time": "2023-10-24T22:47:58+00:00" }, { "name": "ampproject/amp-wp", @@ -86,16 +87,16 @@ "source": { "type": "git", "url": "https://github.com/ampproject/amp-wp", - "reference": "41321520e6aa600e9775566a3d0f1c151a0a2fb8" + "reference": "2393bd43f933b033b169bffa4eb0ebe1c7f5f903" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ampproject/amp-wp/zipball/41321520e6aa600e9775566a3d0f1c151a0a2fb8", - "reference": "41321520e6aa600e9775566a3d0f1c151a0a2fb8", + "url": "https://api.github.com/repos/ampproject/amp-wp/zipball/2393bd43f933b033b169bffa4eb0ebe1c7f5f903", + "reference": "2393bd43f933b033b169bffa4eb0ebe1c7f5f903", "shasum": "" }, "require": { - "ampproject/amp-toolbox": "0.11.3", + "ampproject/amp-toolbox": "dev-main", "cweagans/composer-patches": "^1.0", "ext-curl": "*", "ext-date": "*", @@ -190,7 +191,7 @@ ], "description": "WordPress plugin for adding AMP support.", "homepage": "https://github.com/ampproject/amp-wp", - "time": "2023-10-11T16:55:13+00:00" + "time": "2023-10-25T17:33:33+00:00" }, { "name": "cweagans/composer-patches", @@ -2831,16 +2832,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.38", + "version": "1.10.39", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "5302bb402c57f00fb3c2c015bac86e0827e4b691" + "reference": "d9dedb0413f678b4d03cbc2279a48f91592c97c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5302bb402c57f00fb3c2c015bac86e0827e4b691", - "reference": "5302bb402c57f00fb3c2c015bac86e0827e4b691", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d9dedb0413f678b4d03cbc2279a48f91592c97c4", + "reference": "d9dedb0413f678b4d03cbc2279a48f91592c97c4", "shasum": "" }, "require": { @@ -2889,7 +2890,7 @@ "type": "tidelift" } ], - "time": "2023-10-06T14:19:14+00:00" + "time": "2023-10-17T15:46:26+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -3567,12 +3568,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "efd339340c840237fad050f3ea6fd8bbbbfc7ed6" + "reference": "66671a636e514920046c1028f8c837c1d5a54873" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/efd339340c840237fad050f3ea6fd8bbbbfc7ed6", - "reference": "efd339340c840237fad050f3ea6fd8bbbbfc7ed6", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/66671a636e514920046c1028f8c837c1d5a54873", + "reference": "66671a636e514920046c1028f8c837c1d5a54873", "shasum": "" }, "conflict": { @@ -3609,6 +3610,7 @@ "azuracast/azuracast": "<0.18.3", "backdrop/backdrop": "<1.24.2", "backpack/crud": "<3.4.9", + "bacula-web/bacula-web": "<8.0.0.0-RC2-dev", "badaso/core": "<2.7", "bagisto/bagisto": "<0.1.5", "barrelstrength/sprout-base-email": "<1.2.7", @@ -3674,14 +3676,14 @@ "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1", "desperado/xml-bundle": "<=0.1.7", "directmailteam/direct-mail": "<5.2.4", - "doctrine/annotations": ">=1,<1.2.7", - "doctrine/cache": ">=1,<1.3.2|>=1.4,<1.4.2", - "doctrine/common": ">=2,<2.4.3|>=2.5,<2.5.1", + "doctrine/annotations": "<1.2.7", + "doctrine/cache": "<1.3.2|>=1.4,<1.4.2", + "doctrine/common": "<2.4.3|>=2.5,<2.5.1", "doctrine/dbal": ">=2,<2.0.8|>=2.1,<2.1.2|>=3,<3.1.4", "doctrine/doctrine-bundle": "<1.5.2", "doctrine/doctrine-module": "<=0.7.1", - "doctrine/mongodb-odm": ">=1,<1.0.2", - "doctrine/mongodb-odm-bundle": ">=2,<3.0.1", + "doctrine/mongodb-odm": "<1.0.2", + "doctrine/mongodb-odm-bundle": "<3.0.1", "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4", "dolibarr/dolibarr": "<18", "dompdf/dompdf": "<2.0.2|==2.0.2", @@ -3697,6 +3699,7 @@ "enshrined/svg-sanitize": "<0.15", "erusev/parsedown": "<1.7.2", "ether/logs": "<3.0.4", + "evolutioncms/evolution": "<=3.2.3", "exceedone/exment": "<4.4.3|>=5,<5.0.3", "exceedone/laravel-admin": "<2.2.3|==3", "ezsystems/demobundle": ">=5.4,<5.4.6.1-dev", @@ -3712,7 +3715,7 @@ "ezsystems/ezplatform-richtext": ">=2.3,<2.3.7.1-dev", "ezsystems/ezplatform-user": ">=1,<1.0.1", "ezsystems/ezpublish-kernel": "<6.13.8.2-dev|>=7,<7.5.30", - "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.6,<=2019.03.5.1", + "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.06,<=2019.03.5.1", "ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3", "ezsystems/repository-forms": ">=2.3,<2.3.2.1-dev|>=2.5,<2.5.15", "ezyang/htmlpurifier": "<4.1.1", @@ -3850,7 +3853,7 @@ "magento/magento1ee": ">=1,<1.14.4.3-dev", "magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2.0-patch2", "maikuolan/phpmussel": ">=1,<1.6", - "mantisbt/mantisbt": "<=2.25.5", + "mantisbt/mantisbt": "<=2.25.7", "marcwillmann/turn": "<0.3.3", "matyhtf/framework": "<3.0.6", "mautic/core": "<4.3", @@ -3870,6 +3873,7 @@ "mongodb/mongodb": ">=1,<1.9.2", "monolog/monolog": ">=1.8,<1.12", "moodle/moodle": "<4.2.0.0-RC2-dev|==4.2", + "mos/cimage": "<0.7.19", "movim/moxl": ">=0.8,<=0.10", "mpdf/mpdf": "<=7.1.7", "mustache/mustache": ">=2,<2.14.1", @@ -3885,6 +3889,7 @@ "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": "<3.0.10", + "nonfiction/nterchange": "<4.1.1", "notrinos/notrinos-erp": "<=0.7", "noumo/easyii": "<=0.9", "nukeviet/nukeviet": "<4.5.02", @@ -3896,6 +3901,7 @@ "october/october": "<=3.4.4", "october/rain": "<1.0.472|>=1.1,<1.1.2", "october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.34|>=3,<3.0.66", + "omeka/omeka-s": "<4.0.3", "onelogin/php-saml": "<2.10.4", "oneup/uploader-bundle": "<1.9.3|>=2,<2.1.5", "open-web-analytics/open-web-analytics": "<1.7.4", @@ -4002,7 +4008,7 @@ "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.13.14|>=5,<5.0.13", - "silverstripe/graphql": "<3.5.2|>=4.0.0.0-alpha1,<4.0.0.0-alpha2|>=4.1.1,<4.1.2|>=4.2.2,<4.2.3", + "silverstripe/graphql": "<3.8.2|>=4,<4.1.3|>=4.2,<4.2.5|>=4.3,<4.3.4|>=5,<5.0.3", "silverstripe/hybridsessions": ">=1,<2.4.1|>=2.5,<2.5.1", "silverstripe/recipe-cms": ">=4.5,<4.5.3", "silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1", @@ -4095,7 +4101,7 @@ "thinkcmf/thinkcmf": "<=5.1.7", "thorsten/phpmyfaq": "<3.2.0.0-beta2", "tikiwiki/tiki-manager": "<=17.1", - "tinymce/tinymce": "<5.10.7|>=6,<6.3.1", + "tinymce/tinymce": "<5.10.8|>=6,<6.7.1", "tinymighty/wiki-seo": "<1.2.2", "titon/framework": "<9.9.99", "tobiasbg/tablepress": "<=2.0.0.0-RC1", @@ -4168,7 +4174,7 @@ "yourls/yourls": "<=1.8.2", "zencart/zencart": "<=1.5.7.0-beta", "zendesk/zendesk_api_client_php": "<2.2.11", - "zendframework/zend-cache": ">=2.4,<2.4.8|>=2.5,<2.5.3", + "zendframework/zend-cache": "<2.4.8|>=2.5,<2.5.3", "zendframework/zend-captcha": ">=2,<2.4.9|>=2.5,<2.5.2", "zendframework/zend-crypt": ">=2,<2.4.9|>=2.5,<2.5.2", "zendframework/zend-db": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.10|>=2.3,<2.3.5", @@ -4200,7 +4206,7 @@ "zenstruck/collection": "<0.2.1", "zetacomponents/mail": "<1.8.2", "zf-commons/zfc-user": "<1.2.2", - "zfcampus/zf-apigility-doctrine": ">=1,<1.0.3", + "zfcampus/zf-apigility-doctrine": "<1.0.3", "zfr/zfr-oauth2-server-module": "<0.1.2", "zoujingli/thinkadmin": "<6.0.22" }, @@ -4240,7 +4246,7 @@ "type": "tidelift" } ], - "time": "2023-10-11T21:04:21+00:00" + "time": "2023-10-24T03:04:20+00:00" }, { "name": "sebastian/cli-parser", From 4bed628fbb3cbc5445ad4ddf5486432e40213257 Mon Sep 17 00:00:00 2001 From: Pascal Birchler Date: Thu, 26 Oct 2023 16:13:35 +0200 Subject: [PATCH 3/4] Test against WP 6.4-RC2 --- .github/workflows/tests-e2e.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests-e2e.yml b/.github/workflows/tests-e2e.yml index b7ed0d3e9d11..cf3458d0fe94 100644 --- a/.github/workflows/tests-e2e.yml +++ b/.github/workflows/tests-e2e.yml @@ -147,12 +147,12 @@ jobs: snapshots: true shard: '2/2' - browser: 'chrome' - wp: '6.4-RC1' + wp: '6.4-RC2' snapshots: false shard: '1/2' experimental: true - browser: 'chrome' - wp: '6.4-RC1' + wp: '6.4-RC2' snapshots: false shard: '2/2' experimental: true From 4be0c6ec77802edd7cd03493cc73dfcde50c8a4c Mon Sep 17 00:00:00 2001 From: Pascal Birchler Date: Thu, 26 Oct 2023 23:58:25 +0200 Subject: [PATCH 4/4] Update tests --- tests/phpunit/integration/tests/AMP/Sanitization.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/phpunit/integration/tests/AMP/Sanitization.php b/tests/phpunit/integration/tests/AMP/Sanitization.php index b4261125711a..7b20d70c2a6e 100644 --- a/tests/phpunit/integration/tests/AMP/Sanitization.php +++ b/tests/phpunit/integration/tests/AMP/Sanitization.php @@ -375,7 +375,6 @@ public function test_get_extension_sources(): void { 'amp-powr-player' => 'v0/amp-powr-player-0.1.js', 'amp-reach-player' => 'v0/amp-reach-player-0.1.js', 'amp-recaptcha-input' => 'v0/amp-recaptcha-input-0.1.js', - 'amp-redbull-player' => 'v0/amp-redbull-player-0.1.js', 'amp-reddit' => 'v0/amp-reddit-0.1.js', 'amp-render' => 'v0/amp-render-1.0.js', 'amp-riddle-quiz' => 'v0/amp-riddle-quiz-0.1.js', @@ -418,6 +417,8 @@ public function test_get_extension_sources(): void { 'amp-wordpress-embed' => 'v0/amp-wordpress-embed-1.0.js', 'amp-yotpo' => 'v0/amp-yotpo-0.1.js', 'amp-youtube' => 'v0/amp-youtube-0.1.js', + 'amp-slikeplayer' => 'v0/amp-slikeplayer-0.1.js', + 'amp-story-audio-sticker' => 'v0/amp-story-audio-sticker-0.1.js', ]; foreach ( $sources as $extension => $src ) {