Skip to content

Fixed issue with duplicate checker by using array_count_values() to determine if a node has the same name #13

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

Open
Sammyjo20 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fixed issue with duplicate checker by using array_count_values() to determine if a node has the same name #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a0303ac
Fixed same name duplicate check by using array_count_values instead
Sammyjo20 May 9, 2021
1688131
Fixed bug with keys
Sammyjo20 May 9, 2021
220da5c
Updated tests
Sammyjo20 May 9, 2021
722a443
Removed unnecesary code
Sammyjo20 May 9, 2021
5c35408
Removed dd()
Sammyjo20 May 9, 2021
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
37 changes: 16 additions & 21 deletions src/XmlToArray.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,50 +44,45 @@ protected function convertAttributes(DOMNamedNodeMap $nodeMap): ?array
return ['_attributes' => $result];
}

protected function isHomogenous(array $arr)
{
$firstValue = current($arr);
foreach ($arr as $val) {
if ($firstValue !== $val) {
return false;
}
}

return true;
}

protected function convertDomElement(DOMElement $element)
{
$sameNames = false;
$result = $this->convertAttributes($element->attributes);

$sameNamesOccurrences = [];

if ($element->childNodes->length > 1) {
$childNodeNames = [];
foreach ($element->childNodes as $key => $node) {

foreach ($element->childNodes as $node) {
$childNodeNames[] = $node->nodeName;
}
$sameNames = $this->isHomogenous($childNodeNames);

$sameNamesOccurrences = array_count_values($childNodeNames);
}

foreach ($element->childNodes as $key => $node) {
foreach ($element->childNodes as $node) {
if ($node instanceof DOMCdataSection) {
$result['_cdata'] = $node->data;

continue;
}

if ($node instanceof DOMText) {
$result = $node->textContent;

continue;
}

if ($node instanceof DOMElement) {
if ($sameNames) {
$result[$node->nodeName][$key] = $this->convertDomElement($node);
} else {
$result[$node->nodeName] = $this->convertDomElement($node);
$nodeName = $node->nodeName;
$hasSameName = array_key_exists($nodeName, $sameNamesOccurrences) && $sameNamesOccurrences[$nodeName] > 1;

if ($hasSameName === false) {
$result[$nodeName] = $this->convertDomElement($node);
continue;
}

continue;
$result[$nodeName][] = $this->convertDomElement($node);
}
}

Expand Down
27 changes: 20 additions & 7 deletions tests/XmlToArrayTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ public function data()
public function sameNameTest(array $array)
{
$xml = ArrayToXml::convert($array, 'items');
$convertedArr = XmlToArray::convert($xml);
$this->assertSame(['items' => $array], XmlToArray::convert($xml));
}

Expand All @@ -83,16 +82,30 @@ public function sameNameData()
'Facilities' => [
'Facility' => [
[
'_attributes' => ['Code'=>'*EC'],
'_cdata' => 'Earliest check-in at 14:00',
'_attributes' => ['Code' => '*EC'],
'_cdata' => 'Earliest check-in at 14:00',
],
[
'_attributes' => ['Code'=>'*LF'],
'_cdata' => '1 lift',
'_attributes' => ['Code' => '*LF'],
'_cdata' => '1 lift',
],
[
'_attributes' => ['Code'=>'*RS'],
'_cdata' => 'Room Service from 18:00 to 21:00',
'_attributes' => ['Code' => '*RS'],
'_cdata' => 'Room Service from 18:00 to 21:00',
],
],
'Locations' => [
[
'_attributes' => ['ShortCode' => 'GB'],
'_cdata' => 'United Kingdom',
],
[
'_attributes' => ['ShortCode' => 'USA'],
'_cdata' => 'United States of America',
],
[
'_attributes' => ['ShortCode' => 'AMS'],
'_cdata' => 'Amsterdam',
],
],
],
Expand Down