diff --git a/core/modules/serialization/src/Encoder/XmlEncoder.php b/core/modules/serialization/src/Encoder/XmlEncoder.php index 3b19a44da95099eefe692fec607e3cebaab606a5..a4fa0fff627a5c5106e9d92cfc155e72e81b4b8d 100644 --- a/core/modules/serialization/src/Encoder/XmlEncoder.php +++ b/core/modules/serialization/src/Encoder/XmlEncoder.php @@ -9,7 +9,6 @@ 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; /** @@ -18,7 +17,7 @@ * This acts as a wrapper class for Symfony's XmlEncoder so that it is not * implementing NormalizationAwareInterface, and can be normalized externally. */ -class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, DecoderInterface { +class XmlEncoder implements EncoderInterface, DecoderInterface { /** * The formats that this Encoder supports. @@ -61,8 +60,7 @@ public function setBaseEncoder($encoder) { * Implements \Symfony\Component\Serializer\Encoder\EncoderInterface::encode(). */ public function encode($data, $format, array $context = array()){ - $normalized = $this->serializer->normalize($data, $format, $context); - return $this->getBaseEncoder()->encode($normalized, $format, $context); + return $this->getBaseEncoder()->encode($data, $format, $context); } /** diff --git a/core/modules/serialization/tests/src/Unit/Encoder/XmlEncoderTest.php b/core/modules/serialization/tests/src/Unit/Encoder/XmlEncoderTest.php index c48a3ecbb16618caf23f434ac08a0c572cb1989a..b81415424647579a933529edb3a8154bc99c1015 100644 --- a/core/modules/serialization/tests/src/Unit/Encoder/XmlEncoderTest.php +++ b/core/modules/serialization/tests/src/Unit/Encoder/XmlEncoderTest.php @@ -61,17 +61,6 @@ public function testSupportsDecoding() { * Tests the encode() method. */ public function testEncode() { - $serializer = $this->getMockBuilder('Symfony\Component\Serializer\Serializer') - ->disableOriginalConstructor() - ->setMethods(array('normalize')) - ->getMock(); - $serializer->expects($this->once()) - ->method('normalize') - ->with($this->testArray, 'test', array()) - ->will($this->returnValue($this->testArray)); - - $this->encoder->setSerializer($serializer); - $this->baseEncoder->expects($this->once()) ->method('encode') ->with($this->testArray, 'test', array())