Merge branch 'trunk' into patch/63135

Author: SirLouen

.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

@@ -129,8 +129,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.
+  # 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 }}
@@ -145,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 ]
 
@@ -154,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:

.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/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
 

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

@@ -47,7 +47,7 @@ jobs:
         branch: [
             '6.8', '6.7', '6.6', '6.5', '6.4', '6.3', '6.2', '6.1','6.0',
             '5.9', '5.8', '5.7', '5.6', '5.5', '5.4', '5.3', '5.2', '5.1', '5.0',
-            '4.9', '4.8', '4.7', '4.6', '4.5', '4.4', '4.3', '4.2', '4.1'
+            '4.9', '4.8', '4.7'
         ]
         include:
           # PHP Compatibility testing was introduced in 5.5.

.github/workflows/upgrade-testing.yml

@@ -37,15 +37,15 @@ permissions: {}
 # Because the number of jobs spawned can quickly balloon out of control, the following methodology is applied when
 # building out the matrix below:
 #
-# - The last two releases of WordPress are tested against all PHP/MySQL LTS version combinations and the most recent
-#   innovation release.
+# - The two most recent releases of WordPress are tested against all PHP/MySQL LTS version combinations and the
+#   most recent innovation release.
 # - The next 6 oldest versions of WordPress are tested against both the oldest and newest releases of PHP currently
 #   supported for both PHP 7 & 8 along with the oldest and newest MySQL LTS versions currently supported (no innovation
 #   releases). At the current 3 releases per year pace, this accounts for 2 additional years worth of releases.
 # - Of the remaining versions of WordPress still receiving security updates, only test the ones where the database
 #   version was updated since the previous major release.
 # - The oldest version of WordPress receiving security updates should always be tested against the same combinations as
-#   detailed for the last two releases.
+#   detailed for the two most recent releases.
 
 #  Notes about chosen MySQL versions:
 #    - Only the most recent innovation release should be included in testing.
@@ -54,8 +54,8 @@ permissions: {}
 #    - 5.6.x Docker containers are available and work, but 5.6 only accounts for ~2.3% of installs as of 12/6/2024.defaults:
 #    - 5.7.x accounts for ~20% of installs, so this is used below instead.
 jobs:
-  # Tests the full list of PHP/MySQL combinations for the last two versions of WordPress.
-  upgrade-tests-last-two-releases:
+  # Tests the full list of PHP/MySQL combinations for the two most recent versions of WordPress.
+  upgrade-tests-recent-releases:
     name: ${{ matrix.wp }} to ${{ inputs.new-version && inputs.new-version || 'latest' }}
     uses: ./.github/workflows/reusable-upgrade-testing.yml
     if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
@@ -89,7 +89,7 @@ jobs:
       new-version: ${{ inputs.new-version && inputs.new-version || 'latest' }}
       multisite: ${{ matrix.multisite }}
 
-  # Tests the remaining 6.x releases on the oldest and newest supported versions of PHP 7 & 8.
+  # Tests 6.x releases where the WordPress database version changed on the oldest and newest supported versions of PHP 7 & 8.
   upgrade-tests-wp-6x-mysql:
     name: ${{ matrix.wp }} to ${{ inputs.new-version && inputs.new-version || 'latest' }}
     uses: ./.github/workflows/reusable-upgrade-testing.yml
@@ -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', '6.6' ]
+        wp: [ '6.0', '6.3', '6.4', '6.5' ]
         multisite: [ false, true ]
 
         exclude:
@@ -172,67 +172,12 @@ jobs:
       new-version: ${{ inputs.new-version && inputs.new-version || 'latest' }}
       multisite: ${{ matrix.multisite }}
 
-  # Tests 4.x releases where the WordPress database version changed on the oldest and newest supported versions of PHP 7.
-  #
-  # The oldest version of WordPress receiving security updates should always be tested.
-  upgrade-tests-wp-4x-php-7x-mysql:
-    name: ${{ matrix.wp }} to ${{ inputs.new-version && inputs.new-version || 'latest' }}
-    uses: ./.github/workflows/reusable-upgrade-testing.yml
-    if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ 'ubuntu-24.04' ]
-        php: [ '7.2', '7.4' ]
-        db-type: [ 'mysql' ]
-        db-version: [ '5.7', '8.4' ]
-        wp: [ '4.1', '4.2', '4.3', '4.4', '4.5', '4.6', '4.7' ]
-        multisite: [ false, true ]
-
-        exclude:
-          # The PHP <= 7.3/MySQL 8.4 jobs currently fail due to mysql_native_password being disabled by default. See https://core.trac.wordpress.org/ticket/61218.
-          - php: '7.2'
-            db-version: '8.4'
-    with:
-      os: ${{ matrix.os }}
-      php: ${{ matrix.php }}
-      db-type: ${{ matrix.db-type }}
-      db-version: ${{ matrix.db-version }}
-      wp: ${{ matrix.wp }}
-      new-version: ${{ inputs.new-version && inputs.new-version || 'latest' }}
-      multisite: ${{ matrix.multisite }}
-
-  # Tests 4.x releases where the WordPress database version changed on the oldest and newest supported versions of PHP 8.
-  #
-  # The oldest version of WordPress receiving security updates should always be tested.
+  # The oldest version of WordPress receiving security updates should always be tested against
+  # the widest possible list of PHP/MySQL combinations.
   #
