Fix occasionally missing backtrace in errors (closes #162)

shalvah · shalvah · commit 341aefc3bb17 · 2022-05-14T14:01:31.000+02:00
diff --git a/src/BacktraceFactory.php b/src/BacktraceFactory.php
@@ -21,8 +21,8 @@ class BacktraceFactory
     protected $config;
 
     /**
-     * @param  \Throwable  $exception
-     * @param  \Honeybadger\Config  $config
+     * @param \Throwable $exception
+     * @param \Honeybadger\Config $config
      */
     public function __construct(Throwable $exception, Config $config)
     {
@@ -51,8 +51,9 @@ public function previous(): array
     }
 
     /**
-     * @param  \Throwable  $e
-     * @param  array  $previousCauses
+     * @param \Throwable $e
+     * @param array $previousCauses
+     *
      * @return array
      */
     private function formatPrevious(Throwable $e, array $previousCauses = []): array
@@ -71,7 +72,8 @@ private function formatPrevious(Throwable $e, array $previousCauses = []): array
     }
 
     /**
-     * @param  array  $backtrace
+     * @param array $backtrace
+     *
      * @return array
      */
     private function offsetForThrownException(array $backtrace): array
@@ -83,24 +85,25 @@ private function offsetForThrownException(array $backtrace): array
             while (strpos($backtrace[0]['class'] ?? '', 'Honeybadger\\') !== false) {
                 array_shift($backtrace);
             }
-        } else {
-            $backtrace[0] = array_merge($backtrace[0] ?? [], [
-                'line' => $this->exception->getLine(),
-                'file' => $this->exception->getFile(),
-            ]);
         }
 
+        $backtrace[0] = array_merge($backtrace[0] ?? [], [
+            'line' => $this->exception->getLine(),
+            'file' => $this->exception->getFile(),
+        ]);
+
         return $backtrace;
     }
 
     /**
-     * @param  array  $backtrace
+     * @param array $backtrace
+     *
      * @return array
      */
     private function formatBacktrace(array $backtrace): array
     {
         return array_map(function ($frame) {
-            if (! array_key_exists('file', $frame)) {
+            if (!array_key_exists('file', $frame)) {
                 $context = $this->contextWithoutFile($frame);
             } else {
                 $context = $this->contextWithFile($frame);
@@ -119,6 +122,7 @@ private function formatBacktrace(array $backtrace): array
      * Parse method arguments and make any transformations.
      *
      * @param array $args
+     *
      * @return array
      */
     private function parseArgs(array $args): array
@@ -129,12 +133,13 @@ private function parseArgs(array $args): array
     }
 
     /**
-     * @param  array  $frame
+     * @param array $frame
+     *
      * @return array
      */
     private function contextWithoutFile(array $frame): array
     {
-        if (! empty($frame['class'])) {
+        if (!empty($frame['class'])) {
             $filename = sprintf('%s%s%s', $frame['class'], $frame['type'], $frame['function']);
 
             try {
@@ -143,7 +148,7 @@ private function contextWithoutFile(array $frame): array
             } catch (ReflectionException $e) {
                 // Forget it if we run into errors, it's not worth it.
             }
-        } elseif (! empty($frame['function'])) {
+        } elseif (!empty($frame['function'])) {
             $filename = sprintf('%s(anonymous)', $frame['function']);
         } else {
             $filename = sprintf('(anonymous)');
@@ -161,15 +166,16 @@ private function contextWithoutFile(array $frame): array
     }
 
     /**
-     * @param  array  $frame
+     * @param array $frame
+     *
      * @return array
      */
     private function contextWithFile(array $frame): array
     {
         return [
             'source' => (new FileSource($frame['file'], $frame['line']))->getSource(),
             'file' => $frame['file'],
-            'number' => (string) $frame['line'],
+            'number' => (string)$frame['line'],
             'context' => $this->fileFromApplication($frame['file'], $this->config['vendor_paths'])
                 ? 'app' : 'all',
         ];
@@ -182,11 +188,11 @@ private function fileFromApplication(string $filePath, array $vendorPaths): bool
         // On Windows, file paths use backslashes, so we have to normalise them
         $path = str_replace('\\', '/', $path);
 
-        if (Regex::match('/'.array_shift($vendorPaths).'/', $path)->hasMatch()) {
+        if (Regex::match('/' . array_shift($vendorPaths) . '/', $path)->hasMatch()) {
             return false;
         }
 
-        if (! empty($vendorPaths)) {
+        if (!empty($vendorPaths)) {
             return $this->fileFromApplication($filePath, $vendorPaths);
         }
 
@@ -195,10 +201,10 @@ private function fileFromApplication(string $filePath, array $vendorPaths): bool
 
     private function appendProjectRootToFilePath(string $filePath): string
     {
-        $pregProjectRoot = preg_quote($this->config['project_root'].'/', '/');
+        $pregProjectRoot = preg_quote($this->config['project_root'] . '/', '/');
 
         return $this->config['project_root']
-            ? Regex::replace('/'.$pregProjectRoot.'/', '', $filePath)->result()
+            ? Regex::replace('/' . $pregProjectRoot . '/', '', $filePath)->result()
             : '';
     }
 }
