Merge remote-tracking branch 'upstream/trunk' into add/mariadb-11-4

# Conflicts: # .github/workflows/install-testing.yml # .github/workflows/local-docker-environment.yml # .github/workflows/phpunit-tests.yml # .github/workflows/reusable-phpunit-tests-v3.yml
WordPress · Dec 17, 2024 · 2038092 · 2038092
2 parents 225202f + c697356
commit 2038092
Show file tree

Hide file tree

Showing 20 changed files with 4,793 additions and 3,922 deletions.
diff --git a/.env.example b/.env.example
@@ -51,7 +51,7 @@ LOCAL_DB_TYPE=mysql
 # When using `mysql`, see https://hub.docker.com/_/mysql for valid versions.
 # When using `mariadb`, see https://hub.docker.com/_/mariadb for valid versions.
 ##
-LOCAL_DB_VERSION=8.0
+LOCAL_DB_VERSION=8.4
 
 # Whether or not to enable multisite.
 LOCAL_MULTISITE=false

diff --git a/.github/workflows/install-testing.yml b/.github/workflows/install-testing.yml
@@ -81,19 +81,18 @@ jobs:
           # There are no local WordPress Docker environment containers for PHP <= 5.3.
           - php: '5.2'
           - php: '5.3'
-
           # MySQL containers <= 5.5 do not exist or fail to start properly.
           - db-version: '5.0'
           - db-version: '5.1'
           - db-version: '5.5'
-
+          # 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'
           - php: '7.3'
             db-version: '8.4'
           # Only test the latest innovation release.
           - db-version: '9.0'
-          # MySQL 9.0+ will not work on PHP <= 7.3 because mysql_native_password was removed. See https://core.trac.wordpress.org/ticket/61218.
+          # 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'
           - php: '7.3'

diff --git a/.github/workflows/local-docker-environment.yml b/.github/workflows/local-docker-environment.yml
@@ -88,11 +88,11 @@ jobs:
         db-version: ${{ fromJSON( needs.build-test-matrix.outputs.mysql-versions ) }}
 
         exclude:
-          # The MySQL 5.5 containers will not start.
+          # MySQL containers <= 5.5 do not exist or fail to start properly.
           - db-version: '5.5'
           # Only test the latest innovation release.
           - db-version: '9.0'
-          # MySQL 9.0+ will not work on PHP 7.2 & 7.3
+          # 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'
           - php: '7.3'

diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
@@ -91,7 +91,6 @@ jobs:
             multisite: false
             memcached: false
             report: true
-
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}
@@ -182,7 +181,6 @@ jobs:
             db-version: '9.1'
           - db-type: 'mysql'
             db-version: '11.6'
-
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}
@@ -194,13 +192,36 @@ jobs:
       phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
       report: ${{ matrix.report || false }}
 
+  #
+  # Runs specific individual test groups.
+  #
+  specific-test-groups:
+    name: ${{ matrix.phpunit-test-groups }}
+    uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
+    permissions:
+      contents: read
+    secrets: inherit
+    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ '7.2', '7.4', '8.0', '8.4' ]
+        db-type: [ 'mysql' ]
+        db-version: [ '8.4' ]
+        phpunit-test-groups: [ 'html-api-html5lib-tests' ]
+    with:
+      php: ${{ matrix.php }}
+      db-type: ${{ matrix.db-type }}
+      db-version: ${{ matrix.db-version }}
+      phpunit-test-groups: ${{ matrix.phpunit-test-groups }}
+
   slack-notifications:
     name: Slack Notifications
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
     permissions:
       actions: read
       contents: read
-    needs: [ test-with-mysql, test-with-mariadb, test-innovation-releases ]
+    needs: [ test-with-mysql, test-with-mariadb, test-innovation-releases, specific-test-groups ]
     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' }}

diff --git a/.github/workflows/reusable-performance.yml b/.github/workflows/reusable-performance.yml
@@ -15,7 +15,7 @@ on:
         description: 'The version being used for baseline measurements.'
         required: false
         type: 'string'
-        default: '6.1.1'
+        default: '6.7.0'
       php-version:
         description: 'The PHP version to use.'
         required: false
@@ -263,7 +263,9 @@ jobs:
       - name: Set the environment to the baseline version
         if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/trunk' }}
         run: |
-          npm run env:cli -- core update --version=${{ env.BASE_TAG }} --force --path=/var/www/${{ env.LOCAL_DIR }}
+          VERSION="${{ env.BASE_TAG }}"
+          VERSION="${VERSION%.0}"
+          npm run env:cli -- core update --version=$VERSION --force --path=/var/www/${{ env.LOCAL_DIR }}
           npm run env:cli -- core version --path=/var/www/${{ env.LOCAL_DIR }}
 
       - name: Run any database upgrades

diff --git a/.github/workflows/reusable-phpunit-tests-v3.yml b/.github/workflows/reusable-phpunit-tests-v3.yml
@@ -26,7 +26,7 @@ on:
         description: 'Database version'
         required: false
         type: 'string'
