Skip to content

Commit 71f2154

Browse files
authored
Only prints source on dd calls from dump.php (#44367)
1 parent f7a5cfc commit 71f2154

File tree

1 file changed

+20
-3
lines changed

1 file changed

+20
-3
lines changed

src/Illuminate/Foundation/Concerns/ResolvesDumpSource.php

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,27 @@ public function resolveDumpSource()
2222
return call_user_func(static::$dumpSourceResolver);
2323
}
2424

25-
$trace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT | DEBUG_BACKTRACE_IGNORE_ARGS, 20);
25+
$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 20);
2626

27-
$file = $trace[7]['file'] ?? null;
28-
$line = $trace[7]['line'] ?? null;
27+
$sourceKey = null;
28+
29+
foreach ($trace as $traceKey => $traceFile) {
30+
if (isset($traceFile['file']) && str_ends_with(
31+
$traceFile['file'],
32+
'symfony/var-dumper/Resources/functions/dump.php'
33+
)) {
34+
$sourceKey = $traceKey + 1;
35+
36+
break;
37+
}
38+
}
39+
40+
if (is_null($sourceKey)) {
41+
return;
42+
}
43+
44+
$file = $trace[$sourceKey]['file'] ?? null;
45+
$line = $trace[$sourceKey]['line'] ?? null;
2946

3047
if (is_null($file) || is_null($line)) {
3148
return;

0 commit comments

Comments
 (0)