Merge branch '10.5'

Author: sebastianbergmann

.gitignore

@@ -14,7 +14,7 @@
 
 # PHP-CS-Fixer
 /.php-cs-fixer.php
-/.php-cs-fixer.cache
+/.php-cs-fixer.cache*
 
 # Psalm
 /.psalm/cache

.php-cs-fixer.dist.php

@@ -344,4 +344,10 @@
         'whitespace_after_comma_in_array' => true,
     ]);
 
+$branch = @trim((string) @shell_exec('git rev-parse --abbrev-ref HEAD'));
+
+if (!empty($branch)) {
+    $config->setCacheFile(__DIR__ . '/.php-cs-fixer.cache.' . $branch);
+}
+
 return $config;

src/Util/ThrowableToStringMapper.php

@@ -13,6 +13,7 @@
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\PhptAssertionFailedError;
 use PHPUnit\Framework\SelfDescribing;
+use PHPUnit\Runner\ErrorException;
 use Throwable;
 
 /**
@@ -22,6 +23,10 @@
 {
     public static function map(Throwable $t): string
     {
+        if ($t instanceof ErrorException) {
+            return $t->getMessage();
+        }
+
         if ($t instanceof SelfDescribing) {
             $buffer = $t->toString();