[HttpKernel] [WebProfileBundle] Fix Routing panel for URLs with a colon

akeylimepie · nicolas-grekas · commit 079c8df87421 · 2024-08-08T11:11:47.000+02:00
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php
@@ -83,10 +83,10 @@ public function panelAction(string $token): Response
      */
     private function getTraces(RequestDataCollector $request, string $method): array
     {
-        $traceRequest = Request::create(
-            $request->getPathInfo(),
-            $request->getRequestServer(true)->get('REQUEST_METHOD'),
-            \in_array($request->getMethod(), ['DELETE', 'PATCH', 'POST', 'PUT'], true) ? $request->getRequestRequest()->all() : $request->getRequestQuery()->all(),
+        $traceRequest = new Request(
+            $request->getRequestQuery()->all(),
+            $request->getRequestRequest()->all(),
+            $request->getRequestAttributes()->all(),
             $request->getRequestCookies(true)->all(),
             [],
             $request->getRequestServer(true)->all()
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/RouterControllerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/RouterControllerTest.php
@@ -0,0 +1,48 @@
+<?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\WebProfilerBundle\Tests\Controller;
+
+use Symfony\Bundle\FrameworkBundle\KernelBrowser;
+use Symfony\Bundle\FrameworkBundle\Routing\Router;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Bundle\WebProfilerBundle\Tests\Functional\WebProfilerBundleKernel;
+use Symfony\Component\DomCrawler\Crawler;
+use Symfony\Component\Routing\Route;
+
+class RouterControllerTest extends WebTestCase
+{
+    public function testFalseNegativeTrace()
+    {
+        $path = '/foo/bar:123/baz';
+
+        $kernel = new WebProfilerBundleKernel();
+        $client = new KernelBrowser($kernel);
+        $client->disableReboot();
+        $client->getKernel()->boot();
+
+        /** @var Router $router */
+        $router = $client->getContainer()->get('router');
+        $router->getRouteCollection()->add('route1', new Route($path));
+
+        $client->request('GET', $path);
+
+        $crawler = $client->request('GET', '/_profiler/latest?panel=router&type=request');
+
+        $matchedRouteCell = $crawler
+            ->filter('#router-logs .status-success td')
+            ->reduce(function (Crawler $td) use ($path): bool {
+                return $td->text() === $path;
+            });
+
+        $this->assertSame(1, $matchedRouteCell->count());
+    }
+}
