From 7b1725cdb82c18fe4963c2a6e9b8ed39777d54e9 Mon Sep 17 00:00:00 2001 From: Hugo Posnic Date: Fri, 29 Nov 2024 11:17:22 +0100 Subject: [PATCH 1/3] [WebProfilerBundle] Fix interception for non conventional redirects --- EventListener/WebDebugToolbarListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EventListener/WebDebugToolbarListener.php b/EventListener/WebDebugToolbarListener.php index c2b350ff..87cb3d55 100644 --- a/EventListener/WebDebugToolbarListener.php +++ b/EventListener/WebDebugToolbarListener.php @@ -107,7 +107,7 @@ public function onKernelResponse(ResponseEvent $event): void return; } - if ($response->headers->has('X-Debug-Token') && $response->isRedirect() && $this->interceptRedirects && 'html' === $request->getRequestFormat()) { + if ($response->headers->has('X-Debug-Token') && $response->isRedirect() && $this->interceptRedirects && 'html' === $request->getRequestFormat() && $response->headers->has('Location')) { if ($request->hasSession() && ($session = $request->getSession())->isStarted() && $session->getFlashBag() instanceof AutoExpireFlashBag) { // keep current flashes for one more request if using AutoExpireFlashBag $session->getFlashBag()->setAll($session->getFlashBag()->peekAll()); From 069881b41bfc73b65456e143fc176715b0549423 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 11 Feb 2025 17:41:13 +0100 Subject: [PATCH 2/3] [WebProfilerBundle] Fix tests --- Tests/EventListener/WebDebugToolbarListenerTest.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Tests/EventListener/WebDebugToolbarListenerTest.php b/Tests/EventListener/WebDebugToolbarListenerTest.php index 33bf1a32..cf3c1892 100644 --- a/Tests/EventListener/WebDebugToolbarListenerTest.php +++ b/Tests/EventListener/WebDebugToolbarListenerTest.php @@ -63,6 +63,7 @@ public static function getInjectToolbarTests() public function testHtmlRedirectionIsIntercepted($statusCode) { $response = new Response('Some content', $statusCode); + $response->headers->set('Location', 'https://example.com/'); $response->headers->set('X-Debug-Token', 'xxxxxxxx'); $event = new ResponseEvent($this->createMock(Kernel::class), new Request(), HttpKernelInterface::MAIN_REQUEST, $response); @@ -76,6 +77,7 @@ public function testHtmlRedirectionIsIntercepted($statusCode) public function testNonHtmlRedirectionIsNotIntercepted() { $response = new Response('Some content', '301'); + $response->headers->set('Location', 'https://example.com/'); $response->headers->set('X-Debug-Token', 'xxxxxxxx'); $event = new ResponseEvent($this->createMock(Kernel::class), new Request([], [], ['_format' => 'json']), HttpKernelInterface::MAIN_REQUEST, $response); @@ -139,6 +141,7 @@ public function testToolbarIsNotInjectedOnContentDispositionAttachment() public function testToolbarIsNotInjectedOnRedirection($statusCode) { $response = new Response('', $statusCode); + $response->headers->set('Location', 'https://example.com/'); $response->headers->set('X-Debug-Token', 'xxxxxxxx'); $event = new ResponseEvent($this->createMock(Kernel::class), new Request(), HttpKernelInterface::MAIN_REQUEST, $response); From 7d1026a8e950d416cb5148ae88ac23db5d264839 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Fri, 14 Feb 2025 13:21:59 +0100 Subject: [PATCH 3/3] fix rendering notifier message options --- Resources/views/Collector/notifier.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/views/Collector/notifier.html.twig b/Resources/views/Collector/notifier.html.twig index 9de8d216..ed363f1d 100644 --- a/Resources/views/Collector/notifier.html.twig +++ b/Resources/views/Collector/notifier.html.twig @@ -151,7 +151,7 @@ {%- if message.getOptions() is null %} {{- '(empty)' }} {%- else %} - {{- message.getOptions()|json_encode(constant('JSON_PRETTY_PRINT')) }} + {{- message.getOptions().toArray()|json_encode(constant('JSON_PRETTY_PRINT')) }} {%- endif %}