-  # WordPress 4.6-4.9 are excluded from PHP 8+ testing because of the following fatal errors:
+  # WordPress 4.7 is excluded from PHP 8+ testing because of the following fatal errors:
   # - Use of __autoload().
   # - array/string offset with curly braces.
-  upgrade-tests-wp-4x-php-8x-mysql:
-    name: ${{ matrix.wp }} to ${{ inputs.new-version && inputs.new-version || 'latest' }}
-    uses: ./.github/workflows/reusable-upgrade-testing.yml
-    if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ 'ubuntu-24.04' ]
-        php: [ '8.0', '8.4' ]
-        db-type: [ 'mysql' ]
-        db-version: [ '5.7', '8.4' ]
-        wp: [ '4.1', '4.2', '4.3', '4.4', '4.5' ]
-        multisite: [ false, true ]
-    with:
-      os: ${{ matrix.os }}
-      php: ${{ matrix.php }}
-      db-type: ${{ matrix.db-type }}
-      db-version: ${{ matrix.db-version }}
-      wp: ${{ matrix.wp }}
-      new-version: ${{ inputs.new-version && inputs.new-version || 'latest' }}
-      multisite: ${{ matrix.multisite }}
-
-  # The oldest version of WordPress receiving security updates should always be tested against
-  # the full list of PHP/MySQL combinations.
   upgrade-tests-oldest-wp-mysql:
     name: ${{ matrix.wp }} to ${{ inputs.new-version && inputs.new-version || 'latest' }}
     uses: ./.github/workflows/reusable-upgrade-testing.yml
@@ -241,10 +186,10 @@ 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' ]
         db-type: [ 'mysql' ]
         db-version: [ '5.7', '8.0', '8.4', '9.3' ]
-        wp: [ '4.1' ]
+        wp: [ '4.7' ]
         multisite: [ false, true ]
 
         exclude:
@@ -273,7 +218,7 @@ jobs:
     permissions:
       actions: read
       contents: read
-    needs: [ upgrade-tests-last-two-releases, upgrade-tests-wp-6x-mysql, upgrade-tests-wp-5x-php-7x-mysql, upgrade-tests-wp-5x-php-8x-mysql, upgrade-tests-wp-4x-php-7x-mysql, upgrade-tests-wp-4x-php-8x-mysql, upgrade-tests-oldest-wp-mysql ]
+    needs: [ upgrade-tests-recent-releases, upgrade-tests-wp-6x-mysql, upgrade-tests-wp-5x-php-7x-mysql, upgrade-tests-wp-5x-php-8x-mysql, upgrade-tests-oldest-wp-mysql ]
     if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     with:
       calling_status: ${{ contains( needs.*.result, 'cancelled' ) && 'cancelled' || contains( needs.*.result, 'failure' ) && 'failure' || 'success' }}

.version-support-mysql.json

@@ -182,47 +182,5 @@
 		"5.5",
 		"5.1",
 		"5.0"
-	],
-	"4-6": [
-		"5.7",
-		"5.6",
-		"5.5",
-		"5.1",
-		"5.0"
-	],
-	"4-5": [
-		"5.7",
-		"5.6",
-		"5.5",
-		"5.1",
-		"5.0"
-	],
-	"4-4": [
-		"5.7",
-		"5.6",
-		"5.5",
-		"5.1",
-		"5.0"
-	],
-	"4-3": [
-		"5.7",
-		"5.6",
-		"5.5",
-		"5.1",
-		"5.0"
-	],
-	"4-2": [
-		"5.7",
-		"5.6",
-		"5.5",
-		"5.1",
-		"5.0"
-	],
-	"4-1": [
-		"5.7",
-		"5.6",
-		"5.5",
-		"5.1",
-		"5.0"
 	]
 }