Merge branch '2.8' into 3.2

* 2.8:
  [WebProfilerBundle] Drop dead code

Author: nicolas-grekas

src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php

@@ -47,7 +47,7 @@ class ProfilerController
      * @param string                $toolbarPosition The toolbar position (top, bottom, normal, or null -- use the configuration)
      * @param string                $baseDir         The project root directory
      */
-    public function __construct(UrlGeneratorInterface $generator, Profiler $profiler = null, \Twig_Environment $twig, array $templates, $toolbarPosition = 'normal', ContentSecurityPolicyHandler $cspHandler = null, $baseDir = null)
+    public function __construct(UrlGeneratorInterface $generator, Profiler $profiler = null, \Twig_Environment $twig, array $templates, $toolbarPosition = 'bottom', ContentSecurityPolicyHandler $cspHandler = null, $baseDir = null)
     {
         $this->generator = $generator;
         $this->profiler = $profiler;

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig

@@ -1,15 +1,13 @@
 <!-- START of Symfony Web Debug Toolbar -->
-{% if 'normal' != position %}
-    <div id="sfMiniToolbar-{{ token }}" class="sf-minitoolbar" data-no-turbolink>
-        <a href="#" title="Show Symfony toolbar" tabindex="-1" id="sfToolbarMiniToggler-{{ token }}" accesskey="D">
-            {{ include('@WebProfiler/Icon/symfony.svg') }}
-        </a>
-    </div>
-    <style{% if csp_style_nonce %} nonce="{{ csp_style_nonce }}"{% endif %}>
-        {{ include('@WebProfiler/Profiler/toolbar.css.twig', { 'position': position, 'floatable': true }) }}
-    </style>
-    <div id="sfToolbarClearer-{{ token }}" class="sf-toolbar-clearer"></div>
-{% endif %}
+<div id="sfMiniToolbar-{{ token }}" class="sf-minitoolbar" data-no-turbolink>
+    <a href="#" title="Show Symfony toolbar" tabindex="-1" id="sfToolbarMiniToggler-{{ token }}" accesskey="D">
+        {{ include('@WebProfiler/Icon/symfony.svg') }}
+    </a>
+</div>
+<style{% if csp_style_nonce %} nonce="{{ csp_style_nonce }}"{% endif %}>
+    {{ include('@WebProfiler/Profiler/toolbar.css.twig', { 'position': position, 'floatable': true }) }}
+</style>
+<div id="sfToolbarClearer-{{ token }}" class="sf-toolbar-clearer"></div>
 
 <div id="sfToolbarMainContent-{{ token }}" class="sf-toolbarreset clear-fix" data-no-turbolink>
     {% for name, template in templates %}
@@ -28,10 +26,8 @@
         {% endif %}
     {% endfor %}
 
-    {% if 'normal' != position %}
-        <a class="hide-button" id="sfToolbarHideButton-{{ token }}" title="Close Toolbar" tabindex="-1" accesskey="D">
-            {{ include('@WebProfiler/Icon/close.svg') }}
-        </a>
-    {% endif %}
+    <a class="hide-button" id="sfToolbarHideButton-{{ token }}" title="Close Toolbar" tabindex="-1" accesskey="D">
+        {{ include('@WebProfiler/Icon/close.svg') }}
+    </a>
 </div>
 <!-- END of Symfony Web Debug Toolbar -->