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

[4.x] Laravel Octane fix: GateWatcher handles stack trace caller not found #1128

Merged
merged 1 commit into from
Sep 16, 2021
Merged

[4.x] Laravel Octane fix: GateWatcher handles stack trace caller not found #1128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Watchers/FetchesStackTrace.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ trait FetchesStackTrace
* Find the first frame in the stack trace outside of Telescope/Laravel.
*
* @param string|array $forgetLines
* @return array
* @return array|null
*/
protected function getCallerFromStackTrace($forgetLines = 0)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Watchers/GateWatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ public function recordGateCheck(?Authenticatable $user, $ability, $result, $argu
'ability' => $ability,
'result' => $this->gateResult($result),
'arguments' => $this->formatArguments($arguments),
'file' => $caller['file'],
'line' => $caller['line'],
'file' => $caller['file'] ?? null,
'line' => $caller['line'] ?? null,
]));

return $result;
Expand Down