Merge branch 'trunk' into add/support-unique-ids-in-iapi-directives

Author: SantosGuillamot

.github/workflows/local-docker-environment.yml

@@ -109,6 +109,9 @@ jobs:
             db-version: '9.4'
           - php: '7.3'
             db-version: '9.4'
+          # No PHP 8.5 + Memcached support yet.
+          - php: '8.5'
+            memcached: true
 
     with:
       os: ${{ matrix.os }}

.github/workflows/phpunit-tests.yml

@@ -72,7 +72,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-24.04 ]
-        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
         db-type: [ 'mysql' ]
         db-version: [ '5.7', '8.0', '8.4' ]
         tests-domain: [ 'example.org' ]
@@ -149,7 +149,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-24.04 ]
-        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
         db-type: [ 'mariadb' ]
         db-version: [ '5.5', '10.3', '10.4', '10.5', '10.6', '10.11', '11.4', '11.8' ]
         multisite: [ false, true ]
@@ -201,7 +201,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-24.04 ]
-        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
         db-type: [ 'mysql', 'mariadb' ]
         db-version: [ '9.4', '12.0' ]
         multisite: [ false, true ]

.github/workflows/reusable-test-gutenberg-build-process.yml

@@ -34,9 +34,9 @@ jobs:
   # - Checks out the Gutenberg plugin into the plugins directory.
   # - Sets up Node.js.
   # - Logs debug information about the GitHub Action runner.
-  # - Installs Core npm dependencies.
   # - Installs Gutenberg npm dependencies.
   # - Runs the Gutenberg build process.
+  # - Installs Core npm dependencies.
   # - Builds WordPress to run from the relevant location (src or build).
   # - Builds Gutenberg.
   # - Ensures version-controlled files are not modified or deleted.
@@ -78,9 +78,6 @@ jobs:
           curl --version
           git --version
 
-      - name: Install Core Dependencies
-        run: npm ci
-
       - name: Install Gutenberg Dependencies
         run: npm ci
         working-directory: ${{ env.GUTENBERG_DIRECTORY }}
@@ -89,6 +86,9 @@ jobs:
         run: npm run build
         working-directory: ${{ env.GUTENBERG_DIRECTORY }}
 
+      - name: Install Core Dependencies
+        run: npm ci
+
       - name: Build WordPress to run from ${{ inputs.directory }}
         run: npm run ${{ inputs.directory == 'src' && 'build:dev' || 'build' }}
 

.github/workflows/upgrade-testing.yml

@@ -68,7 +68,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ 'ubuntu-24.04' ]
-        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
         db-type: [ 'mysql' ]
         db-version: [ '5.7', '8.0', '8.4', '9.4' ]
         wp: [ '6.7', '6.8' ]

.gitignore

@@ -50,8 +50,7 @@ wp-tests-config.php
 /src/wp-content/fonts
 /src/wp-content/languages
 /src/wp-content/mu-plugins
-/src/wp-content/plugins/*
-!/src/wp-content/plugins/hello-dolly
+/src/wp-content/plugins
 /src/wp-content/themes/*
 !/src/wp-content/themes/twentyten
 !/src/wp-content/themes/twentyeleven

.version-support-php.json

@@ -7,7 +7,8 @@
 		"8.1",
 		"8.2",
 		"8.3",
-		"8.4"
+		"8.4",
+		"8.5"
 	],
 	"6-8": [
 		"7.2",

Gruntfile.js

@@ -28,7 +28,7 @@ module.exports = function(grunt) {
 			'wp-content/themes/index.php',
 			'wp-content/themes/twenty*/**',
 			'wp-content/plugins/index.php',
-			'wp-content/plugins/hello-dolly/**',
+			'wp-content/plugins/hello.php',
 			'wp-content/plugins/akismet/**',
 			'!wp-content/themes/twenty*/node_modules/**',
 		],
@@ -1785,6 +1785,9 @@ module.exports = function(grunt) {
 		const ignoredFiles = [
 			'build/wp-includes/js/dist/components.js',
 			'build/wp-includes/js/dist/data.js',
+			// We have a problem where Yjs is being bundled in core-data.
+			// Ignoring this file until we find a solution.
+			'build/wp-includes/js/dist/core-data.js',
 		];
 		const files = buildFiles.reduce( ( acc, path ) => {
 			// Skip excluded paths and any path that isn't a file.