Merge branch '2.7' into 2.8

* 2.7:
  [HttpCache] Unlink tmp file on error
  Added LB translation for #26327 (Errors sign for people that do not see colors)
  [TwigBridge] Fix rendering of currency by MoneyType
  [HttpKernel] DumpDataCollector: do not flush when a dumper is provided

Author: fabpot

Resources/views/Form/money_widget.html.php

@@ -1 +1 @@
-<?php echo str_replace('{{ widget }}', $view['form']->block($form, 'form_widget_simple'), $money_pattern) ?>
+<?php echo $view['form']->formEncodeCurrency($money_pattern, $view['form']->block($form, 'form_widget_simple')) ?>

Templating/Helper/FormHelper.php

@@ -260,4 +260,20 @@ public function humanize($text)
     {
         return $this->renderer->humanize($text);
     }
+
+    /**
+     * @internal
+     */
+    public function formEncodeCurrency($text, $widget = '')
+    {
+        if ('UTF-8' === $charset = $this->getCharset()) {
+            $text = htmlspecialchars($text, ENT_QUOTES | (\defined('ENT_SUBSTITUTE') ? ENT_SUBSTITUTE : 0), 'UTF-8');
+        } else {
+            $text = htmlentities($text, ENT_QUOTES | (\defined('ENT_SUBSTITUTE') ? ENT_SUBSTITUTE : 0), 'UTF-8');
+            $text = iconv('UTF-8', $charset, $text);
+            $widget = iconv('UTF-8', $charset, $widget);
+        }
+
+        return str_replace('{{ widget }}', $widget, $text);
+    }
 }

Tests/Templating/Helper/FormHelperDivLayoutTest.php

@@ -85,6 +85,18 @@ public function testStartTagHasActionAttributeWhenActionIsZero()
         $this->assertSame('<form name="form" method="get" action="0">', $html);
     }
 
+    public function testMoneyWidgetInIso()
+    {
+        $this->engine->setCharset('ISO-8859-1');
+
+        $view = $this->factory
+            ->createNamed('name', 'money')
+            ->createView()
+        ;
+
+        $this->assertSame('&euro; <input type="text" id="name" name="name" required="required" />', $this->renderWidget($view));
+    }
+
     protected function renderForm(FormView $view, array $vars = array())
     {
         return (string) $this->engine->get('form')->form($view, $vars);

composer.json

@@ -32,7 +32,7 @@
         "symfony/security-core": "~2.6.13|~2.7.9|~2.8|~3.0.0",
         "symfony/security-csrf": "~2.6|~3.0.0",
         "symfony/stopwatch": "~2.3|~3.0.0",
-        "symfony/templating": "~2.1|~3.0.0",
+        "symfony/templating": "~2.7|~3.0.0",
         "symfony/translation": "~2.8",
         "doctrine/cache": "~1.0",
         "doctrine/annotations": "~1.0"