Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/Xml/Dom/Traverser/Traverser.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

use DOMNode;
use function VeeWee\Xml\Dom\Locator\Attribute\attributes_list;
use function VeeWee\Xml\Dom\Locator\Node\children;

final class Traverser
{
Expand All @@ -30,7 +31,7 @@ public function traverse(DOMNode $node): DOMNode
$this->traverse($attribute);
}

foreach ($node->childNodes as $child) {
foreach (children($node) as $child) {
$this->traverse($child);
}

Expand Down
2 changes: 0 additions & 2 deletions src/Xml/ErrorHandling/detect_issues.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace VeeWee\Xml\ErrorHandling;

use LibXMLError;
use Psl\Result;
use Psl\Result\ResultInterface;

Expand All @@ -31,7 +30,6 @@ function detect_issues(callable $run): array

$result = Result\wrap($run(...));

/** @var list<LibXMLError> $errors */
$errors = libxml_get_errors();
libxml_clear_errors();
libxml_use_internal_errors($previousErrorReporting);
Expand Down
48 changes: 48 additions & 0 deletions tests/Xml/Dom/Traverser/TraverserTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use VeeWee\Xml\Dom\Traverser\Traverser;
use VeeWee\Xml\Dom\Traverser\Visitor\AbstractVisitor;
use function VeeWee\Xml\Dom\Builder\attribute;
use function VeeWee\Xml\Dom\Configurator\comparable;
use function VeeWee\Xml\Dom\Locator\document_element;
use function VeeWee\Xml\Dom\Mapper\xml_string;
use function VeeWee\Xml\Dom\Predicate\is_attribute;
Expand Down Expand Up @@ -130,4 +131,51 @@ public function onNodeLeave(DOMNode $node): Action

static::assertXmlStringEqualsXmlString($doc->toXmlString(), '<hello enter="yes" leave="yes" />');
}


public function test_it_can_recursively_remove_empty_nodes(): void
{
$doc = Document::fromXmlString(
<<<EOXML
<movies>
<movie>
<name>Terminator</name>
<genre>
<action />
<romance />
</genre>
<prices>
<oscar />
</prices>
</movie>
</movies>
EOXML
);

$transformedNode = $doc->traverse(new class extends AbstractVisitor {
public function onNodeLeave(DOMNode $node): Action
{
if (!is_element($node)) {
return new Action\Noop();
}

if (trim($node->textContent) !== '') {
return new Action\Noop();
}

return new Action\RemoveNode();
}
});

$actual = Document::fromXmlNode($transformedNode, comparable());
$expected = Document::fromXmlString(<<<EOXML
<movies>
<movie>
<name>Terminator</name>
</movie>
</movies>
EOXML, comparable());

static::assertSame($actual->toXmlString(), $expected->toXmlString());
}
}