Skip to content

Commit 2c60af4

Browse files
Merge branch '3.1'
* 3.1: [VarDumper] Various minor fixes & cleanups Revert "bug #18935 [Form] Consider a violation even if the form is not submitted (egeloen)" [Config] Fix DirectoryResourceTest for symlinks [HttpKernel] Add missing SsiFragmentRendererTest [DoctrineBridge] Fix exception message and tests after misresolved merge Fixes the calendar in constructor to handle null
2 parents ee849d0 + a5c9ca7 commit 2c60af4

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

Extension/DumpExtension.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public function dump(\Twig_Environment $env, $context)
6969
}
7070

7171
$dump = fopen('php://memory', 'r+b');
72+
$this->dumper->setCharset($env->getCharset());
7273

7374
foreach ($vars as $value) {
7475
$this->dumper->dump($this->cloner->cloneVar($value), $dump);

0 commit comments

Comments
 (0)