improve backtrace

rodber · rodber · commit 704c4b3ba78f · 2024-06-20T08:45:23.000-04:00
diff --git a/demo/backtrace.php b/demo/backtrace.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of Chevere.
+ *
+ * (c) Rodolfo Berrios <rodolfo@chevere.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+require_once 'autoload.php';
+
+xr('BACKTRACE', f: XR_BACKTRACE);
+
+include __DIR__ . '/traces/a.php';
diff --git a/demo/traces/a.php b/demo/traces/a.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of Chevere.
+ *
+ * (c) Rodolfo Berrios <rodolfo@chevere.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+xr('A', f: XR_BACKTRACE);
+
+include __DIR__ . '/b.php';
diff --git a/demo/traces/b.php b/demo/traces/b.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of Chevere.
+ *
+ * (c) Rodolfo Berrios <rodolfo@chevere.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+xr('B', f: XR_BACKTRACE);
+
+include __DIR__ . '/c.php';
diff --git a/demo/traces/c.php b/demo/traces/c.php
@@ -0,0 +1,14 @@
+<?php
+
+/*
+ * This file is part of Chevere.
+ *
+ * (c) Rodolfo Berrios <rodolfo@chevere.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+xr('C', f: XR_BACKTRACE);
diff --git a/src/Message.php b/src/Message.php
@@ -204,8 +204,9 @@ private function handleBacktrace(): void
             $this->backtrace,
             new ThrowableHandlerHtmlFormat()
         );
+        $count = count($trace->toArray());
         $this->body .= <<<HTML
-        <div class="xrdebug-backtrace">{$trace->__toString()}</div>
+        <div class="xrdebug-backtrace" data-count="{$count}">{$trace->__toString()}</div>
         HTML;
     }
 }
diff --git a/tests/MessageTest.php b/tests/MessageTest.php
@@ -172,7 +172,7 @@ public function testWithBacktraceFlag(): void
         $withBacktraceFlag = $message->withFlags(XR_BACKTRACE);
         $this->assertNotSame($message, $withBacktraceFlag);
         $this->assertTrue($withBacktraceFlag->isEnableBacktrace());
-        $expected = $body . '<div class="xrdebug-backtrace">';
+        $expected = $body . '<div class="xrdebug-backtrace" data-count="13">';
         $this->assertStringContainsString(
             $expected,
             $withBacktraceFlag->toArray()['body']
diff --git a/tests/ThrowableParserTest.php b/tests/ThrowableParserTest.php
@@ -88,7 +88,7 @@ public function testWithPrevious(): void
         $body = strip_tags($parser->body());
         $this->assertStringContainsString(
             <<<PLAIN
-            #0 {$file}:{$line}
+            0 {$file}:{$line}
             {main}()
             PLAIN,
             $body

Original file line number	Diff line number	Diff line change
`@@ -204,8 +204,9 @@ private function handleBacktrace(): void`
`204`	`204`	`$this->backtrace,`
`205`	`205`	`new ThrowableHandlerHtmlFormat()`
`206`	`206`	`);`
	`207`	`+ $count = count($trace->toArray());`
`207`	`208`	`$this->body .= <<<HTML`
`208`		`- <div class="xrdebug-backtrace">{$trace->__toString()}</div>`
	`209`	`+ <div class="xrdebug-backtrace" data-count="{$count}">{$trace->__toString()}</div>`
`209`	`210`	`HTML;`
`210`	`211`	`}`
`211`	`212`	`}`