Updated to Drupal 8.6.4, which is PHP 7.3 friendly. Also updated HTMLaw library....

[yaffs-website] / web / core / modules / serialization / src / Encoder / XmlEncoder.php

diff --git a/web/core/modules/serialization/src/Encoder/XmlEncoder.php b/web/core/modules/serialization/src/Encoder/XmlEncoder.php
index 9db6ecde0123c919783aacbfba58f910a87777f0..e41f52b957a1b46935c6b78479a2c841cde60615 100644 (file)
--- a/web/core/modules/serialization/src/Encoder/XmlEncoder.php
+++ b/web/core/modules/serialization/src/Encoder/XmlEncoder.php
@@ -4,16 +4,23 @@ 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;
+use Symfony\Component\Serializer\SerializerAwareInterface;
+use Symfony\Component\Serializer\SerializerAwareTrait;
 
 /**
  * Adds XML support for serializer.
  *
  * This acts as a wrapper class for Symfony's XmlEncoder so that it is not
  * implementing NormalizationAwareInterface, and can be normalized externally.
+ *
+ * @internal
+ *   This encoder should not be used directly. Rather, use the `serializer`
+ *   service.
  */
-class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, DecoderInterface {
+class XmlEncoder implements SerializerAwareInterface, EncoderInterface, DecoderInterface {
+
+  use SerializerAwareTrait;
 
   /**
    * The formats that this Encoder supports.
@@ -56,7 +63,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec
   /**
    * {@inheritdoc}
    */
-  public function encode($data, $format, array $context = []){
+  public function encode($data, $format, array $context = []) {
     return $this->getBaseEncoder()->encode($data, $format, $context);
   }
 
@@ -70,7 +77,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec
   /**
    * {@inheritdoc}
    */
-  public function decode($data, $format, array $context = []){
+  public function decode($data, $format, array $context = []) {
     return $this->getBaseEncoder()->decode($data, $format, $context);
   }