Merge trunk, update version

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -91,12 +91,29 @@ body:
         - There is no user impact
     validations:
       required: true
+
+  - type: markdown
+    attributes:
+      value: |
+        <br>
+
+  - type: textarea
+    id: workaround-detail
+    attributes:
+      label: If the above answer is "Yes...", outline the workaround.
+      placeholder: |
+        Provide details of the specific steps to take that resolve the issue, e.g.:
+          - Open "Setting X".
+          - Toggle "Option Y".
+          - Click "Button Z".
+
   - type: markdown
     attributes:
       value: |
         <br>
 
         ## Optional Information
+
         The following section is optional.
   - type: dropdown
     id: site-type

.github/files/generate-ci-matrix.php

@@ -99,10 +99,15 @@
 	'with-woocommerce' => true,
 );
 
-/**
- * Here is the place where wpcomsh tests would be introduced by adding 'with-wpcomsh' property set to true.
- * This adds a new run into the matrix that would enable wpcomsh loading with unit tests.
- */
+// Add wpcomsh tests.
+$matrix[] = array(
+	'name'         => 'PHP tests: PHP 8.1 WP latest with wpcomsh',
+	'script'       => 'test-php',
+	'php'          => '8.1',
+	'wp'           => 'latest',
+	'timeout'      => 20,
+	'with-wpcomsh' => true,
+);
 
 // Add JS tests.
 $matrix[] = array(

.github/files/lint-project-structure.sh

@@ -635,4 +635,16 @@ if ! pnpm semver --range "$RANGE" "$PNPM_VERSION" &>/dev/null; then
 	echo "::error file=package.json,line=$LINE::Pnpm version $PNPM_VERSION in .github/versions.sh does not satisfy requirement $RANGE from package.json"
 fi
 
+# - Check for incorrect next-version tokens.
+debug "Checking for incorrect next-version tokens."
+RE='[^$]\$next[-_]version\$\|\$next[-_]version\$[^$]\|\$\$next_version\$\$'
+while IFS= read -r FILE; do
+	EXIT=1
+	while IFS=: read -r LINE COL X; do
+		X=${X/#[^$]/}
+		X=${X/%[^$]/}
+		echo "::error file=$FILE,line=$LINE,col=$COL::You probably mean \`\$\$next-version\$\$\` here rather than \`$X\`."
+	done < <( git grep -h --line-number --column -o "$RE" "$FILE" )
+done < <( git -c core.quotepath=off grep -l "$RE" )
+
 exit $EXIT

.husky/pre-push

@@ -4,4 +4,4 @@
 if test -c /dev/tty && sh -c ': < /dev/tty' >/dev/null 2>/dev/null; then
 	exec < /dev/tty
 fi
-node tools/js-tools/git-hooks/pre-push-hook.js
+node tools/js-tools/git-hooks/pre-push-hook.mjs

.phan/config.base.php

@@ -268,5 +268,11 @@ function make_phan_config( $dir, $options = array() ) {
 		$config['minimum_target_php_version'] = $m[1];
 	}
 
+	// Disable PhanDeprecatedImplicitNullableParam if still supporting PHP 7.0
+	// @todo Remove this once we drop PHP 7.0 support everywhere.
+	if ( isset( $config['minimum_target_php_version'] ) && version_compare( $config['minimum_target_php_version'], '7.1.0', '<' ) ) {
+		$config['suppress_issue_types'][] = 'PhanDeprecatedImplicitNullableParam';
+	}
+
 	return $config;
 }

.phan/stubs/amp-stubs.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Stubs automatically generated from AMP 2.5.4 and AMP for WP 1.0.96.1
+ * Stubs automatically generated from AMP 2.5.4 and AMP for WP 1.0.97
  * using the definition file `tools/stubs/amp-stub-defs.php` in the Jetpack monorepo.
  *
  * Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.

.phan/stubs/full-site-editing-stubs.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Stubs automatically generated from WordPress.com Editing Toolkit 4.28277
+ * Stubs automatically generated from WordPress.com Editing Toolkit 4.29247
  * using the definition file `tools/stubs/full-site-editing-stub-defs.php` in the Jetpack monorepo.
  *
  * Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.

.phan/stubs/woocommerce-internal-stubs.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Stubs automatically generated from WooCommerce 9.1.1
+ * Stubs automatically generated from WooCommerce 9.1.4
  * using the definition file `tools/stubs/woocommerce-internal-stub-defs.php` in the Jetpack monorepo.
  *
  * Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.

.phan/stubs/woocommerce-payments-stubs.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Stubs automatically generated from WooPayments 7.9.1
+ * Stubs automatically generated from WooPayments 8.0.1
  * using the definition file `tools/stubs/woocommerce-payments-stub-defs.php` in the Jetpack monorepo.
  *
  * Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.

.phan/stubs/wpcom-stubs.php

@@ -4,7 +4,7 @@
  * `bin/teamcity-builds/jetpack-stubs/stub-defs.php` and regenerate the stubs
  * by triggering the Jetpack Staging → Update WPCOM Stubs job in TeamCity.
  *
- * Stubs automatically generated from WordPress.com commit 2a880921ff80b3bf99b4f9e4a98d41471543ff2b.
+ * Stubs automatically generated from WordPress.com commit 120a8ddd2199a9845d257ab30d4185c38465a9d5.
  */
 
 namespace {
@@ -1172,6 +1172,12 @@ public function get_errors()
         {
         }
     }
+    /**
+     * @return bool
+     */
+    function wpcom_activitypub_is_active($blog_id = \null)
+    {
+    }
     /**
      * @param int|null $blog_id
      * @return int|string|false