From 68e650300d54ba8932c2ad1dfcefe8fa0db4ab90 Mon Sep 17 00:00:00 2001 From: Anurag Vasanwala <75766877+AnuragVasanwala@users.noreply.github.com> Date: Tue, 10 Oct 2023 13:24:38 +0530 Subject: [PATCH] Bump WordPress version requirement to 6.2 (#13474) --- .github/workflows/tests-e2e.yml | 2 +- .github/workflows/tests-unit-php.yml | 2 +- bin/local-env/install-wordpress.sh | 7 +------ package-lock.json | 14 +++++++------- phpcs.xml.dist | 2 +- readme.txt | 2 +- tests/phpstan/bootstrap.php | 2 +- web-stories.php | 4 ++-- 8 files changed, 15 insertions(+), 20 deletions(-) diff --git a/.github/workflows/tests-e2e.yml b/.github/workflows/tests-e2e.yml index 12b7e776ee9f..b9938cc557e7 100644 --- a/.github/workflows/tests-e2e.yml +++ b/.github/workflows/tests-e2e.yml @@ -132,7 +132,7 @@ jobs: matrix: # TODO: add back Firefox once support is more mature. browser: ['chrome'] - wp: ['6.1'] + wp: ['6.2'] snapshots: [false] experimental: [false] # We want to split up the tests into 2 parts running in parallel. diff --git a/.github/workflows/tests-unit-php.yml b/.github/workflows/tests-unit-php.yml index e59604f68793..6eb8f9664ea2 100644 --- a/.github/workflows/tests-unit-php.yml +++ b/.github/workflows/tests-unit-php.yml @@ -66,7 +66,7 @@ jobs: experimental: false - php: '7.4' - wp: '6.1' + wp: '6.2' experimental: false - php: '8.0' diff --git a/bin/local-env/install-wordpress.sh b/bin/local-env/install-wordpress.sh index c27f329e2481..acdb41bb1592 100755 --- a/bin/local-env/install-wordpress.sh +++ b/bin/local-env/install-wordpress.sh @@ -145,13 +145,8 @@ wp plugin install rtl-tester --activate --force --quiet echo -e $(status_message "Installing WordPress importer...") wp plugin install wordpress-importer --activate --force --quiet -# WooCommerce 8.0+ requires WordPress 6.2, but we still support WordPress 6.1. echo -e $(status_message "Installing WooCommerce plugin...") -if [ "$WP_VERSION" == "latest" ]; then - wp plugin install woocommerce --activate --force --quiet -else - wp plugin install woocommerce --version=7.9.0 --activate --force --quiet -fi +wp plugin install woocommerce --activate --force --quiet echo -e $(status_message "Installing AMP plugin...") wp plugin install amp --force --quiet diff --git a/package-lock.json b/package-lock.json index 4b57a057207c..3f1da281e71c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13160,9 +13160,9 @@ } }, "node_modules/@wordpress/hooks": { - "version": "3.42.0", - "resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-3.42.0.tgz", - "integrity": "sha512-GUePaweJgINbOyeWDG1p0ffxKZXZIOJdkdSCG8oWoAohJPOYe8WeYl/nAsECiUjbIuVletQe1RoTGrNdNkFTdg==", + "version": "3.43.0", + "resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-3.43.0.tgz", + "integrity": "sha512-SHSiyFUEsggihl0pDvY1l72q+fHMDyFHtIR3GCt0uV2ifctvoa/PIYdVwrxpGQaGdNEV25XCZ4kNldqJmfTddw==", "dependencies": { "@babel/runtime": "^7.16.0" }, @@ -13182,12 +13182,12 @@ } }, "node_modules/@wordpress/i18n": { - "version": "4.42.0", - "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.42.0.tgz", - "integrity": "sha512-6cEcsVk9EX0c2azz0h1aAZqGjts+VrGMHzMB22GBIhsiz/TWAqkMapt1QF1YbsJ4/VR2CHnKlONjhHNtsHn8Ew==", + "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==", "dependencies": { "@babel/runtime": "^7.16.0", - "@wordpress/hooks": "^3.42.0", + "@wordpress/hooks": "^3.43.0", "gettext-parser": "^1.3.1", "memize": "^2.1.0", "sprintf-js": "^1.1.1", diff --git a/phpcs.xml.dist b/phpcs.xml.dist index d150927405ca..795cd7bdebaa 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -1,6 +1,6 @@ - + error diff --git a/readme.txt b/readme.txt index ec4e965382cc..f85673b331ff 100644 --- a/readme.txt +++ b/readme.txt @@ -2,7 +2,7 @@ Contributors: google Tested up to: 6.3 -Requires at least: 6.1 +Requires at least: 6.2 Stable tag: V.V.V License: Apache-2.0 License URI: https://www.apache.org/licenses/LICENSE-2.0 diff --git a/tests/phpstan/bootstrap.php b/tests/phpstan/bootstrap.php index 867431978411..6dac5564a63c 100644 --- a/tests/phpstan/bootstrap.php +++ b/tests/phpstan/bootstrap.php @@ -11,7 +11,7 @@ define( 'WEBSTORIES_PLUGIN_DIR_URL', 'https://example.com/wp-content/plugins/web-stories/' ); define( 'WEBSTORIES_CDN_URL', 'https://wp.stories.google/static/main/' ); define( 'WEBSTORIES_MINIMUM_PHP_VERSION', '7.4' ); -define( 'WEBSTORIES_MINIMUM_WP_VERSION', '6.1' ); +define( 'WEBSTORIES_MINIMUM_WP_VERSION', '6.2' ); define( 'WEBSTORIES_DEV_MODE', true ); define( 'WPCOM_IS_VIP_ENV', true ); diff --git a/web-stories.php b/web-stories.php index 73b37867023a..d0e140cdbd15 100644 --- a/web-stories.php +++ b/web-stories.php @@ -10,7 +10,7 @@ * Author: Google * Author URI: https://opensource.google.com/ * Version: 1.35.0-alpha.0 - * Requires at least: 6.1 + * Requires at least: 6.2 * Requires PHP: 7.4 * Text Domain: web-stories * License: Apache License 2.0 @@ -47,7 +47,7 @@ define( 'WEBSTORIES_PLUGIN_DIR_PATH', plugin_dir_path( WEBSTORIES_PLUGIN_FILE ) ); define( 'WEBSTORIES_PLUGIN_DIR_URL', plugin_dir_url( WEBSTORIES_PLUGIN_FILE ) ); define( 'WEBSTORIES_MINIMUM_PHP_VERSION', '7.4' ); -define( 'WEBSTORIES_MINIMUM_WP_VERSION', '6.1' ); +define( 'WEBSTORIES_MINIMUM_WP_VERSION', '6.2' ); define( 'WEBSTORIES_CDN_URL', 'https://wp.stories.google/static/main' ); if ( ! defined( 'WEBSTORIES_DEV_MODE' ) ) {