Fix @stof's comment

dunglas · dunglas · commit ab8fca38d273 · 2016-07-12T23:34:55.000+02:00
diff --git a/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php b/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php
@@ -26,13 +26,13 @@ class YamlEncoder implements EncoderInterface, DecoderInterface
 
     private $dumper;
     private $parser;
-    private $defaultContext;
+    private $defaultContext = array('yaml_inline' => 0, 'yaml_indent' => 0, 'yaml_flags' => 0);
 
-    public function __construct(Dumper $dumper = null, Parser $parser = null, $defaultContext = array('yaml_inline' => 0, 'yaml_indent' => 0, 'yaml_flags' => 0))
+    public function __construct(Dumper $dumper = null, Parser $parser = null, $defaultContext = [])
     {
         $this->dumper = $dumper ?: new Dumper();
         $this->parser = $parser ?: new Parser();
-        $this->defaultContext = $defaultContext;
+        $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,13 @@ class YamlEncoder implements EncoderInterface, DecoderInterface`
`26`	`26`
`27`	`27`	`private $dumper;`
`28`	`28`	`private $parser;`
`29`		`- private $defaultContext;`
	`29`	`+ private $defaultContext = array('yaml_inline' => 0, 'yaml_indent' => 0, 'yaml_flags' => 0);`
`30`	`30`
`31`		`- public function __construct(Dumper $dumper = null, Parser $parser = null, $defaultContext = array('yaml_inline' => 0, 'yaml_indent' => 0, 'yaml_flags' => 0))`
	`31`	`+ public function __construct(Dumper $dumper = null, Parser $parser = null, $defaultContext = [])`
`32`	`32`	`{`
`33`	`33`	`$this->dumper = $dumper ?: new Dumper();`
`34`	`34`	`$this->parser = $parser ?: new Parser();`
`35`		`- $this->defaultContext = $defaultContext;`
	`35`	`+ $this->defaultContext = array_merge($this->defaultContext, $defaultContext);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/**`