From 5c7177120e44a4dbc5ec7320bc3ae5755f97e888 Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Sat, 14 Jan 2023 10:29:25 +0100
Subject: [PATCH] Consistently handle test runner warnings and test suite
 warnings

---
 src/TextUI/TestRunner.php                          | 14 +-------------
 .../generic/dataprovider-issue-2922.phpt           |  1 -
 .../generic/filename-matches-class-name.phpt       |  1 -
 tests/end-to-end/generic/test-suffix-multiple.phpt |  1 -
 tests/end-to-end/generic/test-suffix-single.phpt   |  1 -
 .../generic/two-classes-per-file-invalid.phpt      |  1 -
 tests/end-to-end/regression/2972.phpt              |  1 -
 7 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/TextUI/TestRunner.php b/src/TextUI/TestRunner.php
index b0dd9bcc6cd..cab1a35d028 100644
--- a/src/TextUI/TestRunner.php
+++ b/src/TextUI/TestRunner.php
@@ -571,7 +571,7 @@ public function run(TestSuite $suite, array $arguments = [], array $warnings = [
             $warnings[] = 'Directives printerClass and testdox are mutually exclusive';
         }
 
-        foreach ($warnings as $warning) {
+        foreach (array_merge($warnings, $suite->warnings()) as $warning) {
             $this->writeMessage('Warning', $warning);
         }
 
@@ -646,18 +646,6 @@ public function run(TestSuite $suite, array $arguments = [], array $warnings = [
             }
         }
 
-        $testSuiteWarningsPrinted = false;
-
-        foreach ($suite->warnings() as $warning) {
-            $this->writeMessage('Warning', $warning);
-
-            $testSuiteWarningsPrinted = true;
-        }
-
-        if ($testSuiteWarningsPrinted) {
-            $this->write(PHP_EOL);
-        }
-
         $suite->run($result);
 
         foreach ($this->extensions as $extension) {
diff --git a/tests/end-to-end/generic/dataprovider-issue-2922.phpt b/tests/end-to-end/generic/dataprovider-issue-2922.phpt
index d3f6487f665..abb9f7dca9d 100644
--- a/tests/end-to-end/generic/dataprovider-issue-2922.phpt
+++ b/tests/end-to-end/generic/dataprovider-issue-2922.phpt
@@ -12,7 +12,6 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-
 Warning:       Test case class not matching filename is deprecated
                in %sSecondTest.php
                Class name was 'SecondHelloWorldTest', expected 'SecondTest'
diff --git a/tests/end-to-end/generic/filename-matches-class-name.phpt b/tests/end-to-end/generic/filename-matches-class-name.phpt
index a66bfbdb6a0..a617ef4df09 100644
--- a/tests/end-to-end/generic/filename-matches-class-name.phpt
+++ b/tests/end-to-end/generic/filename-matches-class-name.phpt
@@ -13,7 +13,6 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-
 Warning:       Test case class not matching filename is deprecated
                in %sWrongClassNameTest.php
                Class name was 'WrongClassNameBar', expected 'WrongClassNameTest'
diff --git a/tests/end-to-end/generic/test-suffix-multiple.phpt b/tests/end-to-end/generic/test-suffix-multiple.phpt
index d1173ed2c29..5302accc6cd 100644
--- a/tests/end-to-end/generic/test-suffix-multiple.phpt
+++ b/tests/end-to-end/generic/test-suffix-multiple.phpt
@@ -13,7 +13,6 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-
 Warning:       Test case class not matching filename is deprecated
                in %sBankAccountTest.test.php
                Class name was 'BankAccountWithCustomExtensionTest', expected 'BankAccountTest'
diff --git a/tests/end-to-end/generic/test-suffix-single.phpt b/tests/end-to-end/generic/test-suffix-single.phpt
index 64e46365a96..a64d3a9b97c 100644
--- a/tests/end-to-end/generic/test-suffix-single.phpt
+++ b/tests/end-to-end/generic/test-suffix-single.phpt
@@ -13,7 +13,6 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-
 Warning:       Test case class not matching filename is deprecated
                in %sBankAccountTest.test.php
                Class name was 'BankAccountWithCustomExtensionTest', expected 'BankAccountTest'
diff --git a/tests/end-to-end/generic/two-classes-per-file-invalid.phpt b/tests/end-to-end/generic/two-classes-per-file-invalid.phpt
index 0db57999ca9..3534756b7e9 100644
--- a/tests/end-to-end/generic/two-classes-per-file-invalid.phpt
+++ b/tests/end-to-end/generic/two-classes-per-file-invalid.phpt
@@ -13,7 +13,6 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-
 Warning:       Test case class not matching filename is deprecated
                in %sTwoClassesInvalidTest.php
                Class name was 'TwoClassesInvalid', expected 'TwoClassesInvalidTest'
diff --git a/tests/end-to-end/regression/2972.phpt b/tests/end-to-end/regression/2972.phpt
index 5aea92d4d7d..daf1173a381 100644
--- a/tests/end-to-end/regression/2972.phpt
+++ b/tests/end-to-end/regression/2972.phpt
@@ -11,7 +11,6 @@ PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-
 Warning:       Test case class not matching filename is deprecated
                in %sunconventiallyNamedIssue2972Test.php
                Class name was 'Issue2972Test', expected 'unconventiallyNamedIssue2972Test'