Merge branch 'WordPress:trunk' into trunk

.github/workflows/install-testing.yml

@@ -46,6 +46,7 @@ jobs:
   build-matrix:
     name: Determine PHP Versions to test
     runs-on: ubuntu-latest
+    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
     timeout-minutes: 5
     outputs:
       major-wp-version: ${{ steps.major-wp-version.outputs.version }}
@@ -104,6 +105,7 @@ jobs:
     permissions:
       contents: read
     runs-on: ${{ matrix.os }}
+    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
     timeout-minutes: 10
     needs: [ build-matrix ]
     strategy:

.github/workflows/performance.yml

@@ -43,6 +43,8 @@ jobs:
         memcached: [ true, false ]
     with:
       memcached: ${{ matrix.memcached }}
+    secrets:
+      CODEVITALS_PROJECT_TOKEN: ${{ secrets.CODEVITALS_PROJECT_TOKEN }}
 
   slack-notifications:
     name: Slack Notifications

.github/workflows/phpunit-tests.yml

@@ -45,7 +45,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
+        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.1', '8.2', '8.3' ]
         tests-domain: [ 'example.org' ]
@@ -116,7 +116,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
+        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
         db-type: [ 'mariadb' ]
         db-version: [ '10.4', '10.6', '10.11', '11.2' ]
         multisite: [ false, true ]

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

@@ -3,7 +3,7 @@ name: Pull Request Comments
 
 on:
   pull_request_target:
-    types: [ 'opened' ]
+    types: [ 'opened', 'synchronize', 'reopened', 'edited' ]
   workflow_run:
     workflows: [ 'Test Build Processes' ]
     types:
@@ -164,16 +164,16 @@ jobs:
 
             github.rest.issues.createComment( commentInfo );
 
-  # Leaves a comment on a pull request when no Trac ticket is included in the pull request description.
+  # Manages comments reminding contributors to include a Trac ticket link when opening a pull request.
   trac-ticket-check:
-    name: Comment on a pull request when no Trac ticket is included
+    name: Manage Trac ticket reminders for pull requests
     runs-on: ubuntu-latest
     permissions:
       issues: write
       pull-requests: write
     if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name == 'pull_request_target' && ! github.event.pull_request.draft && github.event.pull_request.state == 'open' }}
     steps:
-      - name: Check for Trac ticket and comment if missing
+      - name: Check for Trac ticket and manage comment
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
@@ -183,11 +183,13 @@ jobs:
             // Check for the presence of a comment and bail early.
             const comments = ( await github.rest.issues.listComments( { owner, repo, issue_number: number } ) ).data;
 
-            const hasMissingTicketComment = comments.some( comment =>
-              comment.user.type === 'Bot' && comment.body.includes( 'Trac Ticket Missing' )
-            );
+            const hasMissingTicketComment = comments.find( comment => comment.user.type === 'Bot' && comment.body.includes( 'Trac Ticket Missing' ) );
 
-            if ( hasMissingTicketComment ) return;
+            if ( hasMissingTicketComment ) {
+              // Trac ticket link found, delete existing "Trac Ticket Missing" comment.
+              await github.rest.issues.deleteComment( { owner, repo, comment_id: hasMissingTicketComment.id } );
+              return;
+            }
 
             // No comment was found. Create one.
             const pr = ( await github.rest.pulls.get( { owner, repo, pull_number: number } ) ).data;

.github/workflows/reusable-performance.yml

@@ -26,6 +26,10 @@ on:
         required: false
         type: 'boolean'
         default: false
+    secrets:
+      CODEVITALS_PROJECT_TOKEN:
+        description: 'The authorization token for https://www.codevitals.run/project/wordpress.'
+        required: true
 
 env:
   PUPPETEER_SKIP_DOWNLOAD: ${{ true }}

.github/workflows/reusable-phpunit-tests-v3.yml

@@ -182,7 +182,7 @@ jobs:
 
       # __fakegroup__ is excluded to force PHPUnit to ignore the <exclude> settings in phpunit.xml.dist.
       - name: Run (Xdebug) tests
-        if: ${{ inputs.php != '8.3' }}
+        if: ${{ inputs.php != '8.4' }}
         continue-on-error: ${{ inputs.allow-errors }}
         run: LOCAL_PHP_XDEBUG=true node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit -v --group xdebug --exclude-group __fakegroup__
 

.github/workflows/upgrade-testing.yml

@@ -43,7 +43,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ 'ubuntu-latest' ]
-        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
+        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' ]
         wp: [ '6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '6.6' ]
@@ -93,7 +93,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ 'ubuntu-latest' ]
-        php: [ '8.0', '8.1', '8.2', '8.3' ]
+        php: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
         db-type: [ 'mysql' ]
         db-version: [ '5.7', '8.0' ]
         wp: [ '5.3', '5.4', '5.5', '5.6', '5.7', '5.8', '5.9' ]
@@ -143,7 +143,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ 'ubuntu-latest' ]
-        php: [ '8.0', '8.1', '8.2', '8.3' ]
+        php: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
         db-type: [ 'mysql' ]
         db-version: [ '5.7', '8.0' ]
         wp: [ '4.1', '4.2', '4.3', '4.4', '4.5' ]

.version-support-php.json

@@ -6,7 +6,8 @@
 		"8.0",
 		"8.1",
 		"8.2",
-		"8.3"
+		"8.3",
+		"8.4"
 	],
 	"6-6": [
 		"7.2",

src/wp-admin/css/edit.css

@@ -1297,7 +1297,7 @@ div.tabs-panel-active:focus {
 	/* Only visible in Windows High Contrast mode */
 	outline: 2px solid transparent;
 }
-
+.options-discussion-php .indent-children ul,
 #front-page-warning,
 #front-static-pages ul,
 ul.export-filters,

src/wp-admin/edit-form-advanced.php

@@ -434,7 +434,7 @@
 
 <?php
 if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) ) {
-	echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
+	echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new_item ) . '</a>';
 }
 ?>
 

src/wp-admin/edit.php

@@ -419,7 +419,7 @@
 
 <?php
 if ( current_user_can( $post_type_object->cap->create_posts ) ) {
-	echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
+	echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new_item ) . '</a>';
 }
 
 if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {