Merge branch '2.3' into 2.7

* 2.3:
  [TwigBridge] forward compatibility with Yaml 3.1
This commit is contained in:
Nicolas Grekas 2016-02-05 12:35:20 +01:00
commit ae0b5fa382

View File

@ -39,6 +39,10 @@ class YamlExtension extends \Twig_Extension
$dumper = new YamlDumper();
}
if (defined('Symfony\Component\Yaml\Yaml::DUMP_OBJECT')) {
$dumpObjects = (int) $dumpObjects;
}
return $dumper->dump($input, $inline, 0, false, $dumpObjects);
}