opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Core and composer updates

Browse source
This commit is contained in:
Rob Davies 2017-07-03 16:47:07 +01:00
parent a82634bb98
commit 62cac30480
1118 changed files with 21770 additions and 6306 deletions
Download patch file Download diff file Expand all files Collapse all files

4
web/core/modules/serialization/src/Encoder/XmlEncoder.php
View file

@ -4,6 +4,7 @@ namespace Drupal\serialization\Encoder;
use Symfony\Component\Serializer\Encoder\EncoderInterface;
use Symfony\Component\Serializer\Encoder\DecoderInterface;
use Symfony\Component\Serializer\Encoder\SerializerAwareEncoder;
use Symfony\Component\Serializer\Encoder\XmlEncoder as BaseXmlEncoder;
/**
@ -12,7 +13,7 @@ use Symfony\Component\Serializer\Encoder\XmlEncoder as BaseXmlEncoder;
* This acts as a wrapper class for Symfony's XmlEncoder so that it is not
* implementing NormalizationAwareInterface, and can be normalized externally.
*/
class XmlEncoder implements EncoderInterface, DecoderInterface {
class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, DecoderInterface {
/**
* The formats that this Encoder supports.
@ -37,6 +38,7 @@ class XmlEncoder implements EncoderInterface, DecoderInterface {
public function getBaseEncoder() {
if (!isset($this->baseEncoder)) {
$this->baseEncoder = new BaseXmlEncoder();
$this->baseEncoder->setSerializer($this->serializer);
}
return $this->baseEncoder;