Merge branch 'trunk' into bugfix/wp_add_id3_tag_data

Author: rollybueno

.git-blame-ignore-revs

@@ -59,3 +59,6 @@ a96fa164b00ed51c7c0481574834cff92ab9b1f0 # [60043]
 1aa6da693ad739b78752a55d154cd48cb757b90b # [60047]
 d44e1c2ce2dc638e89ed6a1d02b1cfadb8a15fe7 # [60048]
 a18719e7ea49ab7ac0091e076840cb7efdf51cc5 # [60049]
+
+# 6.9 Coding Standards
+cbb6519119276ceba4279eaee73ab66294ebd820 # [60402]

.github/dependabot.yml

@@ -127,3 +127,65 @@ updates:
           - "lodash"
           - "moment"
           - "underscore"
+
+  # Monitor npm dependencies within default themes.
+  - package-ecosystem: "npm"
+    directory: "/src/wp-content/themes/twentytwentyone"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 20
+    groups:
+      twentytwentyone-sass-css:
+        patterns:
+          - "**browserslist*"
+          - "autoprefixer"
+          - "*css*"
+          - "*sass*"
+          - "!*stylelint*"
+      twentytwentyone-eslint:
+        patterns:
+          - "**eslint*"
+      twentytwentyone-stylelint:
+        patterns:
+          - "**stylelint*"
+      twentytwentyone-miscellaneous:
+        patterns:
+          - "chokidar-cli"
+          - "minimist"
+          - "npm-run-all"
+
+  - package-ecosystem: "npm"
+    directory: "/src/wp-content/themes/twentytwenty"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 20
+    groups:
+      twentytwenty-css:
+        patterns:
+          - "**browserslist*"
+          - "autoprefixer"
+          - "*css*"
+      twentytwenty-stylelint:
+        patterns:
+          - "*stylelint*"
+      twentytwenty-miscellaneous:
+        patterns:
+          - "concurrently"
+          - "@wordpress/scripts"
+
+  - package-ecosystem: "npm"
+    directory: "/src/wp-content/themes/twentynineteen"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 20
+    groups:
+      twentynineteen-css-sass:
+        patterns:
+          - "**browserslist*"
+          - "autoprefixer"
+          - "*css*"
+          - "*sass*"
+      twentynineteen-miscellaneous:
+        patterns:
+          - "chokidar-cli"
+          - "npm-run-all"

.github/workflows/check-built-files.yml

@@ -26,6 +26,8 @@ on:
       - 'composer.*'
       # Confirm any changes to relevant workflow files.
       - '.github/workflows/check-built-files.yml'
+      # Changes to the default themes should be handled by the themes workflows.
+      - '!src/wp-content/themes/twenty**'
 
 # Cancels all previous workflow runs for pull requests that have not completed.
 concurrency:

.github/workflows/commit-built-file-changes.yml

@@ -3,7 +3,9 @@ name: Commit Built File Changes (PRs)
 
 on:
   workflow_run:
-    workflows: [ 'Check Built Files (PRs)' ]
+    workflows:
+      - 'Check Built Files (PRs)'
+      - 'Test Default Themes & Create ZIPs'
     types:
       - completed
 

.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,12 @@ 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 exceptions to this rule are the most recent LTS and version 5.5.
+  #
+  # The 5.5 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
@@ -137,7 +147,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: [ 'mariadb' ]
-        db-version: [ '5.5', '10.3', '10.4', '10.5', '10.6', '10.11', '11.4' ]
+        db-version: [ '5.5', '10.3', '10.4', '10.5', '10.6', '10.11', '11.4', '11.8' ]
         multisite: [ false, true ]
         memcached: [ false ]
 
@@ -146,13 +156,13 @@ jobs:
         - os: ubuntu-24.04
           php: '8.3'
           db-type: 'mariadb'
-          db-version: '11.4'
+          db-version: '11.8'
           multisite: false
           memcached: true
         - os: ubuntu-24.04
           php: '8.3'
           db-type: 'mariadb'
-          db-version: '11.4'
+          db-version: '11.8'
           multisite: true
           memcached: true
     with:
@@ -168,11 +178,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 }}
@@ -217,6 +227,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-phpunit-tests-v1.yml

@@ -3,7 +3,7 @@
 #
 # A reusable workflow that runs the PHPUnit test suite with the specified configuration.
 #
-# This workflow is used by branches 4.1 through 5.1.
+# This workflow is used by branches 4.7 through 5.1.
 ##
 name: Run PHPUnit tests
 

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

@@ -148,6 +148,32 @@ jobs:
       - name: Build theme
         run: npm run build
 
+      - name: Check for changes to versioned files
+        id: built-file-check
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          if git diff --quiet; then
+            echo "uncommitted_changes=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "uncommitted_changes=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Display changes to versioned files
+        if: ${{ steps.built-file-check.outputs.uncommitted_changes == 'true' }}
+        run: git diff
+
+      - name: Save diff to a file
+        if: ${{ steps.built-file-check.outputs.uncommitted_changes == 'true' }}
+        run: git diff > ./changes.diff
+
+      # Uploads the diff file as an artifact.
+      - name: Upload diff file as artifact
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        if: ${{ steps.built-file-check.outputs.uncommitted_changes == 'true' }}
+        with:
+          name: pr-built-file-changes
+          path: src/wp-content/themes/${{ matrix.theme }}/changes.diff
+
       - name: Ensure version-controlled files are not modified or deleted
         run: git diff --exit-code