Merge branch '8.5' into 9.5

Author: sebastianbergmann

src/TextUI/TestRunner.php

@@ -331,8 +331,8 @@ public function run(TestSuite $suite, array $arguments = [], array $warnings = [
                 'PHPUnit ' .
                 Version::id() .
                 ' ' .
-                Color::colorize('fg-cyan', '#StandWith') .
-                Color::colorize('fg-yellow', 'Ukraine') .
+                Color::colorize('bg-blue', '#StandWith') .
+                Color::colorize('bg-yellow', 'Ukraine') .
                 "\n"
             );
         } else {

tests/end-to-end/cli/options-after-arguments.phpt

@@ -11,7 +11,7 @@ require_once __DIR__ . '/../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s [36m#StandWith[0m[33mUkraine[0m
+PHPUnit %s [44m#StandWith[0m[43mUkraine[0m
 
 ...                                                                 3 / 3 (100%)
 

tests/end-to-end/loggers/_files/raw_output_ColorTest.txt

@@ -1,4 +1,4 @@
-PHPUnit %s #StandWithUkraine
+PHPUnit %s #StandWithUkraine
 
 Runtime:       %s
 

tests/end-to-end/loggers/_files/raw_output_StatusTest.txt

@@ -1,4 +1,4 @@
-PHPUnit %s #StandWithUkraine
+PHPUnit %s #StandWithUkraine
 
 Runtime:       %s
 Configuration: %stests%ebasic%econfiguration.basic.xml

tests/end-to-end/standardtestsuiteloader-issue-4192-1.phpt

@@ -9,7 +9,7 @@ $cmd->run([
     (new \ReflectionClass(\ConcreteTest::class))->getFileName()
 ], false);
 --EXPECTF--
-PHPUnit %s [36m#StandWith[0m[33mUkraine[0m
+PHPUnit %s [44m#StandWith[0m[43mUkraine[0m
 
 Runtime:       PHP %s
 Configuration: %s

tests/end-to-end/standardtestsuiteloader-issue-4192-2.phpt

@@ -9,7 +9,7 @@ $cmd->run([
     realpath(__DIR__.'/../_files/ConcreteTest.php')
 ], false);
 --EXPECTF--
-PHPUnit %s [36m#StandWith[0m[33mUkraine[0m
+PHPUnit %s [44m#StandWith[0m[43mUkraine[0m
 
 Runtime:       PHP %s
 Configuration: %s