Skip to content

fix: adds check for original content existence #18

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

Merged
merged 3 commits into from
Oct 21, 2025
Merged

fix: adds check for original content existence #18

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb00da1
fix: adds check for original content existance
jsandfordhughescoop Oct 17, 2025
44414e4
feat: refactor to remove early return
jsandfordhughescoop Oct 21, 2025
84a4340
add phpstan-ignore
gwleuverink Oct 21, 2025
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
12 changes: 9 additions & 3 deletions src/Events/LivewireDispatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ public function register(): void
}

/** Injects assets inside every full-page response */
public function handle(RequestHandled $handled)
public function handle(RequestHandled $handled): void
{
$identifier = 'NativePHP Livewire Dispatcher';
$html = $handled->response->getContent();
$originalContent = $handled->response->original;
$originalContent = $handled->response->original ?? null;

if (! $handled->response->isSuccessful()) {
return;
Expand Down Expand Up @@ -50,7 +50,13 @@ public function handle(RequestHandled $handled)
HTML)
);

$handled->response->original = $originalContent;
// Laravel dispatches the ResponseHandled event even for response
// objects that don't include the `original` property.
// The typehint in Laravel core is wrong, so we ignore
/* @phpstan-ignore function.alreadyNarrowedType */
if (property_exists($handled->response, 'original')) {
$handled->response->original = $originalContent;
}
}

/** Injects assets into given html string (taken from Livewire's injection mechanism) */
Expand Down
Loading