From e1a2057eb54eea11a1b4d8654de7a3ed0efeb9e7 Mon Sep 17 00:00:00 2001
From: John Blackbourn <john@johnblackbourn.com>
Date: Fri, 5 Sep 2025 13:17:35 +0100
Subject: [PATCH 1/4] Configure PHPUNit to fail on risky tests.

---
 phpunit.xml.dist | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index ddbe4bd080ce1..4b5b0d3ded110 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -6,6 +6,7 @@
 		colors="true"
 		beStrictAboutTestsThatDoNotTestAnything="true"
 		beStrictAboutOutputDuringTests="true"
+		failOnRisky="true"
 		convertErrorsToExceptions="true"
 		convertWarningsToExceptions="true"
 		convertNoticesToExceptions="true"

From 720d5e81290799d8d0c2ffab20d40bb0d6390881 Mon Sep 17 00:00:00 2001
From: John Blackbourn <john@johnblackbourn.com>
Date: Fri, 5 Sep 2025 13:28:33 +0100
Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=AB=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/phpunit-tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
index 420506d42265c..28dca21956c69 100644
--- a/.github/workflows/phpunit-tests.yml
+++ b/.github/workflows/phpunit-tests.yml
@@ -32,6 +32,7 @@ on:
       - 'composer.*'
       # This files affect the phpunit tests. Changes could affect the outcome.
       - 'tests/phpunit/**'
+      - 'phpunit.xml.dist'
       # Confirm any changes to relevant workflow files.
       - '.github/workflows/phpunit-tests.yml'
       - '.github/workflows/reusable-phpunit-tests-*.yml'

From 087a78e51de0e6fec532e454b80f098c14f16d94 Mon Sep 17 00:00:00 2001
From: John Blackbourn <john@johnblackbourn.com>
Date: Sat, 13 Sep 2025 12:48:56 +0100
Subject: [PATCH 3/4] Docs.

---
 .github/workflows/end-to-end-tests.yml | 2 +-
 .github/workflows/performance.yml      | 2 +-
 .github/workflows/phpunit-tests.yml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/end-to-end-tests.yml b/.github/workflows/end-to-end-tests.yml
index b7d60a1567920..1900c5391b7d9 100644
--- a/.github/workflows/end-to-end-tests.yml
+++ b/.github/workflows/end-to-end-tests.yml
@@ -31,7 +31,7 @@ on:
       - 'tools/webpack/**'
       # These files configure Composer. Changes could affect the outcome.
       - 'composer.*'
-      # This files affect the e2e tests. Changes could affect the outcome.
+      # These files affect the e2e tests. Changes could affect the outcome.
       - 'tests/e2e/**'
       # Confirm any changes to relevant workflow files.
       - '.github/workflows/end-to-end-tests.yml'
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index 2db92975d7b28..83006c96ff17e 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -30,7 +30,7 @@ on:
       - 'tools/webpack/**'
       # These files configure Composer. Changes could affect the outcome.
       - 'composer.*'
-      # This files affect the performance tests. Changes could affect the outcome.
+      # These files affect the performance tests. Changes could affect the outcome.
       - 'tests/performance/**'
       # Confirm any changes to relevant workflow files.
       - '.github/workflows/performance.yml'
diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
index 28dca21956c69..75389705a1222 100644
--- a/.github/workflows/phpunit-tests.yml
+++ b/.github/workflows/phpunit-tests.yml
@@ -30,7 +30,7 @@ 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/**'
       - 'phpunit.xml.dist'
       # Confirm any changes to relevant workflow files.

From 19104a57a524d4ce53b6c00f0cc9bc8b9657b704 Mon Sep 17 00:00:00 2001
From: John Blackbourn <john@johnblackbourn.com>
Date: Sat, 13 Sep 2025 15:19:18 +0100
Subject: [PATCH 4/4] Instruct phpunit to fail risky multisite tests too.

---
 tests/phpunit/multisite.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/phpunit/multisite.xml b/tests/phpunit/multisite.xml
index 00154eb0170b0..b9b2231dab94d 100644
--- a/tests/phpunit/multisite.xml
+++ b/tests/phpunit/multisite.xml
@@ -6,6 +6,7 @@
 		colors="true"
 		beStrictAboutTestsThatDoNotTestAnything="true"
 		beStrictAboutOutputDuringTests="true"
+		failOnRisky="true"
 		convertErrorsToExceptions="true"
 		convertWarningsToExceptions="true"
 		convertNoticesToExceptions="true"