feat: refactor to remove early return

jsandfordhughescoop · jsandfordhughescoop · commit 44414e4b2523 · 2025-10-21T07:45:04.000+01:00
diff --git a/src/Events/LivewireDispatcher.php b/src/Events/LivewireDispatcher.php
@@ -16,16 +16,12 @@ 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 ?? null;
 
-        if (! $originalContent) {
-            return;
-        }
-
         if (! $handled->response->isSuccessful()) {
             return;
         }
@@ -54,7 +50,9 @@ public function handle(RequestHandled $handled)
             HTML)
         );
 
-        $handled->response->original = $originalContent;
+        if (property_exists($handled->response, 'original')) {
+            $handled->response->original = $originalContent;
+        }
     }
 
     /** Injects assets into given html string (taken from Livewire's injection mechanism) */

Original file line number	Diff line number	Diff line change
`@@ -16,16 +16,12 @@ public function register(): void`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/** Injects assets inside every full-page response */`
`19`		`- public function handle(RequestHandled $handled)`
	`19`	`+ public function handle(RequestHandled $handled): void`
`20`	`20`	`{`
`21`	`21`	`$identifier = 'NativePHP Livewire Dispatcher';`
`22`	`22`	`$html = $handled->response->getContent();`
`23`	`23`	`$originalContent = $handled->response->original ?? null;`
`24`	`24`
`25`		`- if (! $originalContent) {`
`26`		`- return;`
`27`		`- }`
`28`		`-`
`29`	`25`	`if (! $handled->response->isSuccessful()) {`
`30`	`26`	`return;`
`31`	`27`	`}`
`@@ -54,7 +50,9 @@ public function handle(RequestHandled $handled)`
`54`	`50`	`HTML)`
`55`	`51`	`);`
`56`	`52`
`57`		`- $handled->response->original = $originalContent;`
	`53`	`+ if (property_exists($handled->response, 'original')) {`
	`54`	`+ $handled->response->original = $originalContent;`
	`55`	`+ }`
`58`	`56`	`}`
`59`	`57`
`60`	`58`	`/** Injects assets into given html string (taken from Livewire's injection mechanism) */`