Merge pull request #722 from cakephp/fix/error-context

markstory · web-flow · commit 6bf3ac5cb27f · 2020-01-03T16:36:16.000-05:00
Add trace_offset to error handler
diff --git a/config/bootstrap.php b/config/bootstrap.php
@@ -39,6 +39,7 @@ function ($code, $message, $file, $line, $context = null) use (&$previousHandler
                 return;
             }
             if ($previousHandler) {
+                $context['_trace_frame_offset'] = 1;
                 return $previousHandler($code, $message, $file, $line, $context);
             }
         },

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ function ($code, $message, $file, $line, $context = null) use (&$previousHandler`
`39`	`39`	`return;`
`40`	`40`	`}`
`41`	`41`	`if ($previousHandler) {`
	`42`	`+ $context['_trace_frame_offset'] = 1;`
`42`	`43`	`return $previousHandler($code, $message, $file, $line, $context);`
`43`	`44`	`}`
`44`	`45`	`},`