Merge branch '8.5' into 9.5

sebastianbergmann · Mar 5, 2022 · 5d9d3aa · 5d9d3aa
2 parents 5ff8c54 + 4634e70
commit 5d9d3aa
Show file tree

Hide file tree

Showing 202 changed files with 218 additions and 208 deletions.
diff --git a/src/Runner/Version.php b/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';
     }
 }
diff --git a/src/TextUI/TestRunner.php b/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(),

diff --git a/tests/end-to-end/assertion.phpt b/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%)
 

diff --git a/tests/end-to-end/cli/_files/output-cli-usage.txt b/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

diff --git a/tests/end-to-end/cli/bootstrap-not-found.phpt b/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".
diff --git a/tests/end-to-end/cli/columns-max.phpt b/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%)
 

diff --git a/tests/end-to-end/cli/columns.phpt b/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%)
 

diff --git a/tests/end-to-end/cli/generate-configuration.phpt b/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
 

diff --git a/tests/end-to-end/cli/mycommand.phpt b/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%)
 

diff --git a/tests/end-to-end/cli/options-after-arguments.phpt b/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%)
 

diff --git a/tests/end-to-end/cli/test-file-not-found.phpt b/tests/end-to-end/cli/test-file-not-found.phpt
@@ -7,6 +7,6 @@ Test incorrect testFile is reported
 require_once __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 Cannot open file "nonExistingFile.php".
diff --git a/tests/end-to-end/concrete-test-class.phpt b/tests/end-to-end/concrete-test-class.phpt
@@ -9,7 +9,7 @@ $_SERVER['argv'][] = __DIR__ . '/../_files/ConcreteTest.php';
 require_once __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 ..                                                                  2 / 2 (100%)
 

diff --git a/tests/end-to-end/coverage-annotation-based-filter/covers-annotation-based-filter.phpt b/tests/end-to-end/coverage-annotation-based-filter/covers-annotation-based-filter.phpt
@@ -13,7 +13,7 @@ require_once __DIR__ . '/../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 Test 'PHPUnit\TestFixture\AnnotationFilterTest::testOne' started
 Test 'PHPUnit\TestFixture\AnnotationFilterTest::testOne' ended

diff --git a/tests/end-to-end/coverage-annotation-based-filter/uses-annotation-based-filter.phpt b/tests/end-to-end/coverage-annotation-based-filter/uses-annotation-based-filter.phpt
@@ -13,7 +13,7 @@ require_once __DIR__ . '/../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 Test 'PHPUnit\TestFixture\AnnotationFilterTest::testTwo' started
 Test 'PHPUnit\TestFixture\AnnotationFilterTest::testTwo' ended

diff --git a/tests/end-to-end/dataprovider-issue-2833.phpt b/tests/end-to-end/dataprovider-issue-2833.phpt
@@ -9,7 +9,7 @@ $_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderIssue2833/';
 require_once __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 ..                                                                  2 / 2 (100%)
 

diff --git a/tests/end-to-end/dataprovider-issue-2859.phpt b/tests/end-to-end/dataprovider-issue-2859.phpt
@@ -9,7 +9,7 @@ $_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderIssue2859/phpunit.xml';
 require_once __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 .                                                                   1 / 1 (100%)
 

diff --git a/tests/end-to-end/dataprovider-issue-2922.phpt b/tests/end-to-end/dataprovider-issue-2922.phpt
@@ -10,7 +10,7 @@ $_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderIssue2922/';
 require_once __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 
 Warning:       Test case class not matching filename is deprecated

diff --git a/tests/end-to-end/dataprovider-log-xml-isolation.phpt b/tests/end-to-end/dataprovider-log-xml-isolation.phpt
@@ -12,7 +12,7 @@ $_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderTest.php';
 require_once __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 ..F.                                                                4 / 4 (100%)<?xml version="1.0" encoding="UTF-8"?>
 <testsuites>

diff --git a/tests/end-to-end/dataprovider-log-xml.phpt b/tests/end-to-end/dataprovider-log-xml.phpt
@@ -11,7 +11,7 @@ $_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderTest.php';
 require_once __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 ..F.                                                                4 / 4 (100%)<?xml version="1.0" encoding="UTF-8"?>
 <testsuites>

diff --git a/tests/end-to-end/default-isolation.phpt b/tests/end-to-end/default-isolation.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%)
 

diff --git a/tests/end-to-end/default.phpt b/tests/end-to-end/default.phpt
@@ -9,7 +9,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%)
 

diff --git a/tests/end-to-end/defaulttestsuite-using-testsuite.phpt b/tests/end-to-end/defaulttestsuite-using-testsuite.phpt
@@ -12,7 +12,7 @@ $_SERVER['argv'][] = 'First';
 require_once __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 Dummy Foo (PHPUnit\TestFixture\DummyFoo)
  ✔ Foo equals foo

diff --git a/tests/end-to-end/defaulttestsuite.phpt b/tests/end-to-end/defaulttestsuite.phpt
@@ -10,7 +10,7 @@ $_SERVER['argv'][] = __DIR__.'/../_files/configuration.defaulttestsuite.xml';
 require_once __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 Dummy Bar (PHPUnit\TestFixture\DummyBar)
  ✔ Bar equals bar

diff --git a/tests/end-to-end/dump-xdebug-filter.phpt b/tests/end-to-end/dump-xdebug-filter.phpt
@@ -16,7 +16,7 @@ $_SERVER['argv'][] = 'php://stderr';
 require_once __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 Please note that --dump-xdebug-filter and --prepend are deprecated and will be removed in PHPUnit 10.
 <?php declare(strict_types=1);

diff --git a/tests/end-to-end/empty-testcase.phpt b/tests/end-to-end/empty-testcase.phpt
@@ -9,7 +9,7 @@ $_SERVER['argv'][] = __DIR__ . '/../_files/EmptyTestCaseTest.php';
 require_once __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 W                                                                   1 / 1 (100%)
 

diff --git a/tests/end-to-end/exception-stack.phpt b/tests/end-to-end/exception-stack.phpt
@@ -9,7 +9,7 @@ $_SERVER['argv'][] = __DIR__ . '/../_files/ExceptionStackTest.php';
 require_once __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 EE                                                                  2 / 2 (100%)
 

diff --git a/tests/end-to-end/exclude-group-isolation.phpt b/tests/end-to-end/exclude-group-isolation.phpt
@@ -12,7 +12,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
 
 ..                                                                  2 / 2 (100%)
 

diff --git a/tests/end-to-end/exclude-group.phpt b/tests/end-to-end/exclude-group.phpt
@@ -11,7 +11,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
 
 ..                                                                  2 / 2 (100%)
 

diff --git a/tests/end-to-end/execution-order/cache-result.phpt b/tests/end-to-end/execution-order/cache-result.phpt
@@ -18,7 +18,7 @@ PHPUnit\TextUI\Command::main(false);
 
 print file_get_contents($target);
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 .SS..                                                               5 / 5 (100%)
 

diff --git a/tests/end-to-end/execution-order/defects-first-order-via-cli.phpt b/tests/end-to-end/execution-order/defects-first-order-via-cli.phpt
@@ -18,7 +18,7 @@ require_once __DIR__ . '/../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 Test 'MultiDependencyTest::testFive' started
 Test 'MultiDependencyTest::testFive' ended

diff --git a/tests/end-to-end/execution-order/dependencies-clone.phpt b/tests/end-to-end/execution-order/dependencies-clone.phpt
@@ -11,7 +11,7 @@ require_once __DIR__ . '/../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 Runtime:       %s
 

diff --git a/tests/end-to-end/execution-order/dependencies-isolation.phpt b/tests/end-to-end/execution-order/dependencies-isolation.phpt
@@ -12,7 +12,7 @@ require_once __DIR__ . '/../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 Runtime:       %s
 

diff --git a/tests/end-to-end/execution-order/depends-as-parameter-with-isolation.phpt b/tests/end-to-end/execution-order/depends-as-parameter-with-isolation.phpt
@@ -11,7 +11,7 @@ require_once __DIR__ . '/../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 ..                                                                  2 / 2 (100%)
 

diff --git a/tests/end-to-end/execution-order/depends-as-parameter.phpt b/tests/end-to-end/execution-order/depends-as-parameter.phpt
@@ -10,7 +10,7 @@ require_once __DIR__ . '/../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 ..                                                                  2 / 2 (100%)
 

diff --git a/tests/end-to-end/execution-order/depends-multiple-parameter-with-isolation.phpt b/tests/end-to-end/execution-order/depends-multiple-parameter-with-isolation.phpt
@@ -11,7 +11,7 @@ require_once __DIR__ . '/../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 .....                                                               5 / 5 (100%)
 

diff --git a/tests/end-to-end/execution-order/depends-multiple-parameters.phpt b/tests/end-to-end/execution-order/depends-multiple-parameters.phpt
@@ -10,7 +10,7 @@ require_once __DIR__ . '/../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 .....                                                               5 / 5 (100%)
 

diff --git a/tests/end-to-end/execution-order/depends-on-class.phpt b/tests/end-to-end/execution-order/depends-on-class.phpt
@@ -11,7 +11,7 @@ require_once __DIR__ . '/../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 Runtime:       %s
 Configuration: %s%etests%e_files%econfiguration.depends-on-class.xml

diff --git a/tests/end-to-end/execution-order/execution-order-options-via-config.phpt b/tests/end-to-end/execution-order/execution-order-options-via-config.phpt
@@ -12,7 +12,7 @@ require_once __DIR__ . '/../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
+PHPUnit %s #StandWithUkraine
 
 Test 'MultiDependencyTest::testFive' started
 Test 'MultiDependencyTest::testFive' ended