Merge branch '8.5' into 9.5

Author: sebastianbergmann

src/Runner/Version.php

@@ -60,6 +60,6 @@ public static function series(): string
 
     public static function getVersionString(): string
     {
-        return 'PHPUnit ' . self::id() . ' by Sebastian Bergmann and contributors.';
+        return 'PHPUnit ' . self::id() . ' #StandWithUkraine';
     }
 }

src/TextUI/TestRunner.php

@@ -54,6 +54,7 @@
 use PHPUnit\TextUI\XmlConfiguration\Configuration;
 use PHPUnit\TextUI\XmlConfiguration\Loader;
 use PHPUnit\TextUI\XmlConfiguration\PhpHandler;
+use PHPUnit\Util\Color;
 use PHPUnit\Util\Filesystem;
 use PHPUnit\Util\Log\JUnit;
 use PHPUnit\Util\Log\TeamCity;
@@ -325,9 +326,18 @@ public function run(TestSuite $suite, array $arguments = [], array $warnings = [
             $this->printer->setShowProgressAnimation(!$arguments['noInteraction']);
         }
 
-        $this->printer->write(
-            Version::getVersionString() . "\n"
-        );
+        if ($arguments['colors'] !== DefaultResultPrinter::COLOR_NEVER) {
+            $this->write(
+                'PHPUnit ' .
+                Version::id() .
+                ' ' .
+                Color::colorize('fg-cyan', '#StandWith') .
+                Color::colorize('fg-yellow', 'Ukraine') .
+                "\n"
+            );
+        } else {
+            $this->write(Version::getVersionString() . "\n");
+        }
 
         foreach ($arguments['listeners'] as $listener) {
             $result->addListener($listener);
@@ -614,7 +624,7 @@ public function run(TestSuite $suite, array $arguments = [], array $warnings = [
             exit(self::SUCCESS_EXIT);
         }
 
-        $this->printer->write("\n");
+        $this->write("\n");
 
         if (isset($codeCoverage)) {
             $result->setCodeCoverage($codeCoverage);
@@ -1239,7 +1249,7 @@ private function createPrinter(string $class, array $arguments): ResultPrinter
 
     private function codeCoverageGenerationStart(string $format): void
     {
-        $this->printer->write(
+        $this->write(
             sprintf(
                 "\nGenerating code coverage report in %s format ... ",
                 $format
@@ -1251,7 +1261,7 @@ private function codeCoverageGenerationStart(string $format): void
 
     private function codeCoverageGenerationSucceeded(): void
     {
-        $this->printer->write(
+        $this->write(
             sprintf(
                 "done [%s]\n",
                 $this->timer->stop()->asString()
@@ -1261,7 +1271,7 @@ private function codeCoverageGenerationSucceeded(): void
 
     private function codeCoverageGenerationFailed(\Exception $e): void
     {
-        $this->printer->write(
+        $this->write(
             sprintf(
                 "failed [%s]\n%s\n",
                 $this->timer->stop()->asString(),

tests/end-to-end/assertion.phpt

@@ -18,7 +18,7 @@ $_SERVER['argv'][] = __DIR__ . '/../_files/AssertionExampleTest.php';
 require_once __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 F                                                                   1 / 1 (100%)
 

tests/end-to-end/cli/_files/output-cli-usage.txt

@@ -1,4 +1,4 @@
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 Usage:
   phpunit [options] UnitTest.php

tests/end-to-end/cli/bootstrap-not-found.phpt

@@ -7,6 +7,6 @@ Test fail on missing bootstrap
 require_once __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 Cannot open file "nonExistingBootstrap.php".

tests/end-to-end/cli/columns-max.phpt

@@ -10,7 +10,7 @@ $_SERVER['argv'][] = __DIR__ . '/../../_files/BankAccountTest.php';
 require_once __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 ...                                                                 3 / 3 (100%)
 

tests/end-to-end/cli/columns.phpt

@@ -10,7 +10,7 @@ $_SERVER['argv'][] = __DIR__ . '/../../_files/BankAccountTest.php';
 require_once __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 ...                         3 / 3 (100%)
 

tests/end-to-end/cli/generate-configuration.phpt

@@ -15,7 +15,7 @@ require_once __DIR__ . '/../../bootstrap.php';
 chdir(sys_get_temp_dir());
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 Generating phpunit.xml in %s
 

tests/end-to-end/cli/mycommand.phpt

@@ -14,7 +14,7 @@ require_once __DIR__ . '/_files/MyCommand.php';
 MyCommand::main();
 --EXPECTF--
 MyCommand::myHandler 123
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 ...                                                                 3 / 3 (100%)
 

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 by Sebastian Bergmann and contributors.
+PHPUnit %s [36m#StandWith[0m[33mUkraine[0m
 
 ...                                                                 3 / 3 (100%)