Merge branch 'trunk' into reverts/53323

Author: peterwilsoncc

.github/dependabot.yml

@@ -129,6 +129,28 @@ updates:
           - "underscore"
 
   # Monitor npm dependencies within default themes.
+  - package-ecosystem: "npm"
+    directory: "/src/wp-content/themes/twentytwentyfive"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 20
+    groups:
+      twentytwentyfive-css:
+        patterns:
+          - "**browserslist*"
+          - "*css*"
+
+  - package-ecosystem: "npm"
+    directory: "/src/wp-content/themes/twentytwentytwo"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 20
+    groups:
+      twentytwentytwo-css:
+        patterns:
+          - "**browserslist*"
+          - "*css*"
+
   - package-ecosystem: "npm"
     directory: "/src/wp-content/themes/twentytwentyone"
     schedule:

.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/test-and-zip-default-themes.yml

@@ -14,6 +14,8 @@ on:
       - 'src/wp-content/themes/twentynineteen/**'
       - 'src/wp-content/themes/twentytwenty/**'
       - 'src/wp-content/themes/twentytwentyone/**'
+      - 'src/wp-content/themes/twentytwentytwo/**'
+      - 'src/wp-content/themes/twentytwentyfive/**'
       # Changes to this workflow file should always verify success.
       - '.github/workflows/test-and-zip-default-themes.yml'
   pull_request:
@@ -29,6 +31,8 @@ on:
       - 'src/wp-content/themes/twentynineteen/**'
       - 'src/wp-content/themes/twentytwenty/**'
       - 'src/wp-content/themes/twentytwentyone/**'
+      - 'src/wp-content/themes/twentytwentytwo/**'
+      - 'src/wp-content/themes/twentytwentyfive/**'
       # Changes to this workflow file should always verify success.
       - '.github/workflows/test-and-zip-default-themes.yml'
   workflow_dispatch:
@@ -120,6 +124,8 @@ jobs:
       fail-fast: false
       matrix:
         theme: [
+            'twentytwentyfive',
+            'twentytwentytwo',
             'twentytwentyone',
             'twentytwenty',
             'twentynineteen',
@@ -221,11 +227,31 @@ jobs:
           show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
           persist-credentials: false
 
+      - name: Set up Node.js for themes needing minification
+        if: matrix.theme == 'twentytwentytwo' || matrix.theme == 'twentytwentyfive'
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        with:
+          node-version-file: '.nvmrc'
+          cache: npm
+          cache-dependency-path: src/wp-content/themes/${{ matrix.theme }}/package-lock.json
+
+      - name: Install npm dependencies
+        if: matrix.theme == 'twentytwentytwo' || matrix.theme == 'twentytwentyfive'
+        run: npm ci
+        working-directory: src/wp-content/themes/${{ matrix.theme }}
+
+      - name: Build theme assets
+        if: matrix.theme == 'twentytwentytwo' || matrix.theme == 'twentytwentyfive'
+        run: npm run build
+        working-directory: src/wp-content/themes/${{ matrix.theme }}
+
       - name: Upload theme ZIP as an artifact
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: ${{ matrix.theme }}
-          path: src/wp-content/themes/${{ matrix.theme }}
+          path: |
+            src/wp-content/themes/${{ matrix.theme }}
+            !src/wp-content/themes/${{ matrix.theme }}/node_modules
           if-no-files-found: error
           include-hidden-files: true
 

.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

@@ -87,6 +87,12 @@ wp-tests-config.php
 /src/wp-content/themes/twentynineteen/node_modules
 /src/wp-content/themes/twentytwentyone/node_modules
 /src/wp-content/themes/twentytwenty/node_modules
+/src/wp-content/themes/twentytwentytwo/node_modules
+/src/wp-content/themes/twentytwentyfive/node_modules
+
+# Minified files in bundled themes
+/src/wp-content/themes/twentytwentytwo/*.min.css
+/src/wp-content/themes/twentytwentyfive/*.min.css
 
 # Operating system specific files
 .DS_Store

.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

@@ -567,6 +567,16 @@ module.exports = function(grunt) {
 				src: [
 					'wp-admin/css/colors/*/*.css'
 				]
+			},
+			themes: {
+				expand: true,
+				cwd: WORKING_DIR,
+				dest: WORKING_DIR,
+				ext: '.min.css',
+				src: [
+					'wp-content/themes/twentytwentytwo/style.css',
+					'wp-content/themes/twentytwentyfive/style.css',
+				]
 			}
 		},
 		rtlcss: {
@@ -1591,6 +1601,7 @@ module.exports = function(grunt) {
 		'rtl',
 		'cssmin:rtl',
 		'cssmin:colors',
+		'cssmin:themes',
 		'usebanner'
 	] );
 

phpcs.xml.dist

@@ -229,7 +229,7 @@
 	#############################################################################
 	SELECTIVE EXCLUSIONS
 	Exclude specific files for specific sniffs and/or exclude sub-groups in sniffs.
-	
+
 	These exclusions are listed ordered by alphabetic sniff name.
 	#############################################################################
 	-->
@@ -266,8 +266,9 @@
 
 		<!-- Goto is an effective way to handle errors in decoders which expect valid bytes
 		     without impacting the fast path while avoiding bloating the code with redundant
-		     and risky handling code. Exclude forbidding goto in UTF-8 fallback code. -->
+		     and risky handling code. Exclude forbidding goto in parser code. -->
 		<exclude-pattern>/wp-includes/compat-utf8\.php</exclude-pattern>
+		<exclude-pattern>/wp-includes/class-wp-block-processor\.php</exclude-pattern>
 	</rule>
 
 	<!-- Exclude sample config from modernization to prevent breaking CI workflows based on WP-CLI scaffold.