Merge branch '9.6' into 10.1

sebastianbergmann · May 9, 2023 · b54dec3 · b54dec3
2 parents d45b99c + 71b53ae
commit b54dec3
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/ChangeLog-10.1.md b/ChangeLog-10.1.md
@@ -8,6 +8,10 @@ All notable changes of the PHPUnit 10.1 release series are documented in this fi
 
 * [#5343](https://github.com/sebastianbergmann/phpunit/pull/5343): Provide distinct messages when a test is considered risky due to output buffering level mismatch
 
+### Fixed
+
+* [#5345](https://github.com/sebastianbergmann/phpunit/issues/5345): No stack trace shown for previous exceptions during bootstrap
+
 ## [10.1.2] - 2023-04-22
 
 ### Added

diff --git a/src/TextUI/Application.php b/src/TextUI/Application.php
@@ -290,16 +290,29 @@ private function loadBootstrapScript(string $filename): void
         try {
             include_once $filename;
         } catch (Throwable $t) {
-            $this->exitWithErrorMessage(
-                sprintf(
-                    'Error in bootstrap script: %s:%s%s%s%s',
+            $message = sprintf(
+                'Error in bootstrap script: %s:%s%s%s%s',
+                $t::class,
+                PHP_EOL,
+                $t->getMessage(),
+                PHP_EOL,
+                $t->getTraceAsString()
+            );
+
+            while ($t = $t->getPrevious()) {
+                $message .= sprintf(
+                    '%s%sPrevious error: %s:%s%s%s%s',
+                    PHP_EOL,
+                    PHP_EOL,
                     $t::class,
                     PHP_EOL,
                     $t->getMessage(),
                     PHP_EOL,
-                    $t->getTraceAsString()
-                )
-            );
+                    $t->getTraceAsString(),
+                );
+            }
+
+            $this->exitWithErrorMessage($message);
         }
 
         EventFacade::emitter()->testRunnerBootstrapFinished($filename);

diff --git a/tests/end-to-end/regression/4620.phpt b/tests/end-to-end/regression/4620.phpt
@@ -19,3 +19,7 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 Error in bootstrap script: PHPUnit\TestFixture\MyException:
 Big boom. Big bada boom.
 %a
+
+Previous error: Exception:
+Previous boom.
+%a
diff --git a/tests/end-to-end/regression/4620/bootstrap.php b/tests/end-to-end/regression/4620/bootstrap.php
@@ -15,4 +15,4 @@ final class MyException extends Exception
 {
 }
 
-throw new MyException('Big boom. Big bada boom.');
+throw new MyException('Big boom. Big bada boom.', 0, new Exception('Previous boom.'));