refactor: minor cleanup

Author: innocenzi

composer.json

@@ -270,7 +270,8 @@
             "./bin/validate-packages",
             "./tempest discovery:clear --no-interaction",
             "composer phpunit",
-            "composer phpstan"
+            "composer phpstan",
+            "composer exceptions:build"
         ]
     }
 }

packages/debug/src/Stacktrace/Frame.php

@@ -16,7 +16,6 @@ final class Frame
      * @param array<Argument> $arguments
      */
     public function __construct(
-        private(set) string $file,
         private(set) int $line,
         private(set) ?string $class,
         private(set) ?string $function,
@@ -41,7 +40,6 @@ public static function fromArray(array $frame, int $contextLines = 5, ?string $r
         }
 
         return new self(
-            file: $absoluteFile,
             line: $line,
             class: $frame['class'] ?? null,
             function: $frame['function'] ?? null,

packages/debug/src/Stacktrace/Stacktrace.php

@@ -10,19 +10,15 @@
 
 final class Stacktrace
 {
-    /**
-     * @param array<int, Frame> $frames
-     */
+    /** @var array<Frame> */
     public array $applicationFrames {
         get => array_values(array_filter(
             array: $this->frames,
             callback: fn (Frame $frame) => ! $frame->isVendor,
         ));
     }
 
-    /**
-     * @param array<int, Frame> $frames
-     */
+    /** @var array<int,Frame> */
     public array $vendorFrames {
         get => array_values(array_filter(
             array: $this->frames,
@@ -31,13 +27,12 @@ final class Stacktrace
     }
 
     /**
-     * @param array<int, Frame> $frames
+     * @param array<int,Frame> $frames
      */
     public function __construct(
         private(set) string $message,
         private(set) string $exceptionClass,
         private(set) array $frames,
-        private(set) string $file,
         private(set) int $line,
         private(set) string $absoluteFile,
         private(set) string $relativeFile,
@@ -46,10 +41,9 @@ public function __construct(
     public static function fromThrowable(Throwable $throwable, int $contextLines = 5, ?string $rootPath = null): self
     {
         $frames = [];
+        $snippet = null;
         $trace = $throwable->getTrace();
         $firstTraceFrame = $trace[0] ?? null;
-        $snippet = null;
-
         $exceptionFile = $throwable->getFile();
         $exceptionLine = $throwable->getLine();
         $isVendor = Frame::isVendorFile($exceptionFile, $rootPath);
@@ -58,39 +52,34 @@ public static function fromThrowable(Throwable $throwable, int $contextLines = 5
             $snippet = Frame::extractCodeSnippet($exceptionFile, $exceptionLine, $contextLines);
         }
 
-        $absoluteExceptionFile = $exceptionFile;
-        $relativeExceptionFile = $rootPath ? to_relative_path($rootPath, $exceptionFile) : $exceptionFile;
-        $arguments = $firstTraceFrame ? Frame::extractArguments($firstTraceFrame) : [];
-
         $frames[] = new Frame(
-            file: $exceptionFile,
             line: $exceptionLine,
             class: $firstTraceFrame['class'] ?? null,
             function: $firstTraceFrame['function'] ?? null,
             type: $firstTraceFrame['type'] ?? null,
             isVendor: $isVendor,
             snippet: $snippet,
-            absoluteFile: $absoluteExceptionFile,
-            relativeFile: $relativeExceptionFile,
-            arguments: $arguments,
+            absoluteFile: $exceptionFile,
+            relativeFile: $rootPath
+                ? to_relative_path($rootPath, $exceptionFile)
+                : $exceptionFile,
+            arguments: $firstTraceFrame
+                ? Frame::extractArguments($firstTraceFrame)
+                : [],
             index: 1,
         );
 
-        foreach (array_slice($trace, 1) as $i => $frame) {
+        foreach (array_slice($trace, offset: 1) as $i => $frame) {
             $frames[] = Frame::fromArray($frame, $contextLines, $rootPath, $i + 2);
         }
 
-        $absoluteFile = $throwable->getFile();
-        $relativeFile = $rootPath ? to_relative_path($rootPath, $absoluteFile) : $absoluteFile;
-
         return new self(
             message: $throwable->getMessage(),
             exceptionClass: $throwable::class,
             frames: $frames,
-            file: $throwable->getFile(),
             line: $throwable->getLine(),
-            absoluteFile: $absoluteFile,
-            relativeFile: $relativeFile,
+            absoluteFile: $exceptionFile,
+            relativeFile: $rootPath ? to_relative_path($rootPath, $exceptionFile) : $exceptionFile,
         );
     }
 }

packages/debug/tests/StacktraceTest.php

@@ -48,7 +48,7 @@ public function stacktrace_frame_creates_from_array(): void
             'type' => '->',
         ]);
 
-        $this->assertSame(__FILE__, $frame->file);
+        $this->assertSame(__FILE__, $frame->absoluteFile);
         $this->assertSame(100, $frame->line);
         $this->assertSame(self::class, $frame->class);
         $this->assertSame('testMethod', $frame->function);
@@ -206,17 +206,15 @@ public function detects_vendor_files_with_root_path(): void
     public function stacktrace_uses_root_path_for_vendor_detection(): void
     {
         $exception = $this->createException();
-        $rootPath = dirname(__DIR__, 3); // Get project root
+        $rootPath = dirname(__DIR__, levels: 3); // Get project root
 
         $stacktrace = Stacktrace::fromThrowable($exception, rootPath: $rootPath);
+        $frames = $stacktrace->applicationFrames;
 
-        $appFrames = $stacktrace->applicationFrames;
+        $this->assertNotEmpty($frames);
 
-        $this->assertNotEmpty($appFrames);
-
-        foreach ($appFrames as $frame) {
-            // Check that files within the project are not marked as vendor
-            if (str_starts_with($frame->file, $rootPath)) {
+        foreach ($frames as $frame) {
+            if (str_starts_with($frame->absoluteFile, $rootPath)) {
                 $this->assertFalse($frame->isVendor);
             }
         }

packages/router/src/Exceptions/local/src/components/stacktrace/stacktrace.ts

@@ -12,7 +12,6 @@ export interface Argument {
 }
 
 export interface StacktraceFrame {
-	file: string
 	line: number
 	class?: string
 	function?: string