Merge branch '6.4' into 7.0

* 6.4:
  [TwigBridge] foundation 5 layout: use form_label_content block for checkbox and radio labels
  [TwigBridge] Fix compat with Twig v3.9
  [Cache] Sync the Redis proxies with upstream
  [Doctrine Messenger] Fix support for pgsql + pgbouncer.
  [Mailer] Simplify fix
  Do not produce notice/warning when consuming from multiple transports and explicitly listed queues
  [FrameworkBundle] Check if the _route attribute exists on the request
  [Scheduler] fix documentation link
  [PropertyAccess] Fixes getValue() on an unitialized object property on a lazy ghost
  [HttpClient] Make retry strategy work again
  AssetMapper: Remove 'auto-generated' info
  [Mailer] Fix signed emails breaking the profiler
  [Mailer] [Mailgun] Fix expecting payload without tags or user variables
  [Validator] Update Spanish (es) translations
  Fix fetching data in `W3CReferenceTest` on AppVeyor
  Fix SQS visibility_timeout type
  [VarDumper] Fix serialization of stubs with null or uninitialized values

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 <fabien@symfony.com>
+ *
+ * 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);
+    }
+}

composer.json

@@ -71,7 +71,7 @@
         "symfony/uid": "^6.4|^7.0",
         "symfony/web-link": "^6.4|^7.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-        "twig/twig": "~3.8.0"
+        "twig/twig": "^3.0.4"
     },
     "conflict": {
         "doctrine/persistence": "<1.3",