Merge branch '2.3' into 2.7
* 2.3: [TwigBridge] forward compatibility with Yaml 3.1
This commit is contained in:
commit
ae0b5fa382
@ -39,6 +39,10 @@ class YamlExtension extends \Twig_Extension
|
|||||||
$dumper = new YamlDumper();
|
$dumper = new YamlDumper();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (defined('Symfony\Component\Yaml\Yaml::DUMP_OBJECT')) {
|
||||||
|
$dumpObjects = (int) $dumpObjects;
|
||||||
|
}
|
||||||
|
|
||||||
return $dumper->dump($input, $inline, 0, false, $dumpObjects);
|
return $dumper->dump($input, $inline, 0, false, $dumpObjects);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user