Merge branch '2.3' into 2.7

* 2.3: [TwigBridge] forward compatibility with Yaml 3.1
symfony · Feb 5, 2016 · ae0b5fa · ae0b5fa
2 parents 927fe13 + 01b562b
commit ae0b5fa
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/Symfony/Bridge/Twig/Extension/YamlExtension.php b/src/Symfony/Bridge/Twig/Extension/YamlExtension.php
@@ -39,6 +39,10 @@ public function encode($input, $inline = 0, $dumpObjects = false)
             $dumper = new YamlDumper();
         }
 
+        if (defined('Symfony\Component\Yaml\Yaml::DUMP_OBJECT')) {
+            $dumpObjects = (int) $dumpObjects;
+        }
+
         return $dumper->dump($input, $inline, 0, false, $dumpObjects);
     }