[12.x] Update local exception page

composer.json

@@ -40,6 +40,7 @@
         "monolog/monolog": "^3.0",
         "nesbot/carbon": "^3.8.4",
         "nunomaduro/termwind": "^2.0",
+        "phiki/phiki": "v2.0.0",
         "psr/container": "^1.1.1|^2.0.1",
         "psr/log": "^1.0|^2.0|^3.0",
         "psr/simple-cache": "^1.0|^2.0|^3.0",

src/Illuminate/Foundation/Exceptions/Renderer/Exception.php

@@ -87,17 +87,13 @@ public function class()
     }
 
     /**
-     * Get the first "non-vendor" frame index.
+     * Get the exception code.
      *
-     * @return int
+     * @return int|string
      */
-    public function defaultFrame()
+    public function code()
     {
-        $key = array_search(false, array_map(function (Frame $frame) {
-            return $frame->isFromVendor();
-        }, $this->frames()->all()));
-
-        return $key === false ? 0 : $key;
+        return $this->exception->getCode();
     }
 
     /**
@@ -120,9 +116,50 @@ public function frames()
             array_shift($trace);
         }
 
-        return new Collection(array_map(
-            fn (array $trace) => new Frame($this->exception, $classMap, $trace, $this->basePath), $trace,
-        ));
+        $frames = [];
+        $previousFrame = null;
+
+        foreach (array_reverse($trace) as $frameData) {
+            $frame = new Frame($this->exception, $classMap, $frameData, $this->basePath, $previousFrame);
+            $frames[] = $frame;
+            $previousFrame = $frame;
+        }
+
+        $frames = array_reverse($frames);
+
+        foreach ($frames as $frame) {
+            if (! $frame->isFromVendor()) {
+                $frame->markAsMain();
+                break;
+            }
+        }
+
+        return new Collection($frames);
+    }
+
+    /**
+     * Get the exception's frames grouped by vendor status.
+     *
+     * @return array<int, array{is_vendor: bool, frames: array<int, Frame>}>
+     */
+    public function frameGroups()
+    {
+        $groups = [];
+
+        foreach ($this->frames() as $frame) {
+            $isVendor = $frame->isFromVendor();
+
+            if (empty($groups) || $groups[array_key_last($groups)]['is_vendor'] !== $isVendor) {
+                $groups[] = [
+                    'is_vendor' => $isVendor,
+                    'frames' => [],
+                ];
+            }
+
+            $groups[array_key_last($groups)]['frames'][] = $frame;
+        }
+
+        return $groups;
     }
 
     /**

src/Illuminate/Foundation/Exceptions/Renderer/Frame.php

@@ -37,20 +37,36 @@ class Frame
      */
     protected $basePath;
 
+    /**
+     * The previous frame.
+     *
+     * @var \Illuminate\Foundation\Exceptions\Renderer\Frame|null
+     */
+    protected $previous;
+
+    /**
+     * Whether this frame is the main (first non-vendor) frame.
+     *
+     * @var bool
+     */
+    protected $isMain = false;
+
     /**
      * Create a new frame instance.
      *
      * @param  \Symfony\Component\ErrorHandler\Exception\FlattenException  $exception
      * @param  array<string, string>  $classMap
-     * @param  array{file: string, line: int, class?: string, type?: string, function?: string}  $frame
+     * @param  array{file: string, line: int, class?: string, type?: string, function?: string, args?: array}  $frame
      * @param  string  $basePath
+     * @param  \Illuminate\Foundation\Exceptions\Renderer\Frame|null  $previous
      */
-    public function __construct(FlattenException $exception, array $classMap, array $frame, string $basePath)
+    public function __construct(FlattenException $exception, array $classMap, array $frame, string $basePath, ?Frame $previous = null)
     {
         $this->exception = $exception;
         $this->classMap = $classMap;
         $this->frame = $frame;
         $this->basePath = $basePath;
+        $this->previous = $previous;
     }
 
     /**
@@ -95,7 +111,11 @@ public function class()
      */
     public function file()
     {
-        return str_replace($this->basePath.'/', '', $this->frame['file']);
+        return match (true) {
+            ! isset($this->frame['file']) => '[internal function]',
+            ! is_string($this->frame['file']) => '[unknown file]',
+            default => str_replace($this->basePath.'/', '', $this->frame['file']),
+        };
     }
 
     /**
@@ -114,6 +134,16 @@ public function line()
         return $this->frame['line'] > $maxLines ? 1 : $this->frame['line'];
     }
 
+    /**
+     * Get the frame's function operator.
+     *
+     * @return '::'|'->'|''
+     */
+    public function operator()
+    {
+        return $this->frame['type'];
+    }
+
     /**
      * Get the frame's function or method.
      *
@@ -127,6 +157,27 @@ public function callable()
         };
     }
 
+    /**
+     * Get the frame's arguments.
+     *
+     * @return array
+     */
+    public function args()
+    {
+        if (! isset($this->frame['args']) || ! is_array($this->frame['args']) || count($this->frame['args']) === 0) {
+            return [];
+        }
+
+        return array_map(function ($argument) {
+            [$key, $value] = $argument;
+
+            return match ($key) {
+                'object' => "{$key}({$value})",
+                default => $key,
+            };
+        }, $this->frame['args']);
+    }
+
     /**
      * Get the frame's code snippet.
      *
@@ -157,4 +208,34 @@ public function isFromVendor()
         return ! str_starts_with($this->frame['file'], $this->basePath)
             || str_starts_with($this->frame['file'], $this->basePath.'/vendor');
     }
+
+    /**
+     * Get the previous frame.
+     *
+     * @return \Illuminate\Foundation\Exceptions\Renderer\Frame|null
+     */
+    public function previous()
+    {
+        return $this->previous;
+    }
+
+    /**
+     * Mark this frame as the main frame.
+     *
+     * @return void
+     */
+    public function markAsMain()
+    {
+        $this->isMain = true;
+    }
+
+    /**
+     * Determine if this is the main frame.
+     *
+     * @return bool
+     */
+    public function isMain()
+    {
+        return $this->isMain;
+    }
 }

