Also show nested exception where available

flack · Jul 10, 2024 · f269499 · f269499
1 parent 2850f89
commit f269499
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/lib/errors.php b/lib/errors.php
@@ -170,9 +170,10 @@ private function _send_email(string $msg, array $config, string $servername)
         }
     }
 
-    public function get_function_stack()
+    public function get_function_stack(?Throwable $error = null)
     {
-        $stack = $this->error->getTrace();
+        $error = $error ?? $this->error;
+        $stack = $error->getTrace();
 
         $stacktrace = [];
         foreach ($stack as $number => $frame) {

diff --git a/lib/midcom/style/midcom_error.php b/lib/midcom/style/midcom_error.php
@@ -37,7 +37,11 @@
 <?php
 $stacktrace = $this->data['error_handler']->get_function_stack();
 if (!empty($stacktrace)) {
-    echo "<pre>Stacktrace:\n" . implode("\n", $stacktrace) . "</pre>\n";
+    echo "<pre>Stacktrace:\n" . implode("\n", $stacktrace);
+    if ($prev = $this->data['error_exception']->getPrevious()) {
+        echo "\n\nCaused by:\n" . implode("\n", $this->data['error_handler']->get_function_stack($prev));
+    }
+    echo "</pre>\n";
 }
 ?>
 </body>

diff --git a/themes/OpenPsa2/style/midcom_error.php b/themes/OpenPsa2/style/midcom_error.php
@@ -40,6 +40,10 @@
 if (!empty($stacktrace)) {
     echo '<h3>Stacktrace:</h3>';
     echo "<pre>" . implode("\n", $stacktrace) . "</pre>\n";
+    if ($prev = $this->data['error_exception']->getPrevious()) {
+        echo '<h3>Caused by:</h3>';
+        echo "<pre>" . implode("\n", $this->data['error_handler']->get_function_stack($prev)) . "</pre>\n";
+    }
 }
 ?>
   </div>