Merge branch 'trunk' into patch/63135

Author: SirLouen

.github/workflows/install-testing.yml

@@ -92,11 +92,13 @@ jobs:
             db-version: '8.4'
           # Only test the latest innovation release.
           - db-version: '9.0'
+          - db-version: '9.1'
+          - db-version: '9.2'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.1'
+            db-version: '9.3'
           - php: '7.3'
-            db-version: '9.1'
+            db-version: '9.3'
 
     services:
       database:

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

@@ -97,11 +97,13 @@ jobs:
           - db-version: '5.5'
           # Only test the latest innovation release.
           - db-version: '9.0'
+          - db-version: '9.1'
+          - db-version: '9.2'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.1'
+            db-version: '9.3'
           - php: '7.3'
-            db-version: '9.1'
+            db-version: '9.3'
 
     with:
       os: ${{ matrix.os }}

.github/workflows/phpunit-tests.yml

@@ -53,6 +53,10 @@ jobs:
   #
   # Creates a PHPUnit test job for each PHP/MySQL combination.
   #
+  # Though MySQL 5.5 and 5.6 are still supported by WordPress, they are not currently tested here because the Docker
+  # images do not work. Testing against MariaDB 5.5 provides a reasonable level of MySQL 5.5 testing (see MariaDB matrix
+  # below for more details).
+  #
   test-with-mysql:
     name: PHP ${{ matrix.php }}
     uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
@@ -124,6 +128,10 @@ jobs:
   #
   # Creates a PHPUnit test job for each PHP/MariaDB combination.
   #
+  # All LTS versions of MariaDB supported by WordPress with greater than 1% usage according to w.org/stats should be
+  # tested. The exception to this rule is version 5.5. That release was intended as a drop-in replacement for MySQL.
+  # Because the MySQL 5.5 Docker containers do not work, this ensures some level of MySQL 5.5 testing.
+  #
   test-with-mariadb:
     name: PHP ${{ matrix.php }}
     uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
@@ -168,11 +176,11 @@ jobs:
   #
   # Creates PHPUnit test jobs to test MariaDB and MySQL innovation releases.
   #
-  # Though innovation releases are deemed "production grade" and never receive LTS status, they include new features
-  # and updates that will be included in the next LTS version.
+  # Though innovation releases are deemed "production grade", they never receive LTS status. However, they include new
+  # features and updates that will be included in the next LTS version.
   #
-  # Because upstream support for innovation releases gets dropped when a new one is released, only the most recent
-  # innovation version is tested.
+  # Because upstream support for innovation releases is dropped when a new one is released (including security updates),
+  # only the most recent innovation version is tested.
   #
   test-innovation-releases:
     name: PHP ${{ matrix.php }}
@@ -187,22 +195,22 @@ jobs:
         os: [ ubuntu-24.04 ]
         php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
         db-type: [ 'mysql', 'mariadb' ]
-        db-version: [ '9.1', '11.6' ]
+        db-version: [ '9.3', '11.7' ]
         multisite: [ false, true ]
         memcached: [ false ]
         db-innovation: [ true ]
 
         exclude:
           # MySQL 9.0+ will not work on PHP <= 7.3 because mysql_native_password was removed. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.1'
+            db-version: '9.3'
           - php: '7.3'
-            db-version: '9.1'
+            db-version: '9.3'
           # Exclude version combinations that don't exist.
           - db-type: 'mariadb'
-            db-version: '9.1'
+            db-version: '9.3'
           - db-type: 'mysql'
-            db-version: '11.6'
+            db-version: '11.7'
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}
@@ -217,6 +225,8 @@ jobs:
   #
   # Runs specific individual test groups.
   #
+  # These tests are run against the most recent LTS version of MySQL.
+  #
   specific-test-groups:
     name: ${{ matrix.phpunit-test-groups }}
     uses: ./.github/workflows/reusable-phpunit-tests-v3.yml

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

@@ -158,7 +158,7 @@ jobs:
             - All changes will be lost when refreshing the page.
             - A fresh instance is created each time the link below is clicked.
             - Every time this pull request is updated, a new ZIP file containing all changes is created. If changes are not reflected in the Playground instance,
