Merge branch 'trunk' of https://github.com/WordPress/wordpress-develop into trac-43258

Author: westonruter

.github/workflows/reusable-phpunit-tests-v3.yml

@@ -120,7 +120,7 @@ jobs:
   phpunit-tests:
     name: ${{ inputs.phpunit-test-groups && format( '{0} / ', inputs.phpunit-test-groups ) || '' }}PHP ${{ inputs.php }} ${{ ! inputs.phpunit-test-groups && ! inputs.coverage-report && '/ ' || 'with ' }}${{ 'mariadb' == inputs.db-type && 'MariaDB' || 'MySQL' }} ${{ inputs.db-version }}${{ inputs.multisite && ' multisite' || '' }}${{ inputs.db-innovation && ' (innovation release)' || '' }}${{ inputs.memcached && ' with memcached' || '' }}${{ inputs.report && ' (test reporting enabled)' || '' }} ${{ 'example.org' != inputs.tests-domain && inputs.tests-domain || '' }}
     runs-on: ${{ inputs.os }}
-    timeout-minutes: ${{ inputs.coverage-report && 120 || 20 }}
+    timeout-minutes: ${{ inputs.coverage-report && 120 || inputs.php == '8.4' && 30 || 20 }}
 
     steps:
       - name: Configure environment variables

.github/workflows/slack-notifications.yml

@@ -135,6 +135,7 @@ jobs:
         with:
           retries: 2
           retry-exempt-status-codes: 418
+          result-encoding: string
           script: |
             const commit_details = await github.rest.repos.getCommit({
               owner: context.repo.owner,
@@ -143,18 +144,10 @@ jobs:
             });
             return commit_details.data.commit.message;
 
-      - name: Prepare commit message.
-        id: commit-message
-        run: |
-          # shellcheck disable=SC2016
-          COMMIT_MESSAGE="$(echo "${COMMIT_MSG_RAW}" | awk 'NR==1' | sed 's/`/\\`/g' | sed 's/\"/\\\\\\"/g' | sed 's/\$/\\$/g')"
-          echo "commit_message_escaped=${COMMIT_MESSAGE}" >> "$GITHUB_OUTPUT"
-        env:
-          COMMIT_MSG_RAW: ${{ ( github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) && fromJson( steps.current-commit-message.outputs.result ) || github.event.head_commit.message }}
-
       - name: Construct payload and store as an output
         id: create-payload
         run: |
+          COMMIT_MSG="$(echo "${COMMIT_MSG_RAW}" | awk 'NR==1')"
           PAYLOAD="$( jq \
             -n \
             --arg workflow_name "${GITHUB_WORKFLOW}" \
@@ -165,7 +158,7 @@ jobs:
           )"
           echo "payload=$PAYLOAD" >> "$GITHUB_OUTPUT"
         env:
-          COMMIT_MSG: ${{ steps.commit-message.outputs.commit_message_escaped }}
+          COMMIT_MSG_RAW: ${{ ( github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) && steps.current-commit-message.outputs.result || github.event.head_commit.message }}
 
   # Posts notifications when a workflow fails.
   failure:

.github/workflows/upgrade-develop-testing.yml

@@ -63,13 +63,17 @@ jobs:
         php: [ '7.2', '8.4' ]
         db-type: [ 'mysql' ]
         db-version: [ '5.7', '8.4' ]
-        wp: [ '6.5', '6.6', '6.7' ]
+        # WordPress 4.9 is the oldest version that supports PHP 7.2.
+        wp: [ '4.9', '6.5', '6.6', '6.7' ]
         multisite: [ false, true ]
 
         exclude:
           # The PHP <= 7.3/MySQL 8.4 jobs currently fail due to mysql_native_password being disabled by default. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
             db-version: '8.4'
+          # WordPress 4.9 does not support PHP 8.4.
+          - php: '8.4'
+            wp: '4.9'
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}

.github/workflows/upgrade-testing.yml

@@ -27,7 +27,7 @@ on:
 concurrency:
   # The concurrency group contains the workflow name and the branch name for pull requests
   # or the commit hash for any other events.
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  group: ${{ github.workflow }}-${{ inputs.new-version || github.event_name == 'pull_request' && github.head_ref || github.sha }}
   cancel-in-progress: true
 
 # Disable permissions for all available scopes by default.

.jshintrc

@@ -3,7 +3,7 @@
 	"curly": true,
 	"eqeqeq": true,
 	"eqnull": true,
-	"esversion": 6,
+	"esversion": 10,
 	"expr": true,
 	"immed": true,
 	"noarg": true,

composer.json

@@ -18,7 +18,7 @@
 		"ext-dom": "*"
 	},
 	"require-dev": {
-		"composer/ca-bundle": "1.5.5",
+		"composer/ca-bundle": "1.5.6",
 		"squizlabs/php_codesniffer": "3.10.3",
 		"wp-coding-standards/wpcs": "~3.1.0",
 		"phpcompatibility/phpcompatibility-wp": "~2.1.3",

jsdoc.conf.json

@@ -19,7 +19,6 @@
 		"linenums": true
 	},
 	"opts": {
-		"template": "./node_modules/ink-docstrap/template",
 		"recurse": true,
 		"private": true
 	}