Merge branch 'main' into fix/13424-remove-imgareaselect-patch

.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.

.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'

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

phpcs.xml.dist

@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <ruleset name="Web Stories PHP Coding Standards Rules">
-  <config name="minimum_supported_wp_version" value="6.1" />
+  <config name="minimum_supported_wp_version" value="6.2" />
 
   <rule ref="WordPress-Core">
     <type>error</type>

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

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 );

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' ) ) {