Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[9.x] Add source file to Collection's dd method output #44793

Merged
merged 5 commits into from
Nov 1, 2022
+24 −5
Merged

[9.x] Add source file to Collection's dd method output #44793

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
78104e0
add source file to Collection's dd function output
hasyirin Oct 31, 2022
8514d02
turned trace name and keys into class property.
hasyirin Oct 31, 2022
0ca658b
styling & remove extra dot in comment
hasyirin Oct 31, 2022
a545d77
made trace path strict, fixed calling static property.
hasyirin Oct 31, 2022
5b517e8
typo in path
hasyirin Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions src/Illuminate/Foundation/Concerns/ResolvesDumpSource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@ trait ResolvesDumpSource
'xdebug' => 'xdebug://{file}@{line}',
];

/**
* All of the trace names and its keys.
*
* @var array<string, int>
*/
protected static $traceNames = [
'symfony/var-dumper/Resources/functions/dump.php' => 1,
'Illuminate/Collections/Traits/EnumeratesValues.php' => 4,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This changes work on Windows due the different separator?

];

/**
* The source resolver.
*
Expand Down Expand Up @@ -56,12 +66,21 @@ public function resolveDumpSource()
$sourceKey = null;

foreach ($trace as $traceKey => $traceFile) {
if (isset($traceFile['file']) && str_ends_with(
$traceFile['file'],
'dump.php'
)) {
$sourceKey = $traceKey + 1;
if (! isset($traceFile['file'])) {
continue;
}

foreach (self::$traceNames as $name => $key) {
if (str_ends_with(
$traceFile['file'],
str_replace('/', DIRECTORY_SEPARATOR, $name)
)) {
$sourceKey = $traceKey + $key;
break;
}
}

if (! is_null($sourceKey)) {
break;
}
}
Expand Down