Merge branch '2.7' into 2.8

* 2.7:
  bumped min version of Twig to 1.28

Author: fabpot

composer.json

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.3.9",
         "doctrine/common": "~2.4",
-        "twig/twig": "~1.27|~2.0",
+        "twig/twig": "~1.28|~2.0",
         "psr/log": "~1.0",
         "symfony/security-acl": "~2.7|~3.0.0",
         "symfony/polyfill-apcu": "~1.1",

src/Symfony/Bundle/SecurityBundle/composer.json

@@ -37,7 +37,7 @@
         "symfony/yaml": "~2.0,>=2.0.5|~3.0.0",
         "symfony/expression-language": "~2.6|~3.0.0",
         "doctrine/doctrine-bundle": "~1.2",
-        "twig/twig": "~1.27|~2.0"
+        "twig/twig": "~1.28|~2.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Bundle\\SecurityBundle\\": "" },

src/Symfony/Bundle/TwigBundle/composer.json

@@ -21,7 +21,7 @@
         "symfony/twig-bridge": "~2.7|~3.0.0",
         "symfony/http-foundation": "~2.5|~3.0.0",
         "symfony/http-kernel": "~2.7",
-        "twig/twig": "~1.27|~2.0"
+        "twig/twig": "~1.28|~2.0"
     },
     "require-dev": {
         "symfony/stopwatch": "~2.2|~3.0.0",

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

@@ -110,7 +110,7 @@ public function panelAction(Request $request, $token)
             'panel' => $panel,
             'page' => $page,
             'request' => $request,
-            'templates' => $this->getTemplateManager()->getTemplates($profile),
+            'templates' => $this->getTemplateManager()->getNames($profile),
             'is_ajax' => $request->isXmlHttpRequest(),
             'profiler_markup_version' => 2, // 1 = original profiler, 2 = Symfony 2.8+ profiler
         )), 200, array('Content-Type' => 'text/html'));
@@ -210,7 +210,7 @@ public function toolbarAction(Request $request, $token)
             'request' => $request,
             'position' => $position,
             'profile' => $profile,
-            'templates' => $this->getTemplateManager()->getTemplates($profile),
+            'templates' => $this->getTemplateManager()->getNames($profile),
             'profiler_url' => $url,
             'token' => $token,
             'profiler_markup_version' => 2, // 1 = original toolbar, 2 = Symfony 2.8+ toolbar

src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php

@@ -67,7 +67,9 @@ public function getName(Profile $profile, $panel)
      *
      * @param Profile $profile
      *
-     * @return array
+     * @return Twig_Template[]
+     *
+     * @deprecated not used anymore internally
      */
     public function getTemplates(Profile $profile)
     {
@@ -89,7 +91,7 @@ public function getTemplates(Profile $profile)
      *
      * @throws \UnexpectedValueException
      */
-    protected function getNames(Profile $profile)
+    public function getNames(Profile $profile)
     {
         $templates = array();
 

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

@@ -71,7 +71,11 @@
                 {% if templates is defined %}
                     <ul id="menu-profiler">
                         {% for name, template in templates %}
-                            {% set menu %}{{ template.renderBlock('menu', { collector: profile.getcollector(name), profiler_markup_version: profiler_markup_version }) }}{% endset %}
+                            {% set menu -%}
+                                {% with { collector: profile.getcollector(name), profiler_markup_version: profiler_markup_version } %}
+                                    {{ block('menu', template) }}
+                                {% endwith %}
+                            {%- endset %}
                             {% if menu is not empty %}
                                 <li class="{{ name }} {{ name == panel ? 'selected' : '' }}">
                                     <a href="{{ path('_profiler', { token: token, panel: name }) }}">{{ menu|raw }}</a>

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

@@ -26,14 +26,15 @@
 
 <div id="sfToolbarMainContent-{{ token }}" class="sf-toolbarreset clear-fix" data-no-turbolink>
     {% for name, template in templates %}
-        {{ template.renderblock('toolbar', {
-            'collector': profile.getcollector(name),
-            'profiler_url': profiler_url,
-            'token': profile.token,
-            'name': name,
-            'profiler_markup_version': profiler_markup_version
-          })
-        }}
+        {% with {
+            collector: profile.getcollector(name),
+            profiler_url: profiler_url,
+            token: profile.token,
+            name: name,
+            profiler_markup_version: profiler_markup_version
+          } %}
+            {{ block('toolbar', template) }}
+        {% endwith %}
     {% endfor %}
 
     {% if 'normal' != position %}