Merge branch '2.8' into 3.0

nicolas-grekas · nicolas-grekas · commit aae8c5587fbd · 2016-02-05T12:35:50.000+01:00
* 2.8:
  [TwigBridge] forward compatibility with Yaml 3.1
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);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,10 @@ public function encode($input, $inline = 0, $dumpObjects = false)`
`39`	`39`	`$dumper = new YamlDumper();`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ if (defined('Symfony\Component\Yaml\Yaml::DUMP_OBJECT')) {`
	`43`	`+ $dumpObjects = (int) $dumpObjects;`
	`44`	`+ }`
	`45`	`+`
`42`	`46`	`return $dumper->dump($input, $inline, 0, false, $dumpObjects);`
`43`	`47`	`}`
`44`	`48`