-        default: '8.0'
+        default: '8.4'
       db-innovation:
         description: 'Whether a database software innovation release is being tested.'
         required: false
@@ -110,7 +110,7 @@ jobs:
   # - Checks out the WordPress Test reporter repository.
   # - Submit the test results to the WordPress.org host test results.
   phpunit-tests:
-    name: PHP ${{ inputs.php }} ${{ ! inputs.coverage-report && '/ ' || 'with ' }}${{ 'mariadb' == inputs.db-type && 'MariaDB' || 'MySQL' }} ${{ inputs.db-version }}${{ inputs.multisite && ' multisite' || '' }}${{ inputs.db-innovation && ' (innovation release)' || '' }}${{ inputs.phpunit-test-groups && format( ' ({0})', inputs.phpunit-test-groups ) || '' }}${{ inputs.memcached && ' with memcached' || '' }}${{ inputs.report && ' (test reporting enabled)' || '' }} ${{ 'example.org' != inputs.tests-domain && inputs.tests-domain || '' }}
+    name: ${{ inputs.phpunit-test-groups && format( '{0} / ', inputs.phpunit-test-groups ) || '' }}PHP ${{ inputs.php }} ${{ ! inputs.phpunit-test-groups && ! inputs.coverage-report && '/ ' || 'with ' }}${{ 'mariadb' == inputs.db-type && 'MariaDB' || 'MySQL' }} ${{ inputs.db-version }}${{ inputs.multisite && ' multisite' || '' }}${{ inputs.db-innovation && ' (innovation release)' || '' }}${{ inputs.memcached && ' with memcached' || '' }}${{ inputs.report && ' (test reporting enabled)' || '' }} ${{ 'example.org' != inputs.tests-domain && inputs.tests-domain || '' }}
     runs-on: ${{ inputs.os }}
     timeout-minutes: ${{ inputs.coverage-report && 120 || 20 }}
 

diff --git a/.github/workflows/reusable-test-local-docker-environment-v1.yml b/.github/workflows/reusable-test-local-docker-environment-v1.yml
@@ -27,7 +27,7 @@ on:
         description: 'Database version'
         required: false
         type: 'string'
-        default: '8.0'
+        default: '8.4'
       memcached:
         description: 'Whether to enable memcached'
         required: false

diff --git a/.github/workflows/test-old-branches.yml b/.github/workflows/test-old-branches.yml
@@ -13,6 +13,12 @@ on:
     - cron: '0 0 1 * *'
     - cron: '0 0 15 * *'
   workflow_dispatch:
+    inputs:
+      strategy:
+        description: 'The branches to test. Accepts X.Y branch names, or "all". Defaults to only the currently supported branch.'
+        required: false
+        type: string
+        default: ''
 
 # Disable permissions for all available scopes by default.
 # Any needed permissions should be configured at the job level.
@@ -112,7 +118,7 @@ jobs:
     steps:
       - name: Dispatch workflow run
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        if: ${{ github.event_name == 'push' || github.event.schedule == '0 0 15 * *' || matrix.branch == env.CURRENTLY_SUPPORTED_BRANCH }}
+        if: ${{ github.event_name == 'push' || ( github.event_name == 'workflow_dispatch' && matrix.branch == inputs.strategy || inputs.strategy == 'all' ) || github.event.schedule == '0 0 15 * *' || matrix.branch == env.CURRENTLY_SUPPORTED_BRANCH }}
         with:
           retries: 2
           retry-exempt-status-codes: 418

diff --git a/.github/workflows/upgrade-testing.yml b/.github/workflows/upgrade-testing.yml
@@ -72,11 +72,12 @@ jobs:
         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'
           - php: '7.3'
             db-version: '8.4'
-          # MySQL 9.0+ will not work on PHP 7.2 & 7.3
+          # 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'
           - php: '7.3'
@@ -108,6 +109,7 @@ jobs:
         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'
           - php: '7.3'
@@ -137,6 +139,7 @@ jobs:
         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'
           - php: '7.3'
@@ -195,6 +198,7 @@ jobs:
         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'
           - php: '7.3'
@@ -254,11 +258,12 @@ jobs:
         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'
           - php: '7.3'
             db-version: '8.4'
-          # MySQL 9.0+ will not work on PHP 7.2 & 7.3
+          # 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'
           - php: '7.3'

diff --git a/src/wp-admin/edit-form-advanced.php b/src/wp-admin/edit-form-advanced.php
@@ -25,14 +25,7 @@
 if ( is_multisite() ) {
 	add_action( 'admin_footer', '_admin_notice_post_locked' );
 } else {
-	$check_users = get_users(
-		array(
-			'fields' => 'ID',
-			'number' => 2,
-		)
-	);
-
-	if ( count( $check_users ) > 1 ) {
+	if ( get_user_count() > 1 ) {
 		add_action( 'admin_footer', '_admin_notice_post_locked' );
 	}