-            it's possible that the most recent build failed, or has not completed. Check the [list of workflow runs to be sure](https://github.com/WordPress/wordpress-develop/actions/workflows/wordpress-playground.yml).
+            it's possible that the most recent build failed, or has not completed. Check the [list of workflow runs to be sure](https://github.com/WordPress/wordpress-develop/actions/workflows/test-build-processes.yml).
 
             For more details about these limitations and more, check out the [Limitations page](https://wordpress.github.io/wordpress-playground/limitations/) in the WordPress Playground documentation.
 

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

@@ -50,16 +50,32 @@ jobs:
         with:
           script: |
             const fixedList = "${{ steps.trac-tickets.outputs.fixed_list }}".split(' ').filter(Boolean);
-
             let prNumbers = [];
 
             for (const ticket of fixedList) {
-              const tracTicketUrl = `https://core.trac.wordpress.org/ticket/${ ticket }`;
-              const corePrefix = `Core-${ ticket }`;
-              const query = `is:pr is:open repo:${ context.repo.owner }/${ context.repo.repo } in:body ${ tracTicketUrl } OR ${ corePrefix }`;
-              const result = await github.rest.search.issuesAndPullRequests({ q: query });
+              const tracTicketUrl = `https://core.trac.wordpress.org/ticket/${ticket}`;
+              const corePrefix = `Core-${ticket}`;
+
+              const query = `
+                query($searchQuery: String!) {
+                  search(query: $searchQuery, type: ISSUE_ADVANCED, first: 20) {
+                    nodes {
+                      ... on PullRequest {
+                        number
+                        state
+                      }
+                    }
+                  }
+                }
+              `;
+
+              const searchQuery = `repo:${context.repo.owner}/${context.repo.repo} is:pr is:open in:body ( "${tracTicketUrl}" OR "${corePrefix}" )`;
+
+              const result = await github.graphql(query, {
+                searchQuery,
+              });
 
-              prNumbers = prNumbers.concat(result.data.items.map(pr => pr.number));
+              prNumbers.push(...result.search.nodes.map(pr => pr.number));
             }
 
             return prNumbers;

.github/workflows/reusable-test-local-docker-environment-v1.yml

@@ -155,7 +155,7 @@ jobs:
         run: npm run env:restart
 
       - name: Test a CLI command
-        run: npm run env:cli wp option get siteurl
+        run: npm run env:cli option get siteurl
 
       - name: Test logs command
         run: npm run env:logs

.github/workflows/test-old-branches.yml

@@ -25,7 +25,7 @@ on:
 permissions: {}
 
 env:
-  CURRENTLY_SUPPORTED_BRANCH: '6.7'
+  CURRENTLY_SUPPORTED_BRANCH: '6.8'
 
 jobs:
   dispatch-workflows-for-old-branches:

.github/workflows/upgrade-develop-testing.yml

@@ -64,7 +64,7 @@ jobs:
         db-type: [ 'mysql' ]
         db-version: [ '5.7', '8.4' ]
         # WordPress 4.9 is the oldest version that supports PHP 7.2.
-        wp: [ '4.9', '6.5', '6.7', '6.8-RC1' ]
+        wp: [ '4.9', '6.6', '6.7', '6.8' ]
         multisite: [ false, true ]
 
         exclude:

.github/workflows/upgrade-testing.yml

@@ -65,8 +65,8 @@ jobs:
         os: [ 'ubuntu-24.04' ]
         php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
         db-type: [ 'mysql' ]
-        db-version: [ '5.7', '8.0', '8.4', '9.1' ]
-        wp: [ '6.6', '6.7' ]
+        db-version: [ '5.7', '8.0', '8.4', '9.3' ]
+        wp: [ '6.7', '6.8' ]
         multisite: [ false, true ]
 
         exclude:
@@ -77,9 +77,9 @@ jobs:
             db-version: '8.4'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.1'
+            db-version: '9.3'
           - php: '7.3'
-            db-version: '9.1'
+            db-version: '9.3'
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}
@@ -101,7 +101,7 @@ jobs:
         php: [ '7.2', '7.4', '8.0', '8.4' ]
         db-type: [ 'mysql' ]
         db-version: [ '5.7', '8.4' ]
-        wp: [ '6.0', '6.1', '6.2', '6.3', '6.4', '6.5' ]
+        wp: [ '6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '6.6' ]
         multisite: [ false, true ]
 
         exclude:
@@ -243,7 +243,7 @@ jobs:
         os: [ 'ubuntu-24.04' ]
         php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
         db-type: [ 'mysql' ]
-        db-version: [ '5.7', '8.0', '8.4', '9.1' ]
+        db-version: [ '5.7', '8.0', '8.4', '9.3' ]
         wp: [ '4.1' ]
         multisite: [ false, true ]
 
@@ -255,9 +255,9 @@ jobs:
             db-version: '8.4'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.1'
+            db-version: '9.3'
           - php: '7.3'
-            db-version: '9.1'
+            db-version: '9.3'
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}

.version-support-mysql.json

@@ -1,5 +1,7 @@
 {
 	"6-9": [
+		"9.3",
+		"9.2",
 		"9.1",
 		"9.0",
 		"8.4",