Merge pull request #21 from zerocrates/xhtml-namespace

Fix `TypeError` when using `Query` on XHTML, and namespace is implicitly used (#20)
laminas · Jun 7, 2022 · 8cc95ab · 8cc95ab
2 parents 5e8571a + 89137c7
commit 8cc95ab
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/Query.php b/src/Query.php
@@ -322,7 +322,7 @@ protected function getNodeList($document, $xpathQuery, ?DOMNode $contextNode = n
     {
         $xpath = new DOMXPath($document);
         foreach ($this->xpathNamespaces as $prefix => $namespaceUri) {
-            $xpath->registerNamespace($prefix, $namespaceUri);
+            $xpath->registerNamespace((string) $prefix, $namespaceUri);
         }
         if ($this->xpathPhpFunctions) {
             $xpath->registerNamespace("php", "http://php.net/xpath");

diff --git a/test/QueryTest.php b/test/QueryTest.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LaminasTest\Dom;
+
+use Laminas\Dom\Query;
+use PHPUnit\Framework\TestCase;
+
+class QueryTest extends TestCase
+{
+    public function testXHTMLNamespaceRegistration()
+    {
+        $xhtml   = '<?xml version="1.0"?><html xmlns="http://www.w3.org/1999/xhtml"></html>';
+        $query   = new Query($xhtml);
+        $results = $query->queryXpath('/*');
+        $this->assertCount(1, $results);
+        $this->assertEquals('html', $results[0]->tagName);
+    }
+}