projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Security update for Core, with self-updated composer
[yaffs-website]
/
vendor
/
symfony
/
serializer
/
Encoder
/
XmlEncoder.php
diff --git
a/vendor/symfony/serializer/Encoder/XmlEncoder.php
b/vendor/symfony/serializer/Encoder/XmlEncoder.php
index e8a24a39d69d06f083bd58a3f8a4834f58497290..ad058118fab3eb95b9269084dbfda5cc5939f83f 100644
(file)
--- a/
vendor/symfony/serializer/Encoder/XmlEncoder.php
+++ b/
vendor/symfony/serializer/Encoder/XmlEncoder.php
@@
-30,15
+30,18
@@
class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec
private $format;
private $context;
private $rootNodeName = 'response';
private $format;
private $context;
private $rootNodeName = 'response';
+ private $loadOptions;
/**
* Construct new XmlEncoder and allow to change the root node element name.
*
/**
* Construct new XmlEncoder and allow to change the root node element name.
*
- * @param string $rootNodeName
+ * @param string $rootNodeName
+ * @param int|null $loadOptions A bit field of LIBXML_* constants
*/
*/
- public function __construct($rootNodeName = 'response')
+ public function __construct($rootNodeName = 'response'
, $loadOptions = null
)
{
$this->rootNodeName = $rootNodeName;
{
$this->rootNodeName = $rootNodeName;
+ $this->loadOptions = null !== $loadOptions ? $loadOptions : LIBXML_NONET | LIBXML_NOBLANKS;
}
/**
}
/**
@@
-81,7
+84,7
@@
class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec
libxml_clear_errors();
$dom = new \DOMDocument();
libxml_clear_errors();
$dom = new \DOMDocument();
- $dom->loadXML($data,
LIBXML_NONET | LIBXML_NOBLANKS
);
+ $dom->loadXML($data,
$this->loadOptions
);
libxml_use_internal_errors($internalErrors);
libxml_disable_entity_loader($disableEntities);
libxml_use_internal_errors($internalErrors);
libxml_disable_entity_loader($disableEntities);