minor #17780 [TwigBridge] Symfony 3.1 forward compatibility (xabbuh)

fabpot · fabpot · commit a966a8819dd6 · 2016-02-14T14:09:49.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [TwigBridge] Symfony 3.1 forward compatibility | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #17743 (comment) | License | MIT | Doc PR | Commits ------- 2991639 [TwigBridge] Symfony 3.1 forward compatibility
diff --git a/src/Symfony/Bridge/Twig/Extension/YamlExtension.php b/src/Symfony/Bridge/Twig/Extension/YamlExtension.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bridge\Twig\Extension;
 
 use Symfony\Component\Yaml\Dumper as YamlDumper;
+use Symfony\Component\Yaml\Yaml;
 
 /**
  * Provides integration of the Yaml component with Twig.
@@ -40,7 +41,7 @@ public function encode($input, $inline = 0, $dumpObjects = false)
         }
 
         if (defined('Symfony\Component\Yaml\Yaml::DUMP_OBJECT')) {
-            $dumpObjects = (int) $dumpObjects;
+            return $dumper->dump($input, $inline, 0, is_bool($dumpObjects) ? Yaml::DUMP_OBJECT : 0);
         }
 
         return $dumper->dump($input, $inline, 0, false, $dumpObjects);

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Bridge\Twig\Extension;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Yaml\Dumper as YamlDumper;`
	`15`	`+use Symfony\Component\Yaml\Yaml;`
`15`	`16`
`16`	`17`	`/**`
`17`	`18`	`* Provides integration of the Yaml component with Twig.`
`@@ -40,7 +41,7 @@ public function encode($input, $inline = 0, $dumpObjects = false)`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`if (defined('Symfony\Component\Yaml\Yaml::DUMP_OBJECT')) {`
`43`		`- $dumpObjects = (int) $dumpObjects;`
	`44`	`+ return $dumper->dump($input, $inline, 0, is_bool($dumpObjects) ? Yaml::DUMP_OBJECT : 0);`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`return $dumper->dump($input, $inline, 0, false, $dumpObjects);`