Fix #172: Address review comments

yiisoft · WarLikeLaux · Mar 27, 2026 · Mar 27, 2026 · Mar 27, 2026 · Mar 27, 2026
commit cbb1aa4790b3c0a971f92afdf5c74907d38f8b07
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,8 @@
 - Enh #163: Explicitly import classes, functions, and constants in "use" section (@mspirkov)
 - Bug #164: Fix missing items in stack trace HTML output when handling a PHP error (@vjik)
 - Bug #166: Fix broken link to error handling guide (@vjik)
-- Bug #172: Fix closure rendering in stack traces and keep items when source is unavailable (@WarLikeLaux)
+- Enh #172: Improve closure rendering in stack traces (@WarLikeLaux)
+- Bug #172: Keep items in stack traces when source is unavailable (@WarLikeLaux)
 
 ## 4.3.2 January 09, 2026
 

diff --git a/src/Renderer/HtmlRenderer.php b/src/Renderer/HtmlRenderer.php
@@ -768,12 +768,17 @@ private function renderCallStackItem(
         if ($file !== null && $line !== null) {
             $line--; // adjust line number from one-based to zero-based
             $lines = @file($file);
-            if ($line >= 0 && $lines !== false && ($lineCount = count($lines)) > $line) {
-                $half = (int) (($index === 1 ? $this->maxSourceLines : $this->maxTraceLines) / 2);
-                $begin = $line - $half > 0 ? $line - $half : 0;
-                $end = $line + $half < $lineCount ? $line + $half : $lineCount - 1;
-            } else {
+            if ($line < 0 || $lines === false) {
                 $lines = [];
+            } else {
+                $lineCount = count($lines);
+                if ($line < $lineCount) {
-                if ($line < $lineCount) {
+                if ($line <= $lineCount) {
-                if ($line < $lineCount) {
+                if ($line <= $lineCount) {
+                    $half = (int) (($index === 1 ? $this->maxSourceLines : $this->maxTraceLines) / 2);
+                    $begin = $line - $half > 0 ? $line - $half : 0;
+                    $end = $line + $half < $lineCount ? $line + $half : $lineCount - 1;
+                } else {
+                    $lines = [];
+                }
             }
         }
 

diff --git a/tests/Renderer/HtmlRendererTest.php b/tests/Renderer/HtmlRendererTest.php
@@ -452,6 +452,25 @@ public function testRenderCallStackItemDoesNotRenderSourceCodeWhenLineIsOutsideF
         $this->assertStringNotContainsString('element-code-wrap', $result);
     }
 
+    public function testRenderCallStackItemRendersSourceCodeForLastLineInFile(): void
+    {
+        $line = count(file(__FILE__));
+        $result = $this->invokeMethod(new HtmlRenderer(), 'renderCallStackItem', [
+            'file' => __FILE__,
+            'line' => $line,
+            'class' => null,
+            'function' => null,
+            'args' => [],
+            'index' => 1,
+            'isVendorFile' => false,
+            'reflectionParameters' => [],
+        ]);
+
+        $this->assertStringContainsString(__FILE__, $result);
+        $this->assertStringContainsString('at line ' . $line, $result);
+        $this->assertStringContainsString('element-code-wrap', $result);
+    }
+
     public function testRenderRequest(): void
     {
         $renderer = new HtmlRenderer();
@@ -669,7 +688,7 @@ public static function dataFormatTraceFunctionName(): iterable
     public function testFormatTraceFunctionName(?string $class, string $function, string $expected): void
     {
         $renderer = new HtmlRenderer();
-        $this->assertSame($expected, $renderer->formatTraceFunctionName($class, $function));
+        $this->assertSame($expected, $this->invokeMethod($renderer, 'formatTraceFunctionName', [$class, $function]));
     }
 
     public function testRenderCallStackWithMethodClosure(): void
@@ -685,9 +704,6 @@ public function testRenderCallStackWithMethodClosure(): void
 
         $result = $renderer->renderCallStack($exception, $exception->getTrace());
 
-        $this->assertStringContainsString('{closure}', $result);
-        $this->assertStringNotContainsString(self::class . '::' . $traceItem['function'], $result);
-
         if (PHP_VERSION_ID >= 80400) {
             $this->assertMatchesRegularExpression(
                 '/\{closure\}\s+' . preg_quote(self::class, '/') . '::createMethodClosureException\(\):\d+/',
@@ -720,10 +736,6 @@ public function testRenderCallStackWithBoundClosure(): void
             [],
         ]);
 
-        $this->assertStringContainsString('{closure}', $result);
-        $this->assertStringContainsString('{closure}', $itemResult);
-        $this->assertStringNotContainsString('Closure::{closure}', $itemResult);
-
         if (PHP_VERSION_ID >= 80400) {
             $this->assertMatchesRegularExpression('/\{closure\}\s+.+::createBoundClosureException\(\):\d+/', $result);
             return;
@@ -755,9 +767,6 @@ public function testRenderCallStackWithInternalFunctionClosure(): void
             [],
         ]);
 
-        $this->assertStringContainsString('{closure}', $result);
-        $this->assertStringNotContainsString(self::class . '::' . $traceItem['function'], $result);
-        $this->assertStringContainsString('{closure}', $itemResult);
         $this->assertStringNotContainsString('element-code-wrap', $itemResult);
 
         if (PHP_VERSION_ID >= 80400) {
@@ -804,7 +813,6 @@ public function testRenderCallStackWithFileLevelClosureOnPhp84Plus(): void
         $traceItem = $exception->getTrace()[0];
 
         $this->assertArrayNotHasKey('class', $traceItem);
-        $this->assertStringContainsString('{closure:', $traceItem['function']);
 
         $result = $renderer->renderCallStack($exception, $exception->getTrace());
 
@@ -866,8 +874,7 @@ private function createMethodClosureException(): RuntimeException
             return $e;
         }
 
-        $this->fail('Expected exception from method closure.');
-        throw new RuntimeException('Unreachable.');
+        $this->fail('Method closure did not throw RuntimeException.');
     }
 
     private function createInternalFunctionClosureException(): RuntimeException
@@ -882,8 +889,7 @@ private function createInternalFunctionClosureException(): RuntimeException
             return $e;
         }
 
-        $this->fail('Expected exception from closure called via internal function.');
-        throw new RuntimeException('Unreachable.');
+        $this->fail('Closure called via internal function did not throw RuntimeException.');
     }
 
     private function createBoundClosureException(): RuntimeException
@@ -901,8 +907,7 @@ private function createBoundClosureException(): RuntimeException
             return $e;
         }
 
-        $this->fail('Expected exception from Closure scope closure.');
-        throw new RuntimeException('Unreachable.');
+        $this->fail('Bound closure did not throw RuntimeException.');
     }
 
     private function createTestTemplate(string $path, string $templateContents): void

diff --git a/tests/Support/NamespacedClosureTraceFixture.php b/tests/Support/NamespacedClosureTraceFixture.php
@@ -20,6 +20,6 @@ public static function createException(): RuntimeException
             return $e;
         }
 
-        throw new RuntimeException('Unreachable.');
+        throw new RuntimeException('Namespaced closure did not throw RuntimeException.');
     }
 }
diff --git a/tests/Support/file_level_closure_exception.php b/tests/Support/file_level_closure_exception.php
@@ -12,4 +12,4 @@
     return $e;
 }
 
-throw new RuntimeException('Unreachable.');
+throw new RuntimeException('File-level closure did not throw RuntimeException.');