Merge branch '6.4' into 7.2

nicolas-grekas · nicolas-grekas · commit bf7ef391f8b8 · 2025-02-11T17:46:20.000+01:00
* 6.4:
  [WebProfilerBundle] Fix tests
  [Cache] Tests for Redis Replication with cache
  [BrowserKit] Fix submitting forms with empty file fields
  [WebProfilerBundle] Fix interception for non conventional redirects
  [DependencyInjection] Do not preload functions
  [DependencyInjection] Fix cloned lazy services not sharing their dependencies when dumped with PhpDumper
  [HttpClient] Fix activity tracking leading to negative timeout errors
  [Security] Return null instead of empty username to fix deprecation notice
  [DependencyInjection] Fix env default processor with scalar node
diff --git a/EventListener/WebDebugToolbarListener.php b/EventListener/WebDebugToolbarListener.php
@@ -99,7 +99,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());
diff --git 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('<html><head></head><body></body></html>', $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);
 

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public function onKernelResponse(ResponseEvent $event): void`
`99`	`99`	`return;`
`100`	`100`	`}`
`101`	`101`
`102`		`- if ($response->headers->has('X-Debug-Token') && $response->isRedirect() && $this->interceptRedirects && 'html' === $request->getRequestFormat()) {`
	`102`	`+ if ($response->headers->has('X-Debug-Token') && $response->isRedirect() && $this->interceptRedirects && 'html' === $request->getRequestFormat() && $response->headers->has('Location')) {`
`103`	`103`	`if ($request->hasSession() && ($session = $request->getSession())->isStarted() && $session->getFlashBag() instanceof AutoExpireFlashBag) {`
`104`	`104`	`// keep current flashes for one more request if using AutoExpireFlashBag`
`105`	`105`	`$session->getFlashBag()->setAll($session->getFlashBag()->peekAll());`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ public static function getInjectToolbarTests()`
`63`	`63`	`public function testHtmlRedirectionIsIntercepted($statusCode)`
`64`	`64`	`{`
`65`	`65`	`$response = new Response('Some content', $statusCode);`
	`66`	`+ $response->headers->set('Location', 'https://example.com/');`
`66`	`67`	`$response->headers->set('X-Debug-Token', 'xxxxxxxx');`
`67`	`68`	`$event = new ResponseEvent($this->createMock(Kernel::class), new Request(), HttpKernelInterface::MAIN_REQUEST, $response);`
`68`	`69`
`@@ -76,6 +77,7 @@ public function testHtmlRedirectionIsIntercepted($statusCode)`
`76`	`77`	`public function testNonHtmlRedirectionIsNotIntercepted()`
`77`	`78`	`{`
`78`	`79`	`$response = new Response('Some content', '301');`
	`80`	`+ $response->headers->set('Location', 'https://example.com/');`
`79`	`81`	`$response->headers->set('X-Debug-Token', 'xxxxxxxx');`
`80`	`82`	`$event = new ResponseEvent($this->createMock(Kernel::class), new Request([], [], ['_format' => 'json']), HttpKernelInterface::MAIN_REQUEST, $response);`
`81`	`83`
`@@ -139,6 +141,7 @@ public function testToolbarIsNotInjectedOnContentDispositionAttachment()`
`139`	`141`	`public function testToolbarIsNotInjectedOnRedirection($statusCode)`
`140`	`142`	`{`
`141`	`143`	`$response = new Response('<html><head></head><body></body></html>', $statusCode);`
	`144`	`+ $response->headers->set('Location', 'https://example.com/');`
`142`	`145`	`$response->headers->set('X-Debug-Token', 'xxxxxxxx');`
`143`	`146`	`$event = new ResponseEvent($this->createMock(Kernel::class), new Request(), HttpKernelInterface::MAIN_REQUEST, $response);`
`144`	`147`