[pull] trunk from WordPress:trunk

.devcontainer/devcontainer.json

@@ -3,15 +3,15 @@
     "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": {
         "ghcr.io/devcontainers/features/common-utils:2": {
             "username": "wordpress"
         },
         "ghcr.io/devcontainers/features/node:1": {
-            "version": "14"
+            "version": "20"
         },
         "ghcr.io/devcontainers/features/docker-in-docker:2": {},
         "ghcr.io/devcontainers/features/git:1": {}

.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

@@ -0,0 +1,78 @@
+##
+# Default configuration options for the local dev environment.
+#
+# All of these options can be overridden by setting them as environment variables before starting
+# the environment. You will need to restart your environment when changing any of these.
+#
+# Below, the following substitutions can be made:
+# - '{version}': any major.minor PHP version from 5.2 onwards.
+##
+
+# The site will be available at http://localhost:LOCAL_PORT
+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
+
+# Whether or not to enable Xdebug.
+LOCAL_PHP_XDEBUG=false
+
+##
+# The Xdebug features to enable.
+#
+# By default, the following features are enabled in the local environment:
+# - Development helpers (`develop`).
+# - Step debugging (`debug`).
+#
+# To generate a code coverage report, `coverage` mode must be active.
+#
+# For a full list of accepted values, see https://xdebug.org/docs/all_settings#mode.
+##
+LOCAL_PHP_XDEBUG_MODE=develop,debug
+
+# Whether or not to enable Memcached.
+LOCAL_PHP_MEMCACHED=false
+
+##
+# The database software to use.
+#
+# Supported values are `mysql` and `mariadb`.
+##
+LOCAL_DB_TYPE=mysql
+
+##
+# The database version to use.
+#
+# 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=9.7
+
+# Whether or not to enable multisite.
+LOCAL_MULTISITE=false
+
+# The debug settings to add to `wp-config.php`.
+LOCAL_WP_DEBUG=true
+LOCAL_WP_DEBUG_LOG=true
+LOCAL_WP_DEBUG_DISPLAY=true
+LOCAL_SCRIPT_DEBUG=true
+LOCAL_WP_ENVIRONMENT_TYPE=local
+LOCAL_WP_DEVELOPMENT_MODE=core
+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,60 @@
-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-param-names': 'error',
+			'jsdoc/check-types': 'error',
+			'jsdoc/check-tag-names': [ 'error', {
+				definedTags: [
+					'memberOf',
+					'output',
+					'ticket',
+					'link',
+				],
+			} ],
+			'jsdoc/require-param': [ 'error', {
+				enableFixer: false,
+			} ],
+			'jsdoc/require-param-type': 'error',
+			'jsdoc/require-returns-check': 'error',
+			'jsdoc/require-returns-description': 'error',
+			'jsdoc/require-returns': 'error',
+			'jsdoc/require-returns-type': 'error',
+			'jsdoc/check-syntax': '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/pull_request_template.md

@@ -12,11 +12,25 @@ If this is your first time contributing, you may also find reviewing these guide
 - Inline Documentation Standards: https://make.wordpress.org/core/handbook/best-practices/inline-documentation-standards/
 - Browser Support Policies: https://make.wordpress.org/core/handbook/best-practices/browser-support/
 - Proper spelling and grammar related best practices: https://make.wordpress.org/core/handbook/best-practices/spelling/
+- ✨ If you are using AI tools, you must adhere to the AI Guidelines: https://make.wordpress.org/ai/handbook/ai-guidelines/
 -->
 
 <!-- Insert a description of your changes here -->
 
 Trac ticket: <!-- insert a link to the WordPress Trac ticket here -->
 
+## Use of AI Tools
+
+<!--
+You are free to use artificial intelligence (AI) tooling to contribute, but you must disclose what tooling you are using and to what extent a pull request has been authored by AI. It is your responsibility to review and take responsibility for what AI generates. See the WordPress AI Guidelines: <https://make.wordpress.org/ai/handbook/ai-guidelines/>.
+
+Example disclosure:
+
+AI assistance: Yes
+Tool(s): GitHub Copilot, ChatGPT
+Model(s): GPT-5.1
+Used for: Initial code skeleton and test suggestions; final implementation and tests were reviewed and edited by me.
+-->
+
 ---
 **This Pull Request is for code review only. Please keep all other discussion in the Trac ticket. Do not merge this Pull Request. See [GitHub Pull Requests for Code Review](https://make.wordpress.org/core/handbook/contribute/git/github-pull-requests-for-code-review/) in the Core Handbook for more details.**

.github/workflows/cleanup-pull-requests.yml

@@ -0,0 +1,28 @@
+name: Cleanup Pull Requests
+
+on:
+  push:
+    branches:
+      - trunk
+      - '4.[1-9]'
+      - '[5-9].[0-9]'
+
+# Cancels all previous workflow runs for pull requests that have not completed.
+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.sha }}
+  cancel-in-progress: true
+
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
+
+jobs:
+  # Runs pull request cleanup.
+  close-prs:
+    name: Clean up pull requests
+    permissions:
+      pull-requests: write
+    if: ${{ github.repository == 'WordPress/wordpress-develop' }}
+    uses: ./.github/workflows/reusable-cleanup-pull-requests.yml