diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature #18036 [Serializer] XmlEncoder: Make load flags configurable (dunglas)

Browse Source 
This PR was squashed before being merged into the 3.1-dev branch (closes #18036).

Discussion
----------

[Serializer] XmlEncoder: Make load flags configurable

| Q             | A
| ------------- | ---
| Branch        | master
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #17987
| License       | MIT
| Doc PR        | todo

Commits
-------

0826068 [Serializer] XmlEncoder: Make load flags configurable
This commit is contained in:
Fabien Potencier 2016-03-31 12:08:54 +02:00
commit b03d370be0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
View File

@ -30,15 +30,18 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec
private $format; private $format;
private $context; private $context;
private $rootNodeName = 'response'; 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(); libxml_clear_errors();
$dom = new \DOMDocument(); $dom = new \DOMDocument();
$dom->loadXML($data, LIBXML_NONET | LIBXML_NOBLANKS); $dom->loadXML($data, $this->loadOptions);
libxml_use_internal_errors($internalErrors); libxml_use_internal_errors($internalErrors);
libxml_disable_entity_loader($disableEntities); libxml_disable_entity_loader($disableEntities);