src/Illuminate/Foundation/Exceptions/Renderer/Listener.php

@@ -59,7 +59,7 @@ public function queries()
      */
     public function onQueryExecuted(QueryExecuted $event)
     {
-        if (count($this->queries) === 100) {
+        if (count($this->queries) === 101) {
             return;
         }
 

src/Illuminate/Foundation/Exceptions/Renderer/Renderer.php

@@ -5,7 +5,6 @@
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Foundation\Exceptions\Renderer\Mappers\BladeMapper;
 use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
 use Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer;
 use Throwable;
 
@@ -108,19 +107,7 @@ public function render(Request $request, Throwable $throwable)
      */
     public static function css()
     {
-        return (new Collection([
-            ['styles.css', []],
-            ['light-mode.css', ['data-theme' => 'light']],
-            ['dark-mode.css', ['data-theme' => 'dark']],
-        ]))->map(function ($fileAndAttributes) {
-            [$filename, $attributes] = $fileAndAttributes;
-
-            return '<style '.(new Collection($attributes))->map(function ($value, $attribute) {
-                return $attribute.'="'.$value.'"';
-            })->implode(' ').'>'
-                .file_get_contents(static::DIST.$filename)
-                .'</style>';
-        })->implode('');
+        return '<style>'.file_get_contents(static::DIST.'styles.css').'</style>';
     }
 
     /**

src/Illuminate/Foundation/resources/exceptions/renderer/components/badge.blade.php

@@ -0,0 +1,47 @@
+@props(['type' => 'default', 'variant' => 'soft'])
+
+@php
+$baseClasses = 'inline-flex w-fit shrink-0 items-center justify-center gap-1 font-mono leading-3 uppercase transition-colors dark:border [&_svg]:size-2.5 h-6 min-w-5 rounded-md px-1.5 text-xs/none';
+
+$types = [
+    'default' => [
+        'soft' => 'bg-black/8 text-neutral-900 dark:border-neutral-700 dark:bg-white/10 dark:text-neutral-100',
+        'solid' => 'bg-neutral-600 text-neutral-100 dark:border-neutral-500 dark:bg-neutral-600',
+    ],
+    'success' => [
+        'soft' => 'bg-emerald-200 text-emerald-900 dark:border-emerald-600 dark:bg-emerald-900/70 dark:text-emerald-400',
+        'solid' => 'bg-emerald-600 dark:border-emerald-500 dark:bg-emerald-600',
+    ],
+    'primary' => [
+        'soft' => 'bg-blue-100 text-blue-900 dark:border-blue-800 dark:bg-blue-950 dark:text-blue-300',
+        'solid' => 'bg-blue-700 dark:border-blue-600 dark:bg-blue-700',
+    ],
+    'error' => [
+        'soft' => 'bg-rose-200 text-rose-900 dark:border-rose-900 dark:bg-rose-950 dark:text-rose-100 dark:[&_svg]:!text-white',
+        'solid' => 'bg-rose-600 dark:border-rose-500 dark:bg-rose-600',
+    ],
+    'alert' => [
+        'soft' => 'bg-amber-200 text-amber-900 dark:border-amber-800 dark:bg-amber-950 dark:text-amber-300',
+        'solid' => 'bg-amber-600 dark:border-amber-500 dark:bg-amber-600',
+    ],
+    'white' => [
+        'soft' => 'bg-white text-neutral-900 dark:border-neutral-700 dark:bg-neutral-800 dark:text-neutral-100',
+        'solid' => 'bg-black/10 text-neutral-900 dark:text-neutral-900 dark:bg-white',
+    ],
+];
+
+$variants = [
+    'soft' => '',
+    'solid' => 'text-white dark:text-white [&_svg]:!text-white',
+];
+
+$typeClasses = $types[$type][$variant] ?? $types['default']['soft'];
+$variantClasses = $variants[$variant] ?? $variants['soft'];
+
+$classes = implode(' ', [$baseClasses, $typeClasses, $variantClasses]);
+
+@endphp
+
+<div {{ $attributes->merge(['class' => $classes]) }}>
+    {{ $slot }}
+</div>