Merge branch '12.3'

Author: sebastianbergmann

src/TextUI/Output/TestDox/ResultPrinter.php

@@ -11,7 +11,6 @@
 
 use const PHP_EOL;
 use function array_map;
-use function assert;
 use function explode;
 use function implode;
 use function preg_match;
@@ -177,7 +176,7 @@ private function printTestResultBody(TestDoxTestResult $test): void
         }
 
         $this->printTestResultBodyStart($test);
-        $this->printThrowable($test);
+        $this->printThrowable($test->status(), $test->throwable());
         $this->printTestResultBodyEnd($test);
     }
 
@@ -207,27 +206,23 @@ private function printTestResultBodyEnd(TestDoxTestResult $test): void
         $this->printer->print(PHP_EOL);
     }
 
-    private function printThrowable(TestDoxTestResult $test): void
+    private function printThrowable(TestStatus $status, Throwable $throwable): void
     {
-        $throwable = $test->throwable();
-
-        assert($throwable instanceof Throwable);
-
         $message    = trim($throwable->description());
         $stackTrace = $this->formatStackTrace($throwable->stackTrace());
         $diff       = '';
 
         if ($message !== '' && $this->colors) {
             ['message' => $message, 'diff' => $diff] = $this->colorizeMessageAndDiff(
                 $message,
-                $this->messageColorFor($test->status()),
+                $this->messageColorFor($status),
             );
         }
 
         if ($message !== '') {
             $this->printer->print(
                 $this->prefixLines(
-                    $this->prefixFor('message', $test->status()),
+                    $this->prefixFor('message', $status),
                     $message,
                 ),
             );
@@ -238,24 +233,48 @@ private function printThrowable(TestDoxTestResult $test): void
         if ($diff !== '') {
             $this->printer->print(
                 $this->prefixLines(
-                    $this->prefixFor('diff', $test->status()),
+                    $this->prefixFor('diff', $status),
                     $diff,
                 ),
             );
 
             $this->printer->print(PHP_EOL);
         }
 
-        if ($stackTrace !== '') {
-            if ($message !== '' || $diff !== '') {
-                $prefix = $this->prefixFor('default', $test->status());
+        if (!empty($stackTrace)) {
+            if (!empty($message) || !empty($diff)) {
+                $tracePrefix = $this->prefixFor('default', $status);
             } else {
-                $prefix = $this->prefixFor('trace', $test->status());
+                $tracePrefix = $this->prefixFor('trace', $status);
             }
 
             $this->printer->print(
-                $this->prefixLines($prefix, PHP_EOL . $stackTrace),
+                $this->prefixLines($tracePrefix, PHP_EOL . $stackTrace),
+            );
+        }
+
+        if ($throwable->hasPrevious()) {
+            $this->printer->print(PHP_EOL);
+
+            $this->printer->print(
+                $this->prefixLines(
+                    $this->prefixFor('default', $status),
+                    ' ',
+                ),
+            );
+
+            $this->printer->print(PHP_EOL);
+
+            $this->printer->print(
+                $this->prefixLines(
+                    $this->prefixFor('default', $status),
+                    'Caused by:',
+                ),
             );
+
+            $this->printer->print(PHP_EOL);
+
+            $this->printThrowable($status, $throwable->previous());
         }
     }
 

tests/end-to-end/logging/_files/ThrowsWithPreviousExceptionTest.php

@@ -0,0 +1,24 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture;
+
+use Exception;
+use PHPUnit\Framework\TestCase;
+
+class ThrowsWithPreviousExceptionTest extends TestCase
+{
+    public function testFoo(): void
+    {
+        throw new Exception(
+            'Outer',
+            previous: new Exception('Inner'),
+        );
+    }
+}

tests/end-to-end/logging/testdox/testdox-print-previous-exception-colorized.phpt

@@ -0,0 +1,41 @@
+--TEST--
+https://github.com/sebastianbergmann/phpunit/issues/5863
+--SKIPIF--
+<?php declare(strict_types=1);
+if (stripos(\PHP_OS, 'WIN') === 0) {
+    print 'skip: Colorized diff is different on Windows.';
+}
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--display-errors';
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--no-progress';
+$_SERVER['argv'][] = '--testdox';
+$_SERVER['argv'][] = '--colors=always';
+$_SERVER['argv'][] =  __DIR__ . '/../_files/ThrowsWithPreviousExceptionTest.php';
+
+require_once __DIR__ . '/../../../bootstrap.php';
+
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime:       PHP %s
+
+Time: %s, Memory: %s
+
+Throws With Previous Exception (PHPUnit\TestFixture\ThrowsWithPreviousException)
+ ✘ Foo
+   ┐
+   ├ Exception: Outer
+   │
+   │ %sThrowsWithPreviousExceptionTest.php:%d%A
+   │ Caused by:
+   ├ Exception: Inner
+   │
+   │ %sThrowsWithPreviousExceptionTest.php:%d%A
+   ┴
+
+ERRORS!
+Tests: 1, Assertions: 0, Errors: 1.

tests/end-to-end/logging/testdox/testdox-print-previous-exception.phpt

@@ -0,0 +1,37 @@
+--TEST--
+https://github.com/sebastianbergmann/phpunit/issues/5863
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--display-errors';
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--testdox';
+$_SERVER['argv'][] =  __DIR__ . '/../_files/ThrowsWithPreviousExceptionTest.php';
+
+require_once __DIR__ . '/../../../bootstrap.php';
+
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime:       PHP %s
+
+E                                                                   1 / 1 (100%)
+
+Time: %s, Memory: %s
+
+Throws With Previous Exception (PHPUnit\TestFixture\ThrowsWithPreviousException)
+ ✘ Foo
+   │
+   │ Exception: Outer
+   │
+   │ %sThrowsWithPreviousExceptionTest.php:%d
+   │  
+   │ Caused by:
+   │ Exception: Inner
+   │
+   │ %sThrowsWithPreviousExceptionTest.php:%d
+   │
+
+ERRORS!
+Tests: 1, Assertions: 0, Errors: 1.