Merge branch '8.0'

sebastianbergmann · Mar 15, 2019 · 430c22f · 430c22f
2 parents ffbbd97 + 7abef86
commit 430c22f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/ChangeLog-8.0.md b/ChangeLog-8.0.md
@@ -11,6 +11,7 @@ All notable changes of the PHPUnit 8.0 release series are documented in this fil
 * Fixed [#3539](https://github.com/sebastianbergmann/phpunit/issues/3539): Wrong default value for `resolveDependencies` in `phpunit.xsd`
 * Fixed [#3550](https://github.com/sebastianbergmann/phpunit/issues/3550): Check for valid attribute names in `assertObjectHasAttribute()` is too strict
 * Fixed [#3555](https://github.com/sebastianbergmann/phpunit/issues/3555): Extension loader only allows objects that implement `TestHook` but should also allow `Hook`
+* Fixed [#3560](https://github.com/sebastianbergmann/phpunit/issues/3560): TestDox does not work when tests are filtered
 
 ## [8.0.4] - 2019-02-18
 

diff --git a/src/Util/TestDox/TestDoxPrinter.php b/src/Util/TestDox/TestDoxPrinter.php
@@ -179,7 +179,7 @@ public function writeProgress(string $progress): void
 
     public function flush(): void
     {
-        $this->flushOutputBuffer();
+        $this->flushOutputBuffer(true);
     }
 
     /**
@@ -232,7 +232,7 @@ protected function testHasPassed(): bool
         return false;
     }
 
-    protected function flushOutputBuffer(): void
+    protected function flushOutputBuffer(bool $forceFlush = false): void
     {
         if ($this->testFlushIndex === $this->testIndex) {
             return;
@@ -254,7 +254,7 @@ protected function flushOutputBuffer(): void
             do {
                 $flushed = false;
 
-                if (isset($this->originalExecutionOrder[$this->testFlushIndex])) {
+                if (!$forceFlush && isset($this->originalExecutionOrder[$this->testFlushIndex])) {
                     $result  = $this->getTestResultByName($this->originalExecutionOrder[$this->testFlushIndex]);
                 } else {
                     // This test(name) cannot found in original execution order,

diff --git a/tests/end-to-end/loggers/testdox-force-flush.phpt b/tests/end-to-end/loggers/testdox-force-flush.phpt
@@ -0,0 +1,25 @@
+--TEST--
+phpunit --testdox --colors=never -c tests/basic/configuration.basic.xml --filter Success
+--FILE--
+<?php declare(strict_types=1);
+$arguments = [
+    '-c',
+    realpath(__DIR__ . '/../../basic/configuration.basic.xml'),
+    '--testdox',
+    '--colors=never',
+    '--filter', 'Success'
+];
+\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit\TextUI\Command::main();
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Test result status with and without message
+ ✔ Success
+ ✔ Success with message
+
+Time: %s, Memory: %s
+
+OK (2 tests, 2 assertions)