Merge branch '2.8' into 3.1

nicolas-grekas · nicolas-grekas · commit a5c9ca7af61f · 2016-08-31T10:07:33.000+02:00
* 2.8:
  [VarDumper] Various minor fixes &amp; cleanups
  Revert "bug #18935 [Form] Consider a violation even if the form is not submitted (egeloen)"
  [HttpKernel] Add missing SsiFragmentRendererTest
  [DoctrineBridge] Fix exception message and tests after misresolved merge
  Fixes the calendar in constructor to handle null
diff --git a/Extension/DumpExtension.php b/Extension/DumpExtension.php
@@ -67,7 +67,7 @@ public function dump(\Twig_Environment $env, $context)
         }
 
         $dump = fopen('php://memory', 'r+b');
-        $dumper = new HtmlDumper($dump);
+        $dumper = new HtmlDumper($dump, $env->getCharset());
 
         foreach ($vars as $value) {
             $dumper->dump($this->cloner->cloneVar($value));

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function dump(\Twig_Environment $env, $context)`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`$dump = fopen('php://memory', 'r+b');`
`70`		`- $dumper = new HtmlDumper($dump);`
	`70`	`+ $dumper = new HtmlDumper($dump, $env->getCharset());`
`71`	`71`
`72`	`72`	`foreach ($vars as $value) {`
`73`	`73`	`$dumper->dump($this->cloner->cloneVar($value));`