Merge branch 'WordPress:trunk' into trunk

Author: dream-encode

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

@@ -92,7 +92,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-24.04 ]
-        memcached: [ false, true ]
+        memcached: [ false ]
         php: ${{ fromJSON( needs.build-test-matrix.outputs.php-versions ) }}
         db-version: ${{ fromJSON( needs.build-test-matrix.outputs.mysql-versions ) }}
 

.github/workflows/performance.yml

@@ -101,7 +101,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        memcached: [ true, false ]
+        memcached: [ false ]
         multisite: [ true, false ]
         subject: ${{ fromJson( needs.determine-matrix.outputs.subjects ) }}
     with:
@@ -119,7 +119,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        memcached: [ true, false ]
+        memcached: [ false ]
         multisite: [ true, false ]
         # A matrix value is needed in the 'name' directive for proper grouping in the GitHub UI.
         label: [ Compare ]

.github/workflows/reusable-end-to-end-tests.yml

@@ -81,6 +81,12 @@ jobs:
           show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
           persist-credentials: false
 
+      - name: Create a Docker override file
+        if: ${{ contains( fromJSON('["8.3", "8.4"]'), inputs.php-version ) }}
+        env:
+          PHP_VERSION: ${{ inputs.php-version }}
+        run: cp "tools/local-env/php-$PHP_VERSION-docker-compose.override.yml" docker-compose.override.yml
+
       - name: Set up Node.js
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:

.github/workflows/reusable-performance-test-v2.yml

@@ -121,6 +121,12 @@ jobs:
           fetch-depth: ${{ github.event_name == 'workflow_dispatch' && '2' || '1' }}
           persist-credentials: false
 
+      - name: Create a Docker override file
+        if: ${{ contains( fromJSON('["8.3", "8.4"]'), inputs.php-version ) }}
+        env:
+          PHP_VERSION: ${{ inputs.php-version }}
+        run: cp "tools/local-env/php-$PHP_VERSION-docker-compose.override.yml" docker-compose.override.yml
+
       - name: Set up Node.js
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:

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

@@ -136,6 +136,12 @@ jobs:
           show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
           persist-credentials: false
 
+      - name: Create a Docker override file
+        if: ${{ contains( fromJSON('["8.3", "8.4"]'), inputs.php ) }}
+        env:
+          PHP_VERSION: ${{ inputs.php }}
+        run: cp "tools/local-env/php-${{ env.PHP_VERSION }}-docker-compose.override.yml" docker-compose.override.yml
+
       - name: Set up Node.js
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:

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

@@ -91,6 +91,12 @@ jobs:
           show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
           persist-credentials: false
 
+      - name: Create a Docker override file
+        if: ${{ contains( fromJSON('["8.3", "8.4"]'), inputs.php ) }}
+        env:
+          PHP_VERSION: ${{ inputs.php }}
+        run: cp "tools/local-env/php-$PHP_VERSION-docker-compose.override.yml" docker-compose.override.yml
+
       - name: Set up Node.js
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:

.gitignore

@@ -50,7 +50,8 @@ wp-tests-config.php
 /src/wp-content/fonts
 /src/wp-content/languages
 /src/wp-content/mu-plugins
-/src/wp-content/plugins
+/src/wp-content/plugins/*
+!/src/wp-content/plugins/hello-dolly
 /src/wp-content/themes/*
 !/src/wp-content/themes/twentyten
 !/src/wp-content/themes/twentyeleven

Gruntfile.js

@@ -28,7 +28,7 @@ module.exports = function(grunt) {
 			'wp-content/themes/index.php',
 			'wp-content/themes/twenty*/**',
 			'wp-content/plugins/index.php',
-			'wp-content/plugins/hello.php',
+			'wp-content/plugins/hello-dolly/**',
 			'wp-content/plugins/akismet/**',
 			'!wp-content/themes/twenty*/node_modules/**',
 		],

src/js/_enqueues/wp/customize/views.js

@@ -37,10 +37,14 @@
 
 		setButtons: function() {
 			var elements = $('#customize-control-header_image .actions .remove');
+			var addButton = $('#customize-control-header_image .actions .new');
+
 			if (this.model.get('choice')) {
 				elements.show();
+				addButton.removeClass('upload-button');
 			} else {
 				elements.hide();
+				addButton.addClass('upload-button');
 			}
 		}
 	});

src/wp-admin/async-upload.php

@@ -60,8 +60,8 @@
 					$title    = $post->post_title ? $post->post_title : wp_basename( $file );
 					?>
 					<div class="filename new">
-						<span class="media-list-title"><strong><?php echo esc_html( wp_html_excerpt( $title, 60, '&hellip;' ) ); ?></strong></span>
-						<span class="media-list-subtitle"><?php echo esc_html( wp_basename( $file ) ); ?></span>
+						<span class="media-list-title word-wrap-break-word"><strong><?php echo esc_html( wp_html_excerpt( $title, 60, '&hellip;' ) ); ?></strong></span>
+						<span class="media-list-subtitle word-wrap-break-word"><?php echo esc_html( wp_basename( $file ) ); ?></span>
 						<div class="attachment-tools">
 							<?php
 							if ( current_user_can( 'edit_post', $id ) ) {