Merge branch 'trunk' of https://github.com/WordPress/wordpress-develop into fix/fix-issue-64194

Author: westonruter

.git-blame-ignore-revs

@@ -61,4 +61,14 @@ 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/workflows/phpunit-tests.yml

@@ -211,7 +211,7 @@ jobs:
         os: [ ubuntu-24.04 ]
         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' ]
+        db-version: [ '5.5', '10.3', '10.5', '10.6', '10.11', '11.4', '11.8' ]
         multisite: [ false, true ]
         memcached: [ false ]
 
@@ -222,9 +222,6 @@ jobs:
           - event: pull_request
             php: '7.2'
             db-version: '10.3'
-          - event: pull_request
-            php: '7.2'
-            db-version: '10.4'
           - event: pull_request
             php: '7.2'
             db-version: '10.5'
@@ -243,9 +240,6 @@ jobs:
           - event: pull_request
             php: '7.3'
             db-version: '5.5'
-          - event: pull_request
-            php: '7.3'
-            db-version: '10.4'
           - event: pull_request
             php: '7.3'
             db-version: '10.5'
@@ -288,9 +282,6 @@ jobs:
           - event: pull_request
             php: '8.0'
             db-version: '10.3'
-          - event: pull_request
-            php: '8.0'
-            db-version: '10.4'
           - event: pull_request
             php: '8.0'
             db-version: '10.6'
@@ -309,9 +300,6 @@ jobs:
           - event: pull_request
             php: '8.1'
             db-version: '10.3'
-          - event: pull_request
-            php: '8.1'
-            db-version: '10.4'
           - event: pull_request
             php: '8.1'
             db-version: '10.5'
@@ -330,9 +318,6 @@ jobs:
           - event: pull_request
             php: '8.2'
             db-version: '10.3'
-          - event: pull_request
-            php: '8.2'
-            db-version: '10.4'
           - event: pull_request
             php: '8.2'
             db-version: '10.5'
@@ -351,9 +336,6 @@ jobs:
           - event: pull_request
             php: '8.3'
             db-version: '10.3'
-          - event: pull_request
-            php: '8.3'
-            db-version: '10.4'
           - event: pull_request
             php: '8.3'
             db-version: '10.5'
@@ -372,9 +354,6 @@ jobs:
           - event: pull_request
             php: '8.4'
             db-version: '10.3'
-          - event: pull_request
-            php: '8.4'
-            db-version: '10.4'
           - event: pull_request
             php: '8.4'
             db-version: '10.5'
@@ -393,9 +372,6 @@ jobs:
           - event: pull_request
             php: '8.5'
             db-version: '10.3'
-          - event: pull_request
-            php: '8.5'
-            db-version: '10.4'
           - event: pull_request
             php: '8.5'
             db-version: '10.5'

.github/workflows/pull-request-comments.yml

@@ -130,6 +130,20 @@ jobs:
             const fs = require( 'fs' );
             const issue_number = Number( fs.readFileSync( './NR' ) );
 
+            core.info( `Checking pull request #${issue_number}.` );
+
+            // Confirm that the pull request is still open before leaving a comment.
+            const pr = await github.rest.pulls.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: issue_number,
+            });
+
+            if ( pr.data.state !== 'open' ) {
+              core.info( 'The pull request has been closed. No comment will be left.' );
+              return;
+            }
+
             // Comments are only added after the first successful build. Check for the presence of a comment and bail early.
             const commentInfo = {
               owner: context.repo.owner,
@@ -141,6 +155,7 @@ jobs:
 
             for ( const currentComment of comments ) {
               if ( currentComment.user.type === 'Bot' && currentComment.body.includes( 'Test using WordPress Playground' ) ) {
+                core.info( 'A comment with instructions to test within a Playground instance already exists.' );
                 return;
               }
             };

Gruntfile.js

@@ -1159,7 +1159,7 @@ module.exports = function(grunt) {
 								}
 
 								// Fetch a list of the files that Twemoji supplies.
-								query = 'query={repository(owner: "jdecked", name: "twemoji") {object(expression: "v16.0.1:assets/svg") {... on Tree {entries {name}}}}}';
+								query = 'query={repository(owner: "jdecked", name: "twemoji") {object(expression: "v17.0.1:assets/svg") {... on Tree {entries {name}}}}}';
 								files = spawn( 'gh', [ 'api', 'graphql', '-f', query] );
 
 								if ( 0 !== files.status ) {

composer.json

@@ -19,7 +19,7 @@
 		"ext-dom": "*"
 	},
 	"require-dev": {
-		"composer/ca-bundle": "1.5.8",
+		"composer/ca-bundle": "1.5.9",
 		"squizlabs/php_codesniffer": "3.13.2",
 		"wp-coding-standards/wpcs": "~3.2.0",
 		"phpcompatibility/phpcompatibility-wp": "~2.1.3",