Merge branch '9.5'

Author: sebastianbergmann

ChangeLog-9.5.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 9.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [9.5.18] - 2022-03-08
+
+### Fixed
+
+* [#4877](https://github.com/sebastianbergmann/phpunit/issues/4877): No stack trace shown when an error occurs during bootstrap
+
 ## [9.5.17] - 2022-03-05 - #StandWithUkraine
 
 ## [9.5.16] - 2022-02-23
@@ -136,6 +142,7 @@ All notable changes of the PHPUnit 9.5 release series are documented in this fil
 
 * [#4535](https://github.com/sebastianbergmann/phpunit/issues/4535): `getMockFromWsdl()` does not handle methods that do not have parameters correctly
 
+[9.5.18]: https://github.com/sebastianbergmann/phpunit/compare/9.5.17...9.5.18
 [9.5.17]: https://github.com/sebastianbergmann/phpunit/compare/9.5.16...9.5.17
 [9.5.16]: https://github.com/sebastianbergmann/phpunit/compare/dc738383c519243b0a967f63943a848d3fd861aa...9.5.16
 [9.5.15]: https://github.com/sebastianbergmann/phpunit/compare/9.5.14...dc738383c519243b0a967f63943a848d3fd861aa

src/TextUI/Exception/BootstrapException.php

@@ -28,10 +28,12 @@ public function __construct(Throwable $t)
 
         parent::__construct(
             sprintf(
-                'Error in bootstrap script: %s:%s%s',
+                'Error in bootstrap script: %s:%s%s%s%s',
                 $t::class,
                 PHP_EOL,
-                $t->getMessage()
+                $t->getMessage(),
+                PHP_EOL,
+                $t->getTraceAsString()
             )
         );
     }

tests/end-to-end/regression/GitHub/4620.phpt

@@ -1,5 +1,6 @@
 --TEST--
 https://github.com/sebastianbergmann/phpunit/issues/4620
+https://github.com/sebastianbergmann/phpunit/issues/4877
 --FILE--
 <?php declare(strict_types=1);
 
@@ -17,3 +18,4 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 
 Error in bootstrap script: PHPUnit\TestFixture\MyException:
 Big boom. Big bada boom.
+%a