Merge remote-tracking branch 'upstream/trunk' into trunk

Author: desrosj

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

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

.github/workflows/phpunit-tests.yml

@@ -30,8 +30,10 @@ on:
       - 'Gruntfile.js'
       # These files configure Composer. Changes could affect the outcome.
       - 'composer.*'
-      # This files affect the phpunit tests. Changes could affect the outcome.
+      # These files affect the phpunit tests. Changes could affect the outcome.
       - 'tests/phpunit/**'
+      - 'tests/phpunit/multisite.xml'
+      - 'phpunit.xml.dist'
       # Confirm any changes to relevant workflow files.
       - '.github/workflows/phpunit-tests.yml'
       - '.github/workflows/reusable-phpunit-tests-*.yml'

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

@@ -81,12 +81,6 @@ 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,12 +121,6 @@ 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,12 +136,6 @@ 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,12 +91,6 @@ 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:

phpunit.xml.dist

@@ -6,6 +6,7 @@
 		colors="true"
 		beStrictAboutTestsThatDoNotTestAnything="true"
 		beStrictAboutOutputDuringTests="true"
+		failOnRisky="true"
 		convertErrorsToExceptions="true"
 		convertWarningsToExceptions="true"
 		convertNoticesToExceptions="true"

src/wp-content/themes/twentyeleven/footer.php

@@ -25,7 +25,14 @@
 			?>
 
 			<div id="site-generator">
-				<?php do_action( 'twentyeleven_credits' ); ?>
+				<?php
+				/**
+				 * Fires before the Twenty Eleven footer text for footer customization.
+				 *
+				 * @since Twenty Eleven 1.0
+				 */
+				do_action( 'twentyeleven_credits' );
+				?>
 				<?php
 				if ( function_exists( 'the_privacy_policy_link' ) ) {
 					the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );

src/wp-content/themes/twentyfourteen/footer.php

@@ -18,7 +18,14 @@
 			<?php get_sidebar( 'footer' ); ?>
 
 			<div class="site-info">
-				<?php do_action( 'twentyfourteen_credits' ); ?>
+				<?php
+				/**
+				 * Fires before the Twenty Fourteen footer text for footer customization.
+				 *
+				 * @since Twenty Fourteen 1.0
+				 */
+				do_action( 'twentyfourteen_credits' );
+				?>
 				<?php
 				if ( function_exists( 'the_privacy_policy_link' ) ) {
 					the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );