bug #31349 [WebProfilerBundle] Use absolute URL for profiler links (Alumbrados)

nicolas-grekas · nicolas-grekas · commit 8a220d8225ef · 2019-05-22T16:37:24.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [WebProfilerBundle] Use absolute URL for profiler links | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | n/a | Fixed tickets | n/a | License | MIT | Doc PR | n/a Generate absolute URL's so you can have a different (sub)domain for the profiler and the controller that uses it. Also uses the link which the controller generated instead of always generating a new link in Twig. The changes shouldn't inpact normal behavior. Commits ------- 13ee1fa Use absolute URL for when the profiler's domain differs from the controller's domain which initialises the profiler.
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -164,7 +164,7 @@ public function toolbarAction(Request $request, $token)
 
         $url = null;
         try {
-            $url = $this->generator->generate('_profiler', ['token' => $token]);
+            $url = $this->generator->generate('_profiler', ['token' => $token], UrlGeneratorInterface::ABSOLUTE_URL);
         } catch (\Exception $e) {
             // the profiler is not enabled
         }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig
@@ -1,5 +1,5 @@
 <div class="sf-toolbar-block sf-toolbar-block-{{ name }} sf-toolbar-status-{{ status|default('normal') }} {{ additional_classes|default('') }}" {{ block_attrs|default('')|raw }}>
-    {% if link is not defined or link %}<a href="{{ path('_profiler', { token: token, panel: name }) }}">{% endif %}
+    {% if link is not defined or link %}<a href="{{ url('_profiler', { token: token, panel: name }) }}">{% endif %}
         <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
     {% if link|default(false) %}</a>{% endif %}
         <div class="sf-toolbar-info">{{ text|default('') }}</div>

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public function toolbarAction(Request $request, $token)`
`164`	`164`
`165`	`165`	`$url = null;`
`166`	`166`	`try {`
`167`		`- $url = $this->generator->generate('_profiler', ['token' => $token]);`
	`167`	`+ $url = $this->generator->generate('_profiler', ['token' => $token], UrlGeneratorInterface::ABSOLUTE_URL);`
`168`	`168`	`} catch (\Exception $e) {`
`169`	`169`	`// the profiler is not enabled`
`170`	`170`	`}`