@@ -105,6 +105,7 @@ public function onKernelResponse(ResponseEvent $event): void
105
105
// keep current flashes for one more request if using AutoExpireFlashBag
106
106
$ session ->getFlashBag ()->setAll ($ session ->getFlashBag ()->peekAll ());
107
107
}
108
+
108
109
$ response ->setContent ($ this ->twig ->render ('@WebProfiler/Profiler/toolbar_redirect.html.twig ' , ['location ' => $ response ->headers ->get ('Location ' ), 'host ' => $ request ->getSchemeAndHttpHost ()]));
109
110
$ response ->setStatusCode (200 );
110
111
$ response ->headers ->remove ('Location ' );
@@ -130,31 +131,30 @@ protected function injectToolbar(Response $response, Request $request, array $no
130
131
{
131
132
if ($ response instanceof StreamedResponse) {
132
133
$ 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 );
150
149
} else {
151
150
$ content = $ response ->getContent ();
152
151
$ pos = strripos ($ content , '</body> ' );
153
152
154
153
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 );
158
158
}
159
159
}
160
160
}
0 commit comments