[FrameworkBundle] Register the YAML encoder in FrameworkBundle

dunglas · dunglas · commit 2ecebeaa6dd9 · 2016-07-12T23:55:45.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -26,6 +26,7 @@
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
+use Symfony\Component\Serializer\Encoder\YamlEncoder;
 use Symfony\Component\Serializer\Mapping\Factory\CacheClassMetadataFactory;
 use Symfony\Component\Serializer\Normalizer\DataUriNormalizer;
 use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
@@ -977,6 +978,12 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
             $definition->addTag('serializer.normalizer', array('priority' => -900));
         }
 
+        if (class_exists(YamlEncoder::class)) {
+            $definition = $container->register('serializer.encoder.yaml', YamlEncoder::class);
+            $definition->setPublic(false);
+            $definition->addTag('serializer.encoder');
+        }
+
         $loader->load('serializer.xml');
         $chainLoader = $container->getDefinition('serializer.mapping.chain_loader');
 
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 = array())
     {
         $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 = array())`
`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`	`/**`