fix frames

Author: kierwils

src/Handlers/Console.php

@@ -61,27 +61,39 @@ protected function handleStack(Trace $trace): void
     {
         $indent = '    ';
         $doubleIndent = $indent.$indent;
+
         $exception = $trace->getException();
 
         $text = $this->getMessage($exception);
         $this->writeln($text."\n");
         $this->writeln($indent.$exception->getFile().':'.$exception->getLine());
+
         $this->writeln('');
 
-        foreach ($trace->getFrames()[0]->getPlaceInFile() as $num => $line) {
-            $lineIndent = $doubleIndent;
+        $frames = $trace->getFrames();
+
+        if (!\count($frames)) {
+            return;
+        }
+
+        if ($frames[0]->hasContext()) {
+            $frame = array_shift($frames);
 
-            if ($num === $trace->getException()->getLine()) {
-                $lineIndent = $indent.'--> ';
+            foreach ($frame->getContext()->getPlaceInFile() as $num => $line) {
+                $lineIndent = $doubleIndent;
+
+                if ($num === $frame->getLine()) {
+                    $lineIndent = $indent.'--> ';
+                }
+
+                $text = $lineIndent.$num.' '.rtrim($line);
+                $this->writeln($text);
             }
 
-            $text = $lineIndent.$num.' '.rtrim($line);
-            $this->writeln($text);
+            $this->writeln('');
         }
 
-        $this->writeln('');
-
-        foreach ($trace->getFrames() as $frame) {
+        foreach ($frames as $frame) {
             $context = $frame->getFile() ? $frame->getFile().':'.$frame->getLine() : $frame->getCaller();
             $this->writeln($indent.$context);
         }

src/Inspection/Frame.php

@@ -24,7 +24,7 @@ class Frame
     public static function create(array $frame): self
     {
         // @link https://github.com/symfony/var-dumper/commit/7670e4790f447b3380993b8109ae2ed3d2366480
-        if (preg_match('/\((\d+)\)(?:\([\da-f]{32}\))? : (?:eval\(\)\'d code|runtime-created function)$/', $frame['file'] ??  '', $match) !== false) {
+        if (preg_match('/\((\d+)\)(?:\([\da-f]{32}\))? : (?:eval\(\)\'d code|runtime-created function)$/', $frame['file'] ??  '', $match)) {
             $frame['file'] = substr($frame['file'], 0, -\strlen($match[0]));
             $frame['line'] = (int) $match[1];
         }
@@ -70,6 +70,11 @@ public function getContext(): Context
         return new Context($this->getFile(), $this->getLine());
     }
 
+    public function hasContext(): bool
+    {
+        return null !== $this->getFile() && null !== $this->getLine() && is_file($this->getFile());
+    }
+
     public function getCaller(): ?string
     {
         return $this->caller;

src/Inspection/Trace.php

@@ -27,6 +27,19 @@ public function getExceptionClassName(): string
 
     public function getFrames(): array
     {
-        return array_map(fn (array $params): Frame => Frame::create($params), $this->exception->getTrace());
+        $frames = $this->exception->getTrace();
+
+        $containsException = array_reduce($frames, function (bool $carry, array $frame): bool {
+            return isset($frame['file'], $frame['line']) && $this->exception->getFile() === $frame['file'] && $this->exception->getLine() === $frame['line'] ? true : $carry;
+        }, false);
+
+        if (!$containsException) {
+            array_unshift($frames, [
+                'file' => $this->exception->getFile(),
+                'line' => $this->exception->getLine(),
+            ]);
+        }
+
+        return array_map(fn (array $params): Frame => Frame::create($params), $frames);
     }
 }