Skip to content

fix: fixed interpretations with new lines and carrigage returns #17

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
Bjaskular wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix: fixed interpretations with new lines and carrigage returns #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43f25b9
fix: fixed xml interpretations with newlines and caret tags
Bjaskular May 3, 2023
a13f782
clear: Style CI fixes
Bjaskular May 3, 2023
0e3bbf4
clear: Style CI fixes
Bjaskular May 3, 2023
54f4fe8
clear: Style CI fixes
Bjaskular May 3, 2023
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
2 changes: 2 additions & 0 deletions src/XmlToArray.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public function __construct(string $xml)

public static function convert(string $xml): array
{
$xml = trim(preg_replace('/\s\s+/', '', $xml));

$converter = new static($xml);

return $converter->toArray();
Expand Down
51 changes: 49 additions & 2 deletions tests/XmlToArrayTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class XmlToArrayTest extends TestCase
public function test(array $array)
{
$xml = ArrayToXml::convert($array, 'items');

$this->assertSame(['items' => $array], XmlToArray::convert($xml));
}

Expand Down Expand Up @@ -70,13 +71,16 @@ public function data()
* @dataProvider sameNameData
*
* @param array $array
*
* @test
*/
public function sameNameTest(array $array)
{
$xml = ArrayToXml::convert($array, 'items');

$convertedArr = XmlToArray::convert($xml);
$this->assertSame(['items' => $array], XmlToArray::convert($xml));

$this->assertSame(['items' => $array], $convertedArr);
}

public function sameNameData()
Expand Down Expand Up @@ -109,13 +113,16 @@ public function sameNameData()
* @dataProvider sameMultiDimensionalData
*
* @param array $array
*
* @test
*/
public function sameMultiDimensionalTest(array $array)
{
$xml = ArrayToXml::convert($array, 'items');

$convertedArr = XmlToArray::convert($xml);
$this->assertSame(['items' => $array], XmlToArray::convert($xml));

$this->assertSame(['items' => $array], $convertedArr);
}

public function sameMultiDimensionalData()
Expand All @@ -139,4 +146,44 @@ public function sameMultiDimensionalData()
],
];
}

/**
* @dataProvider sameMultiDimensionalData
*
* @test
*/
public function convert_WhenXmlHasNewLinesAndCarrigageReturns_ShouldCorrectConvertToArray(array $array)
{
$xml = "
<?xml version=\"1.0\"?> \r\n
<root> \r\n
<Good_guys> \r\n
<Guy> \r\n
<name>Luke Skywalker</name> \r\n
<weapon>Lightsaber</weapon> \r\n
</Guy> \r\n
<Guy> \r\n
<name>Captain America</name> \r\n
<weapon>Shield</weapon> \r\n
</Guy> \r\n
</Good_guys> \r\n
<Bad_guys> \r\n
<Guy> \r\n
<name>Sauron</name> \r\n
<weapon>Evil Eye</weapon> \r\n
</Guy> \r\n
<Guy> \r\n
<name>Darth Vader</name> \r\n
<weapon>Lightsaber</weapon> \r\n
</Guy> \r\n
</Bad_guys> \r\n
</root>
";

$arrayExpected['root'] = $array;

$convertedArr = XmlToArray::convert($xml);

$this->assertSame($arrayExpected, $convertedArr);
}
}