[pull] trunk from WordPress:trunk

.devcontainer/devcontainer.json

@@ -3,7 +3,7 @@
     "name": "WordPress Core Development",
     "dockerComposeFile": "docker-compose.yml",
     "service": "app",
-    "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+    "workspaceFolder": "/workspace",
 
     // Features to add to the dev container. More info: https://containers.dev/features.
     "features": {

.devcontainer/docker-compose.yml

@@ -12,7 +12,7 @@ services:
       WORDPRESS_DB_PASSWORD: examplepass
       WORDPRESS_DB_NAME: exampledb
     volumes:
-      - ../..:/workspaces:cached
+      - ..:/workspace:cached
 
   db:
     image: mariadb

.devcontainer/setup.sh

@@ -9,7 +9,7 @@ else
 fi
 
 # Install dependencies
-cd /workspaces/wordpress-develop
+cd /workspace
 npm install && npm run build:dev
 
 # Install WordPress and activate the plugin/theme.

.env.example

@@ -14,6 +14,10 @@ LOCAL_PORT=8889
 # Where to run WordPress from. Valid options are 'src' and 'build'.
 LOCAL_DIR=src
 
+# Whether or not to enable text compression (gzip) in the web server.
+# Valid options are 'on' and 'off'.
+LOCAL_NGINX_COMPRESSION=off
+
 # The PHP version to use. Valid options are 'latest', and '{version}-fpm'.
 LOCAL_PHP=latest
 
@@ -46,12 +50,12 @@ LOCAL_DB_TYPE=mysql
 ##
 # The database version to use.
 #
-# Defaults to 8.0 with the assumption that LOCAL_DB_TYPE is set to `mysql` above.
+# Defaults to 9.7 with the assumption that LOCAL_DB_TYPE is set to `mysql` above.
 #
 # When using `mysql`, see https://hub.docker.com/_/mysql for valid versions.
 # When using `mariadb`, see https://hub.docker.com/_/mariadb for valid versions.
 ##
-LOCAL_DB_VERSION=8.4
+LOCAL_DB_VERSION=9.7
 
 # Whether or not to enable multisite.
 LOCAL_MULTISITE=false
@@ -67,3 +71,8 @@ LOCAL_WP_TESTS_DOMAIN=example.org
 
 # The URL to use when running e2e tests.
 WP_BASE_URL=http://localhost:${LOCAL_PORT}
+
+##
+# This silences the tips output by the dotenv package.
+##
+DOTENV_CONFIG_QUIET=true

.eslintrc-jsdoc.js

@@ -1,29 +1,80 @@
-module.exports = {
-	rules: {
-		'require-jsdoc': 'off',
-		'valid-jsdoc': [ 'error', {
-			prefer: {
-				arg: 'param',
-				argument: 'param',
-				extends: 'augments',
-				returns: 'return',
+/**
+ * ESLint v10 flat config file for JSDoc linting.
+ * This config is based on the original valid-jsdoc rules.
+ */
+
+const jsdocPlugin = require( 'eslint-plugin-jsdoc' );
+
+module.exports = [
+	{
+		plugins: {
+			jsdoc: jsdocPlugin,
+		},
+		settings: {
+			jsdoc: {
+				tagNamePreference: {
+					'arg': 'param',
+					'argument': 'param',
+					'extends': 'augments',
+					'returns': 'return',
+				},
+				preferredTypes: {
+					'array': 'Array',
+					'bool': 'boolean',
+					'Boolean': 'boolean',
+					'float': 'number',
+					'Float': 'number',
+					'function': 'Function',
+					'int': 'number',
+					'integer': 'number',
+					'Integer': 'number',
+					'Number': 'number',
+					'object': 'Object',
+					'String': 'string',
+					'Void': 'void',
+				},
 			},
-			preferType: {
-				array: 'Array',
-				bool: 'boolean',
-				Boolean: 'boolean',
-				float: 'number',
-				Float: 'number',
-				int: 'number',
-				integer: 'number',
-				Integer: 'number',
-				Number: 'number',
-				object: 'Object',
-				String: 'string',
-				Void: 'void',
-			},
-			requireParamDescription: false,
-			requireReturn: false,
-		} ],
+		},
+		rules: {
+			'jsdoc/check-alignment': 'error',
+			'jsdoc/check-indentation': [ 'error', {
+				excludeTags: [
+					'deprecated',
+					'example',
+					'param',
+					'property',
+					'return',
+					'since',
+					'todo',
+				],
+			} ],
+			'jsdoc/check-line-alignment': [ 'error', 'always', {
+				tags: [ 'param', 'property' ],
+			} ],
+			'jsdoc/check-param-names': 'error',
+			'jsdoc/check-syntax': 'error',
+			'jsdoc/check-tag-names': [ 'error', {
+				definedTags: [
+					'memberOf',
+					'output',
+					'ticket',
+					'link',
+				],
+			} ],
+			'jsdoc/check-types': 'error',
+			'jsdoc/require-description': 'error',
+			'jsdoc/require-hyphen-before-param-description': [ 'error', 'never' ],
+			'jsdoc/require-jsdoc': 'error',
+			'jsdoc/require-param': [ 'error', {
+				enableFixer: false,
+			} ],
+			'jsdoc/require-param-description': 'error',
+			'jsdoc/require-param-name': 'error',
+			'jsdoc/require-param-type': 'error',
+			'jsdoc/require-returns': 'error',
+			'jsdoc/require-returns-check': 'error',
+			'jsdoc/require-returns-description': 'error',
+			'jsdoc/require-returns-type': 'error',
+		},
 	},
-};
+];

.git-blame-ignore-revs

@@ -48,3 +48,27 @@ f4f1b4821342fd1d58708356b3ec39d6fefe31ac # [33411]
 
 # Coding Standards
 8f95800d52c1736d651ae6e259f90ad4a0db2c3f # [42343]
+
+# 6.8 Coding Standards
+a4d6fb7c96cb46859e6d48a5d4c06fdeea7d039b # [59292]
+9dd87b8f91300917447c271968d3c36289b440e8 # [59558]
+# 903b1fe840d4232bbc249d32d8981824e5fa71de # [59953] includes a punctuation change
+a96fa164b00ed51c7c0481574834cff92ab9b1f0 # [60043]
+7607cbc5d1e770451f1a2b61d851820dfa23bb43 # [60044]
+7047a91c0ecdbf43d4a7a0a591464cd1ed2f2c4b # [60046]
+1aa6da693ad739b78752a55d154cd48cb757b90b # [60047]
+d44e1c2ce2dc638e89ed6a1d02b1cfadb8a15fe7 # [60048]
+a18719e7ea49ab7ac0091e076840cb7efdf51cc5 # [60049]
+
+# 6.9 Coding Standards
+d0d89b62485e724e3d06f01981dd1940b2f36fce # [60074]
+c53010159b60735ffa6ba5fa8a416ff0e86a159c # [60109]
+cbb6519119276ceba4279eaee73ab66294ebd820 # [60402]
+3d736c763e0b1384c65abfa3bcf6d3bc45869516 # [60664]
+b96f25f5c31bfd1580c21084c368098792b4c741 # [60780]
+ff6c5fadfa6272685d910b474917ecb6adc17f10 # [60808]
+08b2f9cfe9064873a501c3543e2c995405431dcc # [60816]
+e683403cc1856113e3cb010b1579dcd01cdef5fc # [61036]
+8d24041c08a58b2f79504699fb3f63d01737b876 # [61075]
+87cbbb1dfcf19fcfc128fc66603462a649d01502 # [61087]
+db1b4811e5ab8df343b03032d7607abe01a9e8e2 # [61138]

.github/actions/smoke-check/action.yml

@@ -0,0 +1,20 @@
+name: 'Smoke check a WordPress installation'
+description: 'Serves an installed single site with PHP built-in web server and checks that its front end, REST API, and admin respond.'
+
+inputs:
+  admin-user:
+    description: 'The username of an administrator account on the site.'
+    required: true
+  admin-password:
+    description: 'The password of the administrator account.'
+    required: true
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Serve the site and check it
+      shell: bash
+      run: bash "${GITHUB_ACTION_PATH}/smoke-check.sh"
+      env:
+        WP_ADMIN_USER: ${{ inputs.admin-user }}
+        WP_ADMIN_PASSWORD: ${{ inputs.admin-password }}

.github/actions/smoke-check/smoke-check.sh

@@ -0,0 +1,117 @@
+#!/bin/bash
+#
+# Smoke checks an installed WordPress single site over HTTP.
+#
+# Runs from the root of the installation, with WP-CLI available. Multisite is not supported because
+# a network's domain lives in wp-config.php and the database, not just an option.
+
+set -euo pipefail
+
+: "${RUNNER_TEMP:?}" "${WP_ADMIN_USER:?}" "${WP_ADMIN_PASSWORD:?}"
+
+site_port=8889
+site_url="http://127.0.0.1:${site_port}"
+server_log="${RUNNER_TEMP}/server.log"
+jar="${RUNNER_TEMP}/cookies.txt"
+: > "${jar}"
+response="${RUNNER_TEMP}/response.txt"
+code="${RUNNER_TEMP}/http-code.txt"
+http_code=''
+
+version="$(wp core version)"
+
+# Nothing undoes these, so the site is only good for this check afterwards.
+wp option update home "${site_url}"
+wp option update siteurl "${site_url}"
+# A fresh install shows posts here already, but the front page check below needs it.
+wp option update show_on_front posts
+# Both make requests no check asked for, and the update checks call api.wordpress.org.
+wp config set DISABLE_WP_CRON true --raw
+wp config set WP_HTTP_BLOCK_EXTERNAL true --raw
+
+# opcache counts php -S as a web SAPI, so the runner's JIT runs here and segfaults.
+php -d opcache.jit=disable -S "127.0.0.1:${site_port}" -t . > "${server_log}" 2>&1 &
+server_pid=$!
+
+stop_server() {
+  local status=$?
+  kill "${server_pid}" 2> /dev/null || true
+  wait "${server_pid}" 2> /dev/null || true
+  [ "${status}" -eq 0 ] || cat "${server_log}" || true
+  exit "${status}"
+}
+trap stop_server EXIT
+
+# No connection prints 000 and exits 7, which set -e would take as fatal.
+deadline=$(( SECONDS + 30 ))
+while :; do
+  ready_code="$(curl --silent --max-time 5 --output /dev/null --write-out '%{http_code}' "${site_url}/" || true)"
+  [ "${ready_code}" = '000' ] || break
+  [ "${SECONDS}" -lt "${deadline}" ] || { echo '::error::the server never answered'; exit 1; }
+  sleep 1
+done
+
+fail() {
+  echo "::error::${1}"
+  tail -n 20 "${response}"
+  exit 1
+}
+
+# An HTTP error returns to the caller. No reply at all is fatal.
+fetch() {
+  local path="${1}" status=0
+  shift
+  : > "${response}"
+  curl --silent --show-error --max-time 30 --output "${response}" \
+    --write-out '%{http_code}' --cookie "${jar}" --cookie-jar "${jar}" \
+    "$@" "${site_url}${path}" > "${code}" || status=$?
+  http_code="$(cat "${code}")"
+  [ "${status}" -eq 0 ] || [ "${status}" -eq 22 ] \
+    || fail "${path} got no reply and curl exited ${status}"
+  return "${status}"
+}
+
+check() {
+  local path="${1}" marker status=0
+  shift
+  fetch "${path}" --fail-with-body || status=$?
+  [ "${status}" -eq 0 ] || fail "${path} returned HTTP ${http_code}"
+  for marker in "$@"; do
+    grep -qF -e "${marker}" "${response}" || fail "${path} did not contain: ${marker}"
+  done
+  echo "ok  ${path}"
+}
+
+# A fatal mid-page still returns 200, so every check also asks for the closing tag.
+check '/' "content=\"WordPress ${version}\"" 'Hello world!' '</html>'
+
+fetch '/?rest_route=/' --fail-with-body || fail "/?rest_route=/ returned HTTP ${http_code}"
+jq -e --arg url "${site_url}" '.url == $url and ( .namespaces | index( "wp/v2" ) )' "${response}" > /dev/null \
+  || fail 'the REST index was not the expected JSON'
+echo 'ok  /?rest_route=/'
+
+# It prints this for an empty database too, which the checks above rule out.
+check '/wp-admin/upgrade.php' 'No Update Required' '</html>'
+
+fetch '/?p=99999999' || true
+[ "${http_code}" = '404' ] || fail "a missing post returned ${http_code}, expected 404"
+grep -qF '</html>' "${response}" || fail 'the 404 page was cut short'
+echo 'ok  404 handling'
+
+login_status=0
+fetch '/wp-login.php' --fail-with-body \
+  --data-urlencode "log=${WP_ADMIN_USER}" --data-urlencode "pwd=${WP_ADMIN_PASSWORD}" || login_status=$?
+[ "${login_status}" -eq 0 ] || fail "logging in returned HTTP ${http_code}"
+grep -qF 'wordpress_logged_in_' "${jar}" || fail 'logging in did not set an authentication cookie'
+echo 'ok  login'
+
+# The admin bar renders only for a logged-in user.
+check '/wp-admin/' 'id="wpadminbar"' '</html>'
+
+# Catches a fatal during shutdown. An empty log would let the grep pass silently.
+[ -s "${server_log}" ] || { echo '::error::the server wrote no log'; exit 1; }
+if grep -qE 'Fatal error|Uncaught|Segmentation fault' "${server_log}"; then
+  echo '::error::the server logged a fatal error'
+  exit 1
+fi
+echo 'ok  server log'