review correction from stof

damienfern · damienfern · commit 642ebedf5f4e · 2024-11-07T17:59:11.000+01:00
diff --git a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
@@ -105,6 +105,7 @@ public function onKernelResponse(ResponseEvent $event): void
                 // keep current flashes for one more request if using AutoExpireFlashBag
                 $session->getFlashBag()->setAll($session->getFlashBag()->peekAll());
             }
+
             $response->setContent($this->twig->render('@WebProfiler/Profiler/toolbar_redirect.html.twig', ['location' => $response->headers->get('Location'), 'host' => $request->getSchemeAndHttpHost()]));
             $response->setStatusCode(200);
             $response->headers->remove('Location');
@@ -130,42 +131,34 @@ protected function injectToolbar(Response $response, Request $request, array $no
     {
         if ($response instanceof StreamedResponse) {
             $callback = $response->getCallback();
-            if (false !== strripos($response->headers->get('Content-Type'), 'text/html')) {
-                $toolbarHTMLContent = $this->getToolbarHTML($request, $response->headers->get('X-Debug-Token'), $nonces);
-                $injectedCallback = static function () use ($toolbarHTMLContent, $callback): void {
-                    ob_start(function (string $buffer, int $phase) use ($toolbarHTMLContent): string {
-                        $pos = strripos($buffer, '</body>');
-                        if (false !== $pos) {
-                            $buffer = substr($buffer, 0, $pos).$toolbarHTMLContent.substr($buffer, $pos);
-                        }
-
-                        return $buffer;
-                    }, 8); // length of '</body>'
-
-                    ($callback)();
-                    ob_end_flush();
-                };
-                $response->setCallback($injectedCallback);
-            }
+            $toolbarHTMLContent = $this->getToolbarHTML($request, $response->headers->get('X-Debug-Token'), $nonces);
+            $injectedCallback = static function () use ($toolbarHTMLContent, $callback): void {
+                ob_start(function (string $buffer, int $phase) use ($toolbarHTMLContent): string {
+                    $pos = strripos($buffer, '</body>');
+                    if (false !== $pos) {
+                        $buffer = substr($buffer, 0, $pos).$toolbarHTMLContent.substr($buffer, $pos);
+                    }
+
+                    return $buffer;
+                }, 8); // length of '</body>'
+
+                ($callback)();
+                ob_end_flush();
+            };
+            $response->setCallback($injectedCallback);
         } else {
             $content = $response->getContent();
             $pos = strripos($content, '</body>');
 
             if (false !== $pos) {
-                $response->setContent(
-                    $this->renderToolbarInContent($content, $pos, $response->headers->get('X-Debug-Token'), $request, $nonces)
-                );
+                $toolbar = "\n".str_replace("\n", '', $this->getToolbarHTML($request, $response->headers->get('X-Debug-Token'), $nonces))."\n";
+
+                $content = substr($content, 0, $pos).$toolbar.substr($content, $pos);
+                $response->setContent($content);
             }
         }
     }
 
-    protected function renderToolbarInContent(string $content, int $pos, ?string $debugToken, Request $request, array $nonces): string
-    {
-        $toolbar = "\n".str_replace("\n", '', $this->getToolbarHTML($request, $debugToken, $nonces))."\n";
-
-        return substr($content, 0, $pos).$toolbar.substr($content, $pos);
-    }
-
     private function getToolbarHTML(Request $request, ?string $debugToken, array $nonces): string
     {
         return $this->twig->render(
