Skip to content

[Serializer] Fix XML attributes not added on empty node #52589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabpot merged 1 commit into from
Nov 23, 2023
Merged

[Serializer] Fix XML attributes not added on empty node #52589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,26 +140,22 @@ public function decode(string $data, string $format, array $context = [])
// todo: throw an exception if the root node name is not correctly configured (bc)

if ($rootNode->hasChildNodes()) {
$xpath = new \DOMXPath($dom);
$data = [];
foreach ($xpath->query('namespace::*', $dom->documentElement) as $nsNode) {
$data['@'.$nsNode->nodeName] = $nsNode->nodeValue;
$data = $this->parseXml($rootNode, $context);
if (\is_array($data)) {
$data = $this->addXmlNamespaces($data, $rootNode, $dom);
}

unset($data['@xmlns:xml']);

if (empty($data)) {
return $this->parseXml($rootNode, $context);
}

return array_merge($data, (array) $this->parseXml($rootNode, $context));
return $data;
}

if (!$rootNode->hasAttributes()) {
return $rootNode->nodeValue;
}

return array_merge($this->parseXmlAttributes($rootNode, $context), ['#' => $rootNode->nodeValue]);
$data = array_merge($this->parseXmlAttributes($rootNode, $context), ['#' => $rootNode->nodeValue]);
$data = $this->addXmlNamespaces($data, $rootNode, $dom);

return $data;
}

/**
Expand Down Expand Up @@ -344,6 +340,19 @@ private function parseXmlValue(\DOMNode $node, array $context = [])
return $value;
}

private function addXmlNamespaces(array $data, \DOMNode $node, \DOMDocument $document): array
{
$xpath = new \DOMXPath($document);

foreach ($xpath->query('namespace::*', $node) as $nsNode) {
$data['@'.$nsNode->nodeName] = $nsNode->nodeValue;
}

unset($data['@xmlns:xml']);

return $data;
}

/**
* Parse the data and convert it to DOMElements.
*
Expand Down
11 changes: 11 additions & 0 deletions src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,17 @@ public function testDecodeWithNamespace()
$array = $this->getNamespacedArray();

$this->assertEquals($array, $this->encoder->decode($source, 'xml'));

$source = '<?xml version="1.0"?>'."\n".
'<response xmlns="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app" app:foo="bar">'.
'</response>'."\n";

$this->assertEquals([
'@xmlns' => 'http://www.w3.org/2005/Atom',
'@xmlns:app' => 'http://www.w3.org/2007/app',
'@app:foo' => 'bar',
'#' => '',
], $this->encoder->decode($source, 'xml'));
}

public function testDecodeScalarWithAttribute()
Expand Down