fixing injection middleware with preg_replace

tallstackui · Sep 17, 2024 · 1da847a · 1da847a
1 parent 619b039
commit 1da847a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/src/Middleware/Injection.php b/src/Middleware/Injection.php
@@ -14,6 +14,8 @@ public function handle($request, Closure $next) // @pest-ignore-type
             return $next($request);
         }
 
-        return app(Render::class)->handle($next($request));
+        $response = $next($request);
+
+        return app(Render::class)->handle($response);
     }
 }
diff --git a/src/Response/ResponseHandle.php b/src/Response/ResponseHandle.php
@@ -23,19 +23,7 @@ public function __invoke(): Response
             $content = substr_replace($content, $this->render->js(), $head + 6, 0);
         }
 
-        if (($start = strpos($content, '<body')) !== false) {
-            $end = strpos($content, '">', $start);
-
-            if ($end !== false) {
-                $content = substr_replace($content, $this->render->component(), $end + 3, 0);
-            } else {
-                $end = strpos($content, '>', $start);
-
-                if ($end !== false) {
-                    $content = substr_replace($content, $this->render->component(), $end + 2, 0);
-                }
-            }
-        }
+        $content = preg_replace('/(<body[^>]*>)/i', '$1'.$this->render->component(), $content);
 
         return $this->response->setContent($content);
     }