Merge branch '5.4' into 6.4

* 5.4:
  Do not produce notice/warning when consuming from multiple transports and explicitly listed queues
  [FrameworkBundle] Check if the _route attribute exists on the request
  [HttpClient] Make retry strategy work again
  [Mailer] Fix signed emails breaking the profiler
  [Validator] Update Spanish (es) translations
  Fix SQS visibility_timeout type

Author: nicolas-grekas

DataCollector/RouterDataCollector.php

@@ -28,7 +28,7 @@ public function guessRoute(Request $request, mixed $controller): string
             $controller = $controller[0];
         }
 
-        if ($controller instanceof RedirectController) {
+        if ($controller instanceof RedirectController && $request->attributes->has('_route')) {
             return $request->attributes->get('_route');
         }
 

Tests/DataCollector/RouterDataCollectorTest.php

@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DataCollector;
+
+use Symfony\Bundle\FrameworkBundle\Controller\RedirectController;
+use Symfony\Bundle\FrameworkBundle\DataCollector\RouterDataCollector;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\ControllerEvent;
+use Symfony\Component\HttpKernel\KernelInterface;
+
+class RouterDataCollectorTest extends TestCase
+{
+    public function testRouteRedirectControllerNoRouteAtrribute()
+    {
+        $collector = new RouterDataCollector();
+
+        $request = Request::create('http://test.com/foo?bar=baz');
+        $response = new RedirectResponse('http://test.com/redirect');
+
+        $event = $this->createControllerEvent($request);
+
+        $collector->onKernelController($event);
+        $collector->collect($request, $response);
+
+        $this->assertTrue($collector->getRedirect());
+        $this->assertEquals('http://test.com/redirect', $collector->getTargetUrl());
+        $this->assertEquals('n/a', $collector->getTargetRoute());
+    }
+
+    public function testRouteRedirectControllerWithRouteAttribute()
+    {
+        $collector = new RouterDataCollector();
+
+        $request = Request::create('http://test.com/foo?bar=baz');
+        $request->attributes->set('_route', 'current-route');
+
+        $response = new RedirectResponse('http://test.com/redirect');
+
+        $event = $this->createControllerEvent($request);
+
+        $collector->onKernelController($event);
+        $collector->collect($request, $response);
+
+        $this->assertTrue($collector->getRedirect());
+        $this->assertEquals('http://test.com/redirect', $collector->getTargetUrl());
+        $this->assertEquals('current-route', $collector->getTargetRoute());
+    }
+
+    protected function createControllerEvent(Request $request): ControllerEvent
+    {
+        $kernel = $this->createMock(KernelInterface::class);
+
+        return new ControllerEvent($kernel, new RedirectController(), $request, null);
+    }
+}