Refactor

sebastianbergmann · Dec 5, 2019 · f40603d · f40603d
1 parent 03dc427
commit f40603d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/src/TextUI/Command.php b/src/TextUI/Command.php
@@ -53,6 +53,7 @@ class Command
         'useDefaultConfiguration' => true,
         'loadedExtensions'        => [],
         'notLoadedExtensions'     => [],
+        'warnings'                => [],
     ];
 
     /**
@@ -782,9 +783,8 @@ protected function handleArguments(array $argv): void
         if (isset($this->options[1][0]) &&
             \substr($this->options[1][0], -5, 5) !== '.phpt' &&
             \substr($this->options[1][0], -4, 4) !== '.php' &&
-            \substr($this->options[1][0], -1, 1) !== '/'
-        ) {
-            print 'Warning: Calling PHPUnit with a class name is deprecated and will be removed in PHPUnit 9.' . \PHP_EOL;
+            \substr($this->options[1][0], -1, 1) !== '/') {
+            $this->arguments['warnings'][] = 'Invocation with class name is deprecated';
         }
 
         if (!isset($this->arguments['test'])) {

diff --git a/src/TextUI/TestRunner.php b/src/TextUI/TestRunner.php
@@ -331,6 +331,10 @@ public function doRun(Test $suite, array $arguments = [], bool $exit = true): Te
             }
         }
 
+        foreach ($arguments['warnings'] as $warning) {
+            $this->writeMessage('Warning', $warning);
+        }
+
         if ($arguments['executionOrder'] === TestSuiteSorter::ORDER_RANDOMIZED) {
             $this->writeMessage(
                 'Random seed',

diff --git a/tests/end-to-end/abstract-test-class.phpt b/tests/end-to-end/abstract-test-class.phpt
@@ -9,9 +9,10 @@ $_SERVER['argv'][3] = __DIR__ . '/../_files/AbstractTest.php';
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-Warning: Calling PHPUnit with a class name is deprecated and will be removed in PHPUnit 9.
 PHPUnit %s by Sebastian Bergmann and contributors.
 
+Warning:       Invocation with class name is deprecated
+
 W                                                                   1 / 1 (100%)
 
 Time: %s, Memory: %s

diff --git a/tests/end-to-end/cli/deprecation-warning-with-class.phpt b/tests/end-to-end/cli/deprecation-warning-with-class.phpt
@@ -9,9 +9,10 @@ $_SERVER['argv'][3] = __DIR__ . '/../../_files/DummyFooTest.php';
 require __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-Warning: Calling PHPUnit with a class name is deprecated and will be removed in PHPUnit 9.
 PHPUnit %s by Sebastian Bergmann and contributors.
 
+Warning:       Invocation with class name is deprecated
+
 .                                                                   1 / 1 (100%)
 
 Time: %s, Memory: %s

diff --git a/tests/end-to-end/regression/GitHub/3904.phpt b/tests/end-to-end/regression/GitHub/3904.phpt
@@ -10,9 +10,10 @@ require __DIR__ . '/../../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-Warning: Calling PHPUnit with a class name is deprecated and will be removed in PHPUnit 9.
 PHPUnit %s by Sebastian Bergmann and contributors.
 
+Warning:       Invocation with class name is deprecated
+
 .                                                                   1 / 1 (100%)
 
 Time: %s, Memory: %s

diff --git a/tests/end-to-end/regression/GitHub/3904_2.phpt b/tests/end-to-end/regression/GitHub/3904_2.phpt
@@ -15,5 +15,4 @@ try {
 }
 ?>
 --EXPECTF--
-Warning: Calling PHPUnit with a class name is deprecated and will be removed in PHPUnit 9.
 Class 'Issue3904' could not be found in '%s'.