Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 9a631e3

Browse filesBrowse files
committed
review correction from stof
1 parent 9bfa4ae commit 9a631e3
Copy full SHA for 9a631e3

File tree

1 file changed

+20
-20
lines changed
Filter options

1 file changed

+20
-20
lines changed

‎src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
+20-20Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ public function onKernelResponse(ResponseEvent $event): void
105105
// keep current flashes for one more request if using AutoExpireFlashBag
106106
$session->getFlashBag()->setAll($session->getFlashBag()->peekAll());
107107
}
108+
108109
$response->setContent($this->twig->render('@WebProfiler/Profiler/toolbar_redirect.html.twig', ['location' => $response->headers->get('Location'), 'host' => $request->getSchemeAndHttpHost()]));
109110
$response->setStatusCode(200);
110111
$response->headers->remove('Location');
@@ -130,31 +131,30 @@ protected function injectToolbar(Response $response, Request $request, array $no
130131
{
131132
if ($response instanceof StreamedResponse) {
132133
$callback = $response->getCallback();
133-
if (false !== strripos($response->headers->get('Content-Type'), 'text/html')) {
134-
$toolbarHTMLContent = $this->getToolbarHTML($request, $response->headers->get('X-Debug-Token'), $nonces);
135-
$injectedCallback = static function () use ($toolbarHTMLContent, $callback): void {
136-
ob_start(function (string $buffer, int $phase) use ($toolbarHTMLContent): string {
137-
$pos = strripos($buffer, '</body>');
138-
if (false !== $pos) {
139-
$buffer = substr($buffer, 0, $pos).$toolbarHTMLContent.substr($buffer, $pos);
140-
}
141-
142-
return $buffer;
143-
}, 8); // length of '</body>'
144-
145-
($callback)();
146-
ob_end_flush();
147-
};
148-
$response->setCallback($injectedCallback);
149-
}
134+
$toolbarHTMLContent = $this->getToolbarHTML($request, $response->headers->get('X-Debug-Token'), $nonces);
135+
$injectedCallback = static function () use ($toolbarHTMLContent, $callback): void {
136+
ob_start(function (string $buffer, int $phase) use ($toolbarHTMLContent): string {
137+
$pos = strripos($buffer, '</body>');
138+
if (false !== $pos) {
139+
$buffer = substr($buffer, 0, $pos).$toolbarHTMLContent.substr($buffer, $pos);
140+
}
141+
142+
return $buffer;
143+
}, 8); // length of '</body>'
144+
145+
($callback)();
146+
ob_end_flush();
147+
};
148+
$response->setCallback($injectedCallback);
150149
} else {
151150
$content = $response->getContent();
152151
$pos = strripos($content, '</body>');
153152

154153
if (false !== $pos) {
155-
$response->setContent(
156-
$this->renderToolbarInContent($content, $pos, $response->headers->get('X-Debug-Token'), $request, $nonces)
157-
);
154+
$toolbar = "\n".str_replace("\n", '', $this->getToolbarHTML($request, $response->headers->get('X-Debug-Token'), $nonces))."\n";
155+
156+
$content = substr($content, 0, $pos).$toolbar.substr($content, $pos);
157+
$response->setContent($content);
158158
}
159159
}
160160
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.