fixup

HeahDude · HeahDude · commit f3458fbdcce0 · 2023-12-09T17:27:13.000+01:00
diff --git a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
@@ -17,6 +17,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Flash\AutoExpireFlashBag;
+use Symfony\Component\HttpFoundation\UrlHelper;
 use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
@@ -47,8 +48,9 @@ class WebDebugToolbarListener implements EventSubscriberInterface
     private string $excludedAjaxPaths;
     private ?ContentSecurityPolicyHandler $cspHandler;
     private ?DumpDataCollector $dumpDataCollector;
+    private ?UrlHelper $urlHelper;
 
-    public function __construct(Environment $twig, bool $interceptRedirects = false, int $mode = self::ENABLED, UrlGeneratorInterface $urlGenerator = null, string $excludedAjaxPaths = '^/bundles|^/_wdt', ContentSecurityPolicyHandler $cspHandler = null, DumpDataCollector $dumpDataCollector = null)
+    public function __construct(Environment $twig, bool $interceptRedirects = false, int $mode = self::ENABLED, UrlGeneratorInterface $urlGenerator = null, string $excludedAjaxPaths = '^/bundles|^/_wdt', ContentSecurityPolicyHandler $cspHandler = null, DumpDataCollector $dumpDataCollector = null, UrlHelper $urlHelper = null)
     {
         $this->twig = $twig;
         $this->urlGenerator = $urlGenerator;
@@ -57,6 +59,7 @@ public function __construct(Environment $twig, bool $interceptRedirects = false,
         $this->excludedAjaxPaths = $excludedAjaxPaths;
         $this->cspHandler = $cspHandler;
         $this->dumpDataCollector = $dumpDataCollector;
+        $this->urlHelper = $urlHelper;
     }
 
     public function isEnabled(): bool
@@ -113,7 +116,12 @@ public function onKernelResponse(ResponseEvent $event): void
                 $session->getFlashBag()->setAll($session->getFlashBag()->peekAll());
             }
 
-            $response->setContent($this->twig->render('@WebProfiler/Profiler/toolbar_redirect.html.twig', ['location' => $response->headers->get('Location'), 'host' => $request->getSchemeAndHttpHost()]));
+            $location = $response->headers->get('Location');
+            $response->setContent($this->twig->render('@WebProfiler/Profiler/toolbar_redirect.html.twig', [
+                'location' => $location,
+                'host' => $request->getSchemeAndHttpHost(),
+                'absolute_url' => $this->urlHelper?->getAbsoluteUrl($location),
+            ]));
             $response->setStatusCode(200);
             $response->headers->remove('Location');
         }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.php b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.php
@@ -25,6 +25,7 @@
                 abstract_arg('paths that should be excluded from the AJAX requests shown in the toolbar'),
                 service('web_profiler.csp.handler'),
                 service('data_collector.dump')->ignoreOnInvalid(),
+                service('url_helper')->ignoreOnInvalid(),
             ])
             ->tag('kernel.event_subscriber')
     ;
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_redirect.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_redirect.html.twig
@@ -39,10 +39,9 @@
             <div class="block-exception">
                 <h1>Redirection Intercepted</h1>
 
-                {% set absolute_url = host in location or not (location starts with '/') ? location : host ~ location %}
-                <p>This request redirects to <strong>{{ absolute_url }}</strong></p>
+                <p>This request redirects to <strong>{{ absolute_url ?? location }}</strong></p>
 
-                <p><a class="btn" href="{{ location }}">Follow redirect</a></p>
+                <p><a class="btn" href="{{ absolute_url ?? location }}">Follow redirect</a></p>
 
                 <p class="sf-redirection-help">
                     The redirect was intercepted by the Symfony Web Debug toolbar to help debugging.

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`abstract_arg('paths that should be excluded from the AJAX requests shown in the toolbar'),`
`26`	`26`	`service('web_profiler.csp.handler'),`
`27`	`27`	`service('data_collector.dump')->ignoreOnInvalid(),`
	`28`	`+ service('url_helper')->ignoreOnInvalid(),`
`28`	`29`	`])`
`29`	`30`	`->tag('kernel.event_subscriber')`
`30`	`31`	`;`