foo
diff --git a/ext/dom/tests/modern/html/parser/HTMLDocument_fromString_parser_warning_03.phpt b/ext/dom/tests/modern/html/parser/HTMLDocument_fromString_parser_warning_03.phpt
index 2de4b36e2ef..496bbd9ad67 100644
--- a/ext/dom/tests/modern/html/parser/HTMLDocument_fromString_parser_warning_03.phpt
+++ b/ext/dom/tests/modern/html/parser/HTMLDocument_fromString_parser_warning_03.phpt
@@ -1,13 +1,13 @@
--TEST--
-DOM\HTMLDocument::createFromString() - parser warning 03
+Dom\HTMLDocument::createFromString() - parser warning 03
--EXTENSIONS--
dom
--FILE--
saveHTML(), "\n";
+$dom = Dom\HTMLDocument::createFromString($html, LIBXML_NOERROR);
+echo $dom->saveHtml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/parser/HTMLDocument_fromString_parser_warning_internal_error.phpt b/ext/dom/tests/modern/html/parser/HTMLDocument_fromString_parser_warning_internal_error.phpt
index 44dac9eb539..84ac73e2860 100644
--- a/ext/dom/tests/modern/html/parser/HTMLDocument_fromString_parser_warning_internal_error.phpt
+++ b/ext/dom/tests/modern/html/parser/HTMLDocument_fromString_parser_warning_internal_error.phpt
@@ -1,5 +1,5 @@
--TEST--
-DOM\HTMLDocument::createFromString() - parser warning via internal error
+Dom\HTMLDocument::createFromString() - parser warning via internal error
--EXTENSIONS--
dom
--FILE--
@@ -8,7 +8,7 @@ dom
libxml_use_internal_errors(true);
$html = '<>x ';
-$dom = DOM\HTMLDocument::createFromString($html);
+$dom = Dom\HTMLDocument::createFromString($html);
foreach (libxml_get_errors() as $error) {
var_dump($error->message, $error->line, $error->column);
}
diff --git a/ext/dom/tests/modern/html/parser/HTMLDocument_fromString_without_body.phpt b/ext/dom/tests/modern/html/parser/HTMLDocument_fromString_without_body.phpt
index 047c1864084..fd5a2366cca 100644
--- a/ext/dom/tests/modern/html/parser/HTMLDocument_fromString_without_body.phpt
+++ b/ext/dom/tests/modern/html/parser/HTMLDocument_fromString_without_body.phpt
@@ -1,12 +1,12 @@
--TEST--
-DOM\HTMLDocument::createFromString() - document without body
+Dom\HTMLDocument::createFromString() - document without body
--EXTENSIONS--
dom
--FILE--
foo '
');
-echo $dom->saveHTML(), "\n";
+$dom = Dom\HTMLDocument::createFromString('foo '
');
+echo $dom->saveHtml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/parser/HTMLDocument_parse_options.phpt b/ext/dom/tests/modern/html/parser/HTMLDocument_parse_options.phpt
index c1e281b5331..0d3ad1a474a 100644
--- a/ext/dom/tests/modern/html/parser/HTMLDocument_parse_options.phpt
+++ b/ext/dom/tests/modern/html/parser/HTMLDocument_parse_options.phpt
@@ -1,5 +1,5 @@
--TEST--
-DOM\HTMLDocument: loading $options check
+Dom\HTMLDocument: loading $options check
--EXTENSIONS--
dom
--FILE--
@@ -30,7 +30,7 @@ foreach (["createFromString", "createFromFile"] as $method) {
foreach ($tested_options as $options) {
var_dump($options);
try {
- DOM\HTMLDocument::{$method}("x", $options);
+ Dom\HTMLDocument::{$method}("x", $options);
} catch (ValueError $e) {
echo $e->getMessage(), "\n";
}
@@ -41,67 +41,67 @@ foreach (["createFromString", "createFromFile"] as $method) {
--EXPECTF--
--- Method createFromString ---
int(%d)
-DOM\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(4194304)
-DOM\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(524288)
-DOM\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(8)
-DOM\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(4)
-DOM\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(16)
-DOM\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(4)
-DOM\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(256)
-DOM\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(16384)
-DOM\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(4)
-DOM\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(2)
-DOM\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(1024)
-DOM\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(1)
-DOM\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(2048)
-DOM\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(64)
-DOM\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(128)
-DOM\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
--- Method createFromFile ---
int(%d)
-DOM\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(4194304)
-DOM\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(524288)
-DOM\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(8)
-DOM\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(4)
-DOM\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(16)
-DOM\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(4)
-DOM\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(256)
-DOM\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(16384)
-DOM\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(4)
-DOM\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(2)
-DOM\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(1024)
-DOM\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(1)
-DOM\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(2048)
-DOM\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(64)
-DOM\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
int(128)
-DOM\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, DOM\NO_DEFAULT_NS)
+Dom\HTMLDocument::createFromFile(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_NOERROR, LIBXML_COMPACT, LIBXML_HTML_NOIMPLIED, Dom\NO_DEFAULT_NS)
diff --git a/ext/dom/tests/modern/html/parser/predefined_namespaces.phpt b/ext/dom/tests/modern/html/parser/predefined_namespaces.phpt
index a97385de37d..7e78460454e 100644
--- a/ext/dom/tests/modern/html/parser/predefined_namespaces.phpt
+++ b/ext/dom/tests/modern/html/parser/predefined_namespaces.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
@@ -28,7 +28,7 @@ $dom = DOM\HTMLDocument::createFromString(<<query("//*[name()='body']//*") as $node) {
echo $node->nodeName, " ", $node->namespaceURI ?? "(NONE)", "\n";
foreach ($node->attributes as $attribute) {
@@ -37,9 +37,9 @@ foreach ($xpath->query("//*[name()='body']//*") as $node) {
}
echo "--- HTML serialization ---\n";
-echo $dom->saveHTML(), "\n";
+echo $dom->saveHtml(), "\n";
echo "--- XML serialization ---\n";
-echo $dom->saveXML();
+echo $dom->saveXml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/parser/user_error_handler.phpt b/ext/dom/tests/modern/html/parser/user_error_handler.phpt
index 86b5a6d28f5..d02100cfcbe 100644
--- a/ext/dom/tests/modern/html/parser/user_error_handler.phpt
+++ b/ext/dom/tests/modern/html/parser/user_error_handler.phpt
@@ -11,9 +11,9 @@ set_error_handler(function ($errno, $errstr, $errfile, $errline) {
var_dump($errno, $errstr);
}, E_WARNING);
-DOM\HTMLDocument::createFromString('');
+Dom\HTMLDocument::createFromString('');
?>
--EXPECT--
int(2)
-string(113) "DOM\HTMLDocument::createFromString(): tree error unexpected-token-in-initial-mode in Entity, line: 1, column: 2-5"
+string(113) "Dom\HTMLDocument::createFromString(): tree error unexpected-token-in-initial-mode in Entity, line: 1, column: 2-5"
diff --git a/ext/dom/tests/modern/html/parser/xml_style_namespace.phpt b/ext/dom/tests/modern/html/parser/xml_style_namespace.phpt
index 3889d1fd2ff..9657ac3b780 100644
--- a/ext/dom/tests/modern/html/parser/xml_style_namespace.phpt
+++ b/ext/dom/tests/modern/html/parser/xml_style_namespace.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
@@ -18,7 +18,7 @@ $dom = DOM\HTMLDocument::createFromString(<<query("//*[name()='body']//*") as $node) {
echo $node->nodeName, " ", $node->namespaceURI ?? "(NONE)", "\n";
echo "prefix: \"", $node->prefix, "\"\n";
@@ -28,9 +28,9 @@ foreach ($xpath->query("//*[name()='body']//*") as $node) {
}
echo "--- HTML serialization ---\n";
-echo $dom->saveHTML(), "\n";
+echo $dom->saveHtml(), "\n";
echo "--- XML serialization ---\n";
-echo $dom->saveXML();
+echo $dom->saveXml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_entity_reference.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_entity_reference.phpt
index 108c3834678..2479e39306f 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_entity_reference.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_entity_reference.phpt
@@ -9,11 +9,11 @@ $dom1 = new DOMDocument();
$root = $dom1->appendChild($dom1->createElement('root'));
$root->appendChild($dom1->createEntityReference('nbsp'));
-$dom2 = DOM\HTMLDocument::createEmpty();
+$dom2 = Dom\HTMLDocument::createEmpty();
$dom2->appendChild($dom2->importLegacyNode($root, true));
-echo $dom2->saveXML(), "\n";
-echo $dom2->saveHTML(), "\n";
+echo $dom2->saveXml(), "\n";
+echo $dom2->saveHtml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_escape_attribute.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_escape_attribute.phpt
index d4a888bffe8..4953deabf0e 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_escape_attribute.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_escape_attribute.phpt
@@ -1,14 +1,14 @@
--TEST--
-DOM\HTMLDocument serialization escape attribute
+Dom\HTMLDocument serialization escape attribute
--EXTENSIONS--
dom
--FILE--
", LIBXML_NOERROR);
+$dom = Dom\HTMLDocument::createFromString("", LIBXML_NOERROR);
$p = $dom->documentElement->firstChild->nextSibling->firstChild;
$p->setAttribute("foo", "\"'&");
-echo $dom->saveHTML();
+echo $dom->saveHtml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_escape_nbsp.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_escape_nbsp.phpt
index c7b11a7a4c7..accbec630cf 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_escape_nbsp.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_escape_nbsp.phpt
@@ -1,12 +1,12 @@
--TEST--
-DOM\HTMLDocument serialization escape nbsp
+Dom\HTMLDocument serialization escape nbsp
--EXTENSIONS--
dom
--FILE--
these must transform: \xc2\xa0\xc2\xa0 but these not: \xa0|\xc2...
", LIBXML_NOERROR);
-echo $dom->saveHTML();
+$dom = Dom\HTMLDocument::createFromString("these must transform: \xc2\xa0\xc2\xa0 but these not: \xa0|\xc2...
", LIBXML_NOERROR);
+echo $dom->saveHtml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_attribute_ns.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_attribute_ns.phpt
index dc8881bfc6a..66459d0e728 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_attribute_ns.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_attribute_ns.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\HTMLDocument serialization of an attribute in a namespace
+Dom\HTMLDocument serialization of an attribute in a namespace
--EXTENSIONS--
dom
--FILE--
appendChild($dom->createElement("root"));
$root->setAttributeNodeNS($dom->createAttributeNS("http://php.net", "x:foo"));
$root->setAttributeNodeNS($dom->createAttributeNS("http://www.w3.org/XML/1998/namespace", "y:id"));
@@ -14,7 +14,7 @@ $root->setAttributeNodeNS($dom->createAttributeNS("http://www.w3.org/2000/xmlns/
$root->setAttributeNodeNS($dom->createAttributeNS("http://www.w3.org/1999/xlink", "z:f"));
// Note: XML declarations are not emitted in HTML5
-echo $dom->saveHTML();
+echo $dom->saveHtml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_cdata.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_cdata.phpt
index 27824c61eee..f379a61dfec 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_cdata.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_cdata.phpt
@@ -1,18 +1,18 @@
--TEST--
-DOM\HTMLDocument serialization of CData
+Dom\HTMLDocument serialization of CData
--EXTENSIONS--
dom
--FILE--
createCDATASection("foobaré\"<>-&");
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$container = $dom->appendChild($dom->createElement("container"));
$container->appendChild($dom->importNode($cdata));
-echo $dom->saveHTML();
+echo $dom->saveHtml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_comment.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_comment.phpt
index 4abc382a3ae..4afe4a32f06 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_comment.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_comment.phpt
@@ -1,13 +1,13 @@
--TEST--
-DOM\HTMLDocument serialization of comment
+Dom\HTMLDocument serialization of comment
--EXTENSIONS--
dom
--FILE--
appendChild($dom->createComment("foobaré\"<>-&"));
-echo $dom->saveHTML();
+echo $dom->saveHtml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_doctype.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_doctype.phpt
index 5be17d70419..49d0e566e29 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_doctype.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_doctype.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\HTMLDocument serialization of document type
+Dom\HTMLDocument serialization of document type
--EXTENSIONS--
dom
--FILE--
@@ -16,10 +16,10 @@ $dom = DOM\HTMLDocument::createFromString(<<saveXML(), "\n";
+echo $dom->saveXml(), "\n";
echo "--- HTML encoding ---\n";
// We don't expect to see the public ID and the system ID because the serialization algorithm doesn't serialize those
-echo $dom->saveHTML(), "\n";
+echo $dom->saveHtml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_element_ns.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_element_ns.phpt
index 03813a62520..8d23e09dedb 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_element_ns.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_element_ns.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\HTMLDocument serialization of element in a namespace
+Dom\HTMLDocument serialization of element in a namespace
--EXTENSIONS--
dom
--FILE--
appendChild($dom->createElement("root"));
$root->append("\n");
@@ -16,7 +16,7 @@ $root->append($dom->createElementNS("http://www.w3.org/2000/svg", "s:svg"), "\n"
$root->append($dom->createElementNS("http://www.w3.org/1998/Math/MathML", "m:math"), "\n");
// Note: XML declarations are not emitted in HTML5
-echo $dom->saveHTML();
+echo $dom->saveHtml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_failing_stream.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_failing_stream.phpt
index 7241c34f775..c02b02a3469 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_failing_stream.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_failing_stream.phpt
@@ -1,5 +1,5 @@
--TEST--
-DOM\HTMLDocument serialization with a failing stream
+Dom\HTMLDocument serialization with a failing stream
--EXTENSIONS--
dom
--FILE--
@@ -33,9 +33,9 @@ class FailingWrapper {
stream_wrapper_register("failing", "FailingWrapper");
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$root = $dom->appendChild($dom->createElement("root"));
-$dom->saveHTMLFile("failing://foo");
+$dom->saveHtmlFile("failing://foo");
?>
--EXPECTF--
@@ -44,6 +44,6 @@ string(1) "<"
Fatal error: Uncaught Error: fail in %s:%d
Stack trace:
#0 [internal function]: FailingWrapper->stream_write('root')
-#1 %s(%d): DOM\HTMLDocument->saveHTMLFile('failing://foo')
+#1 %s(%d): Dom\HTMLDocument->saveHtmlFile('failing://foo')
#2 {main}
thrown in %s on line %d
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_fragment.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_fragment.phpt
index 69c47eca4ac..ca1e1fa3964 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_fragment.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_fragment.phpt
@@ -1,17 +1,17 @@
--TEST--
-DOM\HTMLDocument serialization of document fragment
+Dom\HTMLDocument serialization of document fragment
--EXTENSIONS--
dom
--FILE--
createDocumentFragment();
$fragment->appendChild($dom->createElement("foo"));
$bar = $fragment->appendChild($dom->createElement("bar"));
$fragment->appendChild($dom->createElement("baz"));
$bar->appendChild($dom->createElement("inner"));
-echo $dom->saveHTML($fragment);
+echo $dom->saveHtml($fragment);
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_full_document.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_full_document.phpt
index 28fb38024a7..f0dcf1ad5f0 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_full_document.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_full_document.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\HTMLDocument serialization of full document
+Dom\HTMLDocument serialization of full document
--EXTENSIONS--
dom
--FILE--
@@ -27,7 +27,7 @@ $dom = DOM\HTMLDocument::createFromString(<<
HTML);
-echo $dom->saveHTML();
+echo $dom->saveHtml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_01.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_01.phpt
index 76321f47380..d0b97e5304c 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_01.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_01.phpt
@@ -1,24 +1,24 @@
--TEST--
-DOM\HTMLDocument serialization with an imported namespace node 01
+Dom\HTMLDocument serialization with an imported namespace node 01
--EXTENSIONS--
dom
--FILE--
');
+$xml = Dom\XMLDocument::createFromString('');
$xml->documentElement->setAttributeNS("http://foo/", "foo:bar", "value");
$xml->documentElement->appendChild($xml->createElementNS('some:ns2', 'child'));
-echo $xml->saveXML(), "\n";
+echo $xml->saveXml(), "\n";
echo "--- After import into HTML ---\n";
-$html = DOM\HTMLDocument::createFromString('foo
', LIBXML_NOERROR);
+$html = Dom\HTMLDocument::createFromString('foo
', LIBXML_NOERROR);
$p = $html->documentElement->firstChild->nextSibling->firstChild;
$p->appendChild($html->importNode($xml->documentElement, true));
-echo $html->saveXML(), "\n";
-echo $html->saveHTML(), "\n";
+echo $html->saveXml(), "\n";
+echo $html->saveHtml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_02.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_02.phpt
index 94af74ffaeb..2460bb3426e 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_02.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_02.phpt
@@ -1,23 +1,23 @@
--TEST--
-DOM\HTMLDocument serialization with an imported namespace node 02
+Dom\HTMLDocument serialization with an imported namespace node 02
--EXTENSIONS--
dom
--FILE--
documentElement->appendChild($xml->createElementNS('some:ns2', 'child'));
-echo $xml->saveXML(), "\n";
+echo $xml->saveXml(), "\n";
echo "--- After import into HTML ---\n";
-$html = DOM\HTMLDocument::createFromString('foo
', LIBXML_NOERROR);
+$html = Dom\HTMLDocument::createFromString('foo
', LIBXML_NOERROR);
$p = $html->documentElement->firstChild->nextSibling->firstChild;
$p->appendChild($html->importNode($xml->documentElement, true));
-echo $html->saveXML(), "\n";
-echo $html->saveHTML(), "\n";
+echo $html->saveXml(), "\n";
+echo $html->saveHtml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_03.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_03.phpt
index 7f5b9ab822f..9314c8d200d 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_03.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_03.phpt
@@ -1,23 +1,23 @@
--TEST--
-DOM\HTMLDocument serialization with an imported namespace node 03
+Dom\HTMLDocument serialization with an imported namespace node 03
--EXTENSIONS--
dom
--FILE--
documentElement->appendChild($xml->createElementNS('some:ns2', 'child'));
-echo $xml->saveXML(), "\n";
+echo $xml->saveXml(), "\n";
echo "--- After import into HTML ---\n";
-$html = DOM\HTMLDocument::createFromString('foo
', LIBXML_NOERROR);
+$html = Dom\HTMLDocument::createFromString('foo
', LIBXML_NOERROR);
$p = $html->documentElement->firstChild->nextSibling->firstChild;
$p->appendChild($html->importNode($xml->documentElement, false));
-echo $html->saveXML(), "\n";
-echo $html->saveHTML(), "\n";
+echo $html->saveXml(), "\n";
+echo $html->saveHtml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_04.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_04.phpt
index d4ae507c761..39dcb53353a 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_04.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_04.phpt
@@ -1,23 +1,23 @@
--TEST--
-DOM\HTMLDocument serialization with an imported namespace node 04
+Dom\HTMLDocument serialization with an imported namespace node 04
--EXTENSIONS--
dom
--FILE--
documentElement->appendChild($xml->createElementNS('some:ns2', 'child'));
-echo $xml->saveXML(), "\n";
+echo $xml->saveXml(), "\n";
echo "--- After import into HTML ---\n";
-$html = DOM\HTMLDocument::createFromString('foo
', LIBXML_NOERROR);
+$html = Dom\HTMLDocument::createFromString('foo
', LIBXML_NOERROR);
$p = $html->documentElement->firstChild->nextSibling->firstChild;
$p->appendChild($html->importNode($xml->documentElement, false));
-echo $html->saveXML(), "\n";
-echo $html->saveHTML(), "\n";
+echo $html->saveXml(), "\n";
+echo $html->saveHtml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_05.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_05.phpt
index 2e9fd671775..8bebf2bc195 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_05.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_05.phpt
@@ -1,23 +1,23 @@
--TEST--
-DOM\HTMLDocument serialization with an imported namespace node 05
+Dom\HTMLDocument serialization with an imported namespace node 05
--EXTENSIONS--
dom
--FILE--
documentElement->appendChild($xml->createElementNS('some:ns2', 'child'));
-echo $xml->saveXML(), "\n";
+echo $xml->saveXml(), "\n";
echo "--- After adoption into HTML ---\n";
-$html = DOM\HTMLDocument::createFromString('foo
', LIBXML_NOERROR);
+$html = Dom\HTMLDocument::createFromString('foo
', LIBXML_NOERROR);
$p = $html->documentElement->firstChild->nextSibling->firstChild;
$p->appendChild($html->adoptNode($xml->documentElement));
-echo $html->saveXML(), "\n";
-echo $html->saveHTML(), "\n";
+echo $html->saveXml(), "\n";
+echo $html->saveHtml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_06.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_06.phpt
index 753fa73633b..7b5db990187 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_06.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_ns_imported_06.phpt
@@ -1,23 +1,23 @@
--TEST--
-DOM\HTMLDocument serialization with an imported namespace node 06
+Dom\HTMLDocument serialization with an imported namespace node 06
--EXTENSIONS--
dom
--FILE--
documentElement->firstElementChild->appendChild($xml->createElementNS('some:ns2', 'child'));
-echo $xml->saveXML(), "\n";
+echo $xml->saveXml(), "\n";
echo "--- After clone + import into HTML ---\n";
-$html = DOM\HTMLDocument::createFromString('foo
', LIBXML_NOERROR);
+$html = Dom\HTMLDocument::createFromString('foo
', LIBXML_NOERROR);
$p = $html->documentElement->firstElementChild->nextElementSibling->firstElementChild;
$p->appendChild($html->adoptNode($xml->documentElement->firstElementChild->cloneNode(true)));
-echo $html->saveXML(), "\n";
-echo $html->saveHTML(), "\n";
+echo $html->saveXml(), "\n";
+echo $html->saveHtml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_processing_instruction.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_processing_instruction.phpt
index c45bef620fa..54de87ef2e5 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_processing_instruction.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_processing_instruction.phpt
@@ -1,14 +1,14 @@
--TEST--
-DOM\HTMLDocument serialization of processing instruction
+Dom\HTMLDocument serialization of processing instruction
--EXTENSIONS--
dom
--FILE--
in a processing instruction element but that breaks (as expected)
$dom->appendChild($dom->createProcessingInstruction("target", "foobaré\"&<\xc2\xa0"));
-echo $dom->saveHTML();
+echo $dom->saveHtml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_roots.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_roots.phpt
index 5b5959e5adb..b61e52510a0 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_roots.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_roots.phpt
@@ -1,15 +1,15 @@
--TEST--
-DOM\HTMLDocument serialization of different roots
+Dom\HTMLDocument serialization of different roots
--EXTENSIONS--
dom
--FILE--
createCDATASection("cdata");
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$container = $dom->appendChild($dom->createElement("container"));
$comment = $container->appendChild($dom->createComment("comment"));
$cdata = $container->appendChild($dom->importNode($cdata));
@@ -18,12 +18,12 @@ $text = $container->appendChild($dom->createTextNode("text"));
$pi = $container->appendChild($dom->createProcessingInstruction("target", "data"));
$fragment = $dom->createDocumentFragment();
-var_dump($dom->saveHTML($comment));
-var_dump($dom->saveHTML($cdata));
-var_dump($dom->saveHTML($emptyElement));
-var_dump($dom->saveHTML($text));
-var_dump($dom->saveHTML($pi));
-var_dump($dom->saveHTML($fragment));
+var_dump($dom->saveHtml($comment));
+var_dump($dom->saveHtml($cdata));
+var_dump($dom->saveHtml($emptyElement));
+var_dump($dom->saveHtml($text));
+var_dump($dom->saveHtml($pi));
+var_dump($dom->saveHtml($fragment));
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_text_01.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_text_01.phpt
index 025bee90ced..d37a43a4a42 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_text_01.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_text_01.phpt
@@ -1,14 +1,14 @@
--TEST--
-DOM\HTMLDocument serialization escape text 01
+Dom\HTMLDocument serialization escape text 01
--EXTENSIONS--
dom
--FILE--
", LIBXML_NOERROR);
+$dom = Dom\HTMLDocument::createFromString("", LIBXML_NOERROR);
$p = $dom->documentElement->firstChild->nextSibling->firstChild;
$p->textContent = "this is &text! \"\"";
-echo $dom->saveHTML();
+echo $dom->saveHtml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_text_02.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_text_02.phpt
index 115f3233eb2..48ab2e5ea59 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_text_02.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_text_02.phpt
@@ -1,18 +1,18 @@
--TEST--
-DOM\HTMLDocument serialization escape text 02 - special tags in html namespace
+Dom\HTMLDocument serialization escape text 02 - special tags in html namespace
--EXTENSIONS--
dom
--FILE--
appendChild($dom->createElement("body"));
foreach (["style", "script", "xmp", "iframe", "noembed", "noframes", "plaintext", "noscript"] as $tag) {
$tag = $body->appendChild($dom->createElement($tag));
$tag->textContent = "&\"<>\xc2\xa0 foobar";
$body->append("\n");
}
-echo $dom->saveHTML();
+echo $dom->saveHtml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_text_03.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_text_03.phpt
index ec6822d7758..bb582ba5333 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_text_03.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_text_03.phpt
@@ -1,18 +1,18 @@
--TEST--
-DOM\HTMLDocument serialization escape text 03 - special tags in namespace should encode content
+Dom\HTMLDocument serialization escape text 03 - special tags in namespace should encode content
--EXTENSIONS--
dom
--FILE--
appendChild($dom->createElement("body"));
foreach (["style", "script", "xmp", "iframe", "noembed", "noframes", "plaintext", "noscript"] as $tag) {
$tag = $body->appendChild($dom->createElementNS("some:ns", $tag));
$tag->textContent = "&\"<>\xc2\xa0 foobar";
$body->append("\n");
}
-echo $dom->saveHTML();
+echo $dom->saveHtml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_void_elements.phpt b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_void_elements.phpt
index e4acf241e7d..7900f11619d 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_void_elements.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_void_elements.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\HTMLDocument serialization of void elements
+Dom\HTMLDocument serialization of void elements
--EXTENSIONS--
dom
--FILE--
createElement("container");
$dom->append($container);
@@ -35,14 +35,14 @@ foreach ($tags as $tag) {
$element->appendChild($dom->createElement("inner"));
$element->after("\n");
echo "$tag: ";
- var_dump($dom->saveHTML($element));
+ var_dump($dom->saveHtml($element));
$element = $container->appendChild($dom->createElementNS("http://php.net/foo", "x:$tag"));
$element->appendChild($dom->createElement("inner"));
$element->after("\n");
}
-echo $dom->saveHTML();
+echo $dom->saveHtml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/Attr_name.phpt b/ext/dom/tests/modern/spec/Attr_name.phpt
index 2510de3eb1c..89c0aff2223 100644
--- a/ext/dom/tests/modern/spec/Attr_name.phpt
+++ b/ext/dom/tests/modern/spec/Attr_name.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
appendChild($dom->createElement("foo"));
$foo->setAttributeNS("http://example.com", "foo:bar", "baz");
var_dump($foo->attributes[0]->name);
diff --git a/ext/dom/tests/modern/spec/CharacterData_deleteData_negative_in_bounds_length.phpt b/ext/dom/tests/modern/spec/CharacterData_deleteData_negative_in_bounds_length.phpt
index 924f58d7036..f29a201ca10 100644
--- a/ext/dom/tests/modern/spec/CharacterData_deleteData_negative_in_bounds_length.phpt
+++ b/ext/dom/tests/modern/spec/CharacterData_deleteData_negative_in_bounds_length.phpt
@@ -7,10 +7,10 @@ dom
echo "--- Modern behaviour ---\n";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$comment = $dom->createComment("foobarbaz");
$comment->deleteData(3, -1);
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
echo "--- Legacy behaviour ---\n";
@@ -21,7 +21,7 @@ try {
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/CharacterData_insertData_edge_cases.phpt b/ext/dom/tests/modern/spec/CharacterData_insertData_edge_cases.phpt
index b89b389ee31..9369bdadbff 100644
--- a/ext/dom/tests/modern/spec/CharacterData_insertData_edge_cases.phpt
+++ b/ext/dom/tests/modern/spec/CharacterData_insertData_edge_cases.phpt
@@ -7,7 +7,7 @@ dom
--FILE--
createComment("foobarbaz");
try {
var_dump($comment->insertData(100, "data"));
@@ -19,7 +19,7 @@ try {
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/CharacterData_insertData_negative_offset.phpt b/ext/dom/tests/modern/spec/CharacterData_insertData_negative_offset.phpt
index f00625df352..f00e9aa76aa 100644
--- a/ext/dom/tests/modern/spec/CharacterData_insertData_negative_offset.phpt
+++ b/ext/dom/tests/modern/spec/CharacterData_insertData_negative_offset.phpt
@@ -5,16 +5,16 @@ dom
--FILE--
createComment("foobarbaz");
try {
$comment->insertData(-1, "A");
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
$comment->insertData(1, "A");
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/CharacterData_insertData_negative_offset_mod32.phpt b/ext/dom/tests/modern/spec/CharacterData_insertData_negative_offset_mod32.phpt
index 5c0be698bda..7c27c3bc8dd 100644
--- a/ext/dom/tests/modern/spec/CharacterData_insertData_negative_offset_mod32.phpt
+++ b/ext/dom/tests/modern/spec/CharacterData_insertData_negative_offset_mod32.phpt
@@ -11,16 +11,16 @@ if (PHP_INT_SIZE === 4) die('skip not for 32-bit');
echo "--- Modern behaviour ---\n";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$comment = $dom->createComment("foobarbaz");
try {
$comment->insertData(-1, "A");
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
$comment->insertData(-(2**32 - 1), "A");
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
echo "--- Legacy behaviour ---\n";
@@ -31,13 +31,13 @@ try {
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
try {
$comment->insertData(-(2**32 - 1), "A");
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/CharacterData_replaceData_negative_count.phpt b/ext/dom/tests/modern/spec/CharacterData_replaceData_negative_count.phpt
index 96402847f73..32e27778552 100644
--- a/ext/dom/tests/modern/spec/CharacterData_replaceData_negative_count.phpt
+++ b/ext/dom/tests/modern/spec/CharacterData_replaceData_negative_count.phpt
@@ -5,13 +5,13 @@ dom
--FILE--
createComment("foobarbaz");
$comment->replaceData(0, -1, "A");
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
$comment = $dom->createComment("foobarbaz");
$comment->replaceData(2, -2, "A");
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/CharacterData_replaceData_negative_count_mod32.phpt b/ext/dom/tests/modern/spec/CharacterData_replaceData_negative_count_mod32.phpt
index 9382ed25497..64634b09925 100644
--- a/ext/dom/tests/modern/spec/CharacterData_replaceData_negative_count_mod32.phpt
+++ b/ext/dom/tests/modern/spec/CharacterData_replaceData_negative_count_mod32.phpt
@@ -11,13 +11,13 @@ if (PHP_INT_SIZE === 4) die('skip not for 32-bit');
echo "--- Modern behaviour ---\n";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$comment = $dom->createComment("foobarbaz");
$comment->replaceData(0, -1, "A");
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
$comment = $dom->createComment("foobarbaz");
$comment->replaceData(2, -(2**32 - 2), "A");
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
echo "--- Legacy behaviour ---\n";
@@ -28,13 +28,13 @@ try {
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
try {
$comment->replaceData(2, -(2**32 - 2), "A");
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/CharacterData_substringData_edge_cases.phpt b/ext/dom/tests/modern/spec/CharacterData_substringData_edge_cases.phpt
index 82f1f9ed77d..c463c0f7057 100644
--- a/ext/dom/tests/modern/spec/CharacterData_substringData_edge_cases.phpt
+++ b/ext/dom/tests/modern/spec/CharacterData_substringData_edge_cases.phpt
@@ -7,7 +7,7 @@ dom
--FILE--
createComment("foobarbaz");
try {
var_dump($comment->substringData(0, 2**31+1));
@@ -24,7 +24,7 @@ try {
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/CharacterData_substringData_negative_arguments.phpt b/ext/dom/tests/modern/spec/CharacterData_substringData_negative_arguments.phpt
index a0b5414bb89..28198d94d6d 100644
--- a/ext/dom/tests/modern/spec/CharacterData_substringData_negative_arguments.phpt
+++ b/ext/dom/tests/modern/spec/CharacterData_substringData_negative_arguments.phpt
@@ -5,18 +5,18 @@ dom
--FILE--
createComment("foobarbaz");
var_dump($comment->substringData(0, -1));
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
var_dump($comment->substringData(2, -2));
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
try {
var_dump($comment->substringData(-2, 2));
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/CharacterData_substringData_negative_arguments_mod32.phpt b/ext/dom/tests/modern/spec/CharacterData_substringData_negative_arguments_mod32.phpt
index c29eb0b7792..7d38bd28d44 100644
--- a/ext/dom/tests/modern/spec/CharacterData_substringData_negative_arguments_mod32.phpt
+++ b/ext/dom/tests/modern/spec/CharacterData_substringData_negative_arguments_mod32.phpt
@@ -11,14 +11,14 @@ if (PHP_INT_SIZE === 4) die('skip not for 32-bit');
echo "--- Modern behaviour ---\n";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$comment = $dom->createComment("foobarbaz");
var_dump($comment->substringData(0, -1));
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
var_dump($comment->substringData(2, -(2**32 - 2)));
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
var_dump($comment->substringData(-(2**32 - 2), 2));
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
echo "--- Legacy behaviour ---\n";
@@ -29,19 +29,19 @@ try {
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
try {
var_dump($comment->substringData(2, -(2**32 - 2)));
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
try {
var_dump($comment->substringData(-(2**32 - 2), 2));
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
-echo $dom->saveHTML($comment), "\n";
+echo $dom->saveHtml($comment), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/Document_createAttribute.phpt b/ext/dom/tests/modern/spec/Document_createAttribute.phpt
index 7a9ead916c8..9d52b365975 100644
--- a/ext/dom/tests/modern/spec/Document_createAttribute.phpt
+++ b/ext/dom/tests/modern/spec/Document_createAttribute.phpt
@@ -8,7 +8,7 @@ require __DIR__ . "/dump_attr.inc";
echo "--- HTML document ---\n";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$attr = $dom->createAttribute('foo');
dumpAttr($attr);
$attr = $dom->createAttribute('FoOo');
@@ -16,7 +16,7 @@ dumpAttr($attr);
echo "--- XML document ---\n";
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
$attr = $dom->createAttribute('foo');
dumpAttr($attr);
$attr = $dom->createAttribute('FoOo');
diff --git a/ext/dom/tests/modern/spec/Document_createAttributeNS.phpt b/ext/dom/tests/modern/spec/Document_createAttributeNS.phpt
index e0cb36c9ffd..6441ee60ef4 100644
--- a/ext/dom/tests/modern/spec/Document_createAttributeNS.phpt
+++ b/ext/dom/tests/modern/spec/Document_createAttributeNS.phpt
@@ -16,7 +16,7 @@ function testErrorCase($dom, $ns, $qname) {
}
}
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$attrs = [];
$attrs[] = $dom->createAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:foo');
$attrs[] = $dom->createAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:bar');
@@ -49,7 +49,7 @@ foreach ($attrs as $attr) {
$root->setAttributeNodeNS($attr);
}
-echo $dom->saveHTML(), "\n";
+echo $dom->saveHtml(), "\n";
echo "\n--- NULL prefix cases ---\n";
@@ -64,7 +64,7 @@ foreach ($attrs as $attr) {
$root->setAttributeNodeNS($attr);
}
-echo $dom->saveHTML(), "\n";
+echo $dom->saveHtml(), "\n";
?>
--EXPECT--
--- Error cases ---
diff --git a/ext/dom/tests/modern/spec/Document_createElement.phpt b/ext/dom/tests/modern/spec/Document_createElement.phpt
index 72a330fa8e2..e7112bbf90c 100644
--- a/ext/dom/tests/modern/spec/Document_createElement.phpt
+++ b/ext/dom/tests/modern/spec/Document_createElement.phpt
@@ -9,7 +9,7 @@ require __DIR__ . "/element_dump.inc";
echo "--- Into rootless document ---\n";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$element = $dom->createElement("HTML");
$element->textContent = "&hello";
dumpElement($element);
@@ -19,7 +19,7 @@ dumpElement($element);
echo "--- Into document with HTML root ---\n";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$element = $dom->createElement("HTML");
$element->textContent = "&hello";
$dom->appendChild($element);
@@ -28,7 +28,7 @@ dumpElement($element);
echo "--- Into document with non-HTML root ---\n";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$element = $dom->createElementNS("urn:a", "container");
$dom->appendChild($element);
$element = $dom->createElement("HEad");
diff --git a/ext/dom/tests/modern/spec/Document_createElementNS.phpt b/ext/dom/tests/modern/spec/Document_createElementNS.phpt
index 3eeb1bd2cbb..cbdbe5dfd98 100644
--- a/ext/dom/tests/modern/spec/Document_createElementNS.phpt
+++ b/ext/dom/tests/modern/spec/Document_createElementNS.phpt
@@ -10,7 +10,7 @@ require __DIR__ . "/create_element_util.inc";
echo "--- Normal cases ---\n";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$elements = [];
$elements[] = createElementNS($dom, NULL, "qname", "&hello");
diff --git a/ext/dom/tests/modern/spec/Document_createElement_edge_cases.phpt b/ext/dom/tests/modern/spec/Document_createElement_edge_cases.phpt
index d2113b2d1ef..6d8fc878b6c 100644
--- a/ext/dom/tests/modern/spec/Document_createElement_edge_cases.phpt
+++ b/ext/dom/tests/modern/spec/Document_createElement_edge_cases.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
createElement('');
} catch (DOMException $e) {
diff --git a/ext/dom/tests/modern/spec/Document_getElementsByTagNameNS.phpt b/ext/dom/tests/modern/spec/Document_getElementsByTagNameNS.phpt
index 0f18891e62c..12df0f49c82 100644
--- a/ext/dom/tests/modern/spec/Document_getElementsByTagNameNS.phpt
+++ b/ext/dom/tests/modern/spec/Document_getElementsByTagNameNS.phpt
@@ -7,7 +7,7 @@ dom
require __DIR__ . '/create_element_util.inc';
-$dom = DOM\HTMLDocument::createFromString(<<
diff --git a/ext/dom/tests/modern/spec/Document_implementation_createDocument.phpt b/ext/dom/tests/modern/spec/Document_implementation_createDocument.phpt
index a7025655ec4..5384cf6331f 100644
--- a/ext/dom/tests/modern/spec/Document_implementation_createDocument.phpt
+++ b/ext/dom/tests/modern/spec/Document_implementation_createDocument.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
implementation->createDocument(null, ""));
echo "--- (null, \"qname\") ---\n";
-echo $dom->implementation->createDocument(null, "qname")->saveXML(), "\n";
+echo $dom->implementation->createDocument(null, "qname")->saveXml(), "\n";
echo "--- (\"\", \"qname\") ---\n";
-echo $dom->implementation->createDocument("", "qname")->saveXML(), "\n";
+echo $dom->implementation->createDocument("", "qname")->saveXml(), "\n";
echo "--- (\"urn:a\", \"qname\") ---\n";
-echo $dom->implementation->createDocument("urn:a", "qname")->saveXML(), "\n";
+echo $dom->implementation->createDocument("urn:a", "qname")->saveXml(), "\n";
echo "--- With doctype ---\n";
$dtd = $dom->implementation->createDocumentType("mydoc", "", "");
-echo $dom->implementation->createDocument(null, "", $dtd)->saveXML(), "\n";
+echo $dom->implementation->createDocument(null, "", $dtd)->saveXml(), "\n";
echo "--- With auto-adopting doctype ---\n";
-$dom2 = DOM\XMLDocument::createEmpty();
+$dom2 = Dom\XMLDocument::createEmpty();
$dtd = $dom2->implementation->createDocumentType("mydoc", "", "");
-echo $dom->implementation->createDocument(null, "", $dtd)->saveXML(), "\n";
+echo $dom->implementation->createDocument(null, "", $dtd)->saveXml(), "\n";
?>
--EXPECT--
--- (null, "") ---
-object(DOM\XMLDocument)#3 (29) {
+object(Dom\XMLDocument)#3 (29) {
["xmlEncoding"]=>
string(5) "UTF-8"
["xmlStandalone"]=>
diff --git a/ext/dom/tests/modern/spec/Document_implementation_createDocumentType.phpt b/ext/dom/tests/modern/spec/Document_implementation_createDocumentType.phpt
index d396477c694..88c66abf09c 100644
--- a/ext/dom/tests/modern/spec/Document_implementation_createDocumentType.phpt
+++ b/ext/dom/tests/modern/spec/Document_implementation_createDocumentType.phpt
@@ -13,19 +13,19 @@ $test_matrix = [
];
foreach ($test_matrix as $test_item) {
- $dom = DOM\XMLDocument::createEmpty();
+ $dom = Dom\XMLDocument::createEmpty();
$dtd = $dom->implementation->createDocumentType($test_item['uri'], $test_item['public'], $test_item['system']);
var_dump($dtd);
$dom->append($dom->importNode($dtd));
- echo $dom->saveXML(), "\n";
+ echo $dom->saveXml(), "\n";
}
?>
--EXPECT--
-object(DOM\DocumentType)#3 (23) {
+object(Dom\DocumentType)#3 (23) {
["name"]=>
string(5) "qname"
["entities"]=>
@@ -76,7 +76,7 @@ object(DOM\DocumentType)#3 (23) {
-object(DOM\DocumentType)#2 (23) {
+object(Dom\DocumentType)#2 (23) {
["name"]=>
string(5) "qname"
["entities"]=>
@@ -127,7 +127,7 @@ object(DOM\DocumentType)#2 (23) {
-object(DOM\DocumentType)#1 (23) {
+object(Dom\DocumentType)#1 (23) {
["name"]=>
string(5) "qname"
["entities"]=>
@@ -178,7 +178,7 @@ object(DOM\DocumentType)#1 (23) {
-object(DOM\DocumentType)#4 (23) {
+object(Dom\DocumentType)#4 (23) {
["name"]=>
string(5) "qname"
["entities"]=>
diff --git a/ext/dom/tests/modern/spec/Document_implementation_createDocumentType_errors.phpt b/ext/dom/tests/modern/spec/Document_implementation_createDocumentType_errors.phpt
index 622a690abc0..74e17fb5a4f 100644
--- a/ext/dom/tests/modern/spec/Document_implementation_createDocumentType_errors.phpt
+++ b/ext/dom/tests/modern/spec/Document_implementation_createDocumentType_errors.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
implementation->createDocumentType("invalid name", "public", "system");
} catch (DOMException $e) {
diff --git a/ext/dom/tests/modern/spec/Document_implementation_createDocument_errors.phpt b/ext/dom/tests/modern/spec/Document_implementation_createDocument_errors.phpt
index c66808e3895..673aed3ef55 100644
--- a/ext/dom/tests/modern/spec/Document_implementation_createDocument_errors.phpt
+++ b/ext/dom/tests/modern/spec/Document_implementation_createDocument_errors.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
implementation->createDocument("urn:a", "@");
diff --git a/ext/dom/tests/modern/spec/Document_implementation_createHTMLDocument.phpt b/ext/dom/tests/modern/spec/Document_implementation_createHTMLDocument.phpt
index fe3568bb0c2..88b55878fd0 100644
--- a/ext/dom/tests/modern/spec/Document_implementation_createHTMLDocument.phpt
+++ b/ext/dom/tests/modern/spec/Document_implementation_createHTMLDocument.phpt
@@ -5,19 +5,19 @@ dom
--FILE--
implementation->createHTMLDocument()->saveXML(), "\n";
+echo $dom->implementation->createHTMLDocument()->saveXml(), "\n";
echo "---\n";
-echo $dom->implementation->createHTMLDocument("")->saveXML(), "\n";
+echo $dom->implementation->createHTMLDocument("")->saveXml(), "\n";
echo "---\n";
-echo $dom->implementation->createHTMLDocument("my ")->saveXML(), "\n";
+echo $dom->implementation->createHTMLDocument("my <title>")->saveXml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/Document_implementation_same_object.phpt b/ext/dom/tests/modern/spec/Document_implementation_same_object.phpt
index 01e9dd2af6b..690b2bf6358 100644
--- a/ext/dom/tests/modern/spec/Document_implementation_same_object.phpt
+++ b/ext/dom/tests/modern/spec/Document_implementation_same_object.phpt
@@ -5,12 +5,12 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
var_dump($dom->implementation === $dom->implementation);
$implementation = $dom->implementation;
var_dump($dom->implementation === $implementation);
-$dom2 = DOM\XMLDocument::createEmpty();
+$dom2 = Dom\XMLDocument::createEmpty();
var_dump($dom2->implementation === $dom->implementation);
var_dump($implementation);
@@ -26,6 +26,6 @@ try {
bool(true)
bool(true)
bool(false)
-object(DOM\Implementation)#2 (0) {
+object(Dom\Implementation)#2 (0) {
}
-Trying to clone an uncloneable object of class DOM\Implementation
+Trying to clone an uncloneable object of class Dom\Implementation
diff --git a/ext/dom/tests/modern/spec/Document_importLegacyNode.phpt b/ext/dom/tests/modern/spec/Document_importLegacyNode.phpt
index 55e53c3ccc1..8a6f324c3dc 100644
--- a/ext/dom/tests/modern/spec/Document_importLegacyNode.phpt
+++ b/ext/dom/tests/modern/spec/Document_importLegacyNode.phpt
@@ -16,7 +16,7 @@ $old->loadXML(<<<XML
</root>
XML);
-$new = DOM\XMLDocument::createEmpty();
+$new = Dom\XMLDocument::createEmpty();
$new->append($new->importLegacyNode($old->documentElement, true));
unset($old);
@@ -33,11 +33,11 @@ foreach ($new->getElementsByTagName('child') as $child) {
}
}
-echo $new->saveXML(), "\n";
+echo $new->saveXml(), "\n";
?>
--EXPECT--
-object(DOM\NamedNodeMap)#5 (1) {
+object(Dom\NamedNodeMap)#5 (1) {
["length"]=>
int(2)
}
@@ -47,7 +47,7 @@ namespaceURI: string(29) "http://www.w3.org/2000/xmlns/"
name: string(1) "a"
prefix: NULL
namespaceURI: NULL
-object(DOM\NamedNodeMap)#3 (1) {
+object(Dom\NamedNodeMap)#3 (1) {
["length"]=>
int(3)
}
diff --git a/ext/dom/tests/modern/spec/Document_importNode_not_supported.phpt b/ext/dom/tests/modern/spec/Document_importNode_not_supported.phpt
index 779a41efb55..9f02411fd8b 100644
--- a/ext/dom/tests/modern/spec/Document_importNode_not_supported.phpt
+++ b/ext/dom/tests/modern/spec/Document_importNode_not_supported.phpt
@@ -10,7 +10,7 @@ $dom = new DOMDocument();
var_dump($dom->importNode($dom));
// For modern documents this should throw
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
try {
$dom->importNode($dom);
} catch (DOMException $e) {
diff --git a/ext/dom/tests/modern/spec/Element_getAttribute.phpt b/ext/dom/tests/modern/spec/Element_getAttribute.phpt
index 73dc64f503d..6f4f7a0d89a 100644
--- a/ext/dom/tests/modern/spec/Element_getAttribute.phpt
+++ b/ext/dom/tests/modern/spec/Element_getAttribute.phpt
@@ -7,7 +7,7 @@ dom
echo "--- Get after parsing ---\n";
-$dom = DOM\HTMLDocument::createFromString('<!DOCTYPE html><html><body align="foo" foo:bar="baz"></body></html>');
+$dom = Dom\HTMLDocument::createFromString('<!DOCTYPE html><html><body align="foo" foo:bar="baz"></body></html>');
$body = $dom->getElementsByTagName("body")[0];
var_dump($body->getAttribute("align"));
var_dump($body->getAttribute("foo:bar"));
diff --git a/ext/dom/tests/modern/spec/Element_getAttributeNS.phpt b/ext/dom/tests/modern/spec/Element_getAttributeNS.phpt
index cfaae5bb897..9b27c79b93a 100644
--- a/ext/dom/tests/modern/spec/Element_getAttributeNS.phpt
+++ b/ext/dom/tests/modern/spec/Element_getAttributeNS.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createFromString('<!DOCTYPE html><html><body align="foo" foo:bar="baz"></body></html>');
+$dom = Dom\HTMLDocument::createFromString('<!DOCTYPE html><html><body align="foo" foo:bar="baz"></body></html>');
$body = $dom->getElementsByTagName("body")[0];
echo "--- After parsing, i.e. without namespace ---\n";
diff --git a/ext/dom/tests/modern/spec/Element_getAttributeNode.phpt b/ext/dom/tests/modern/spec/Element_getAttributeNode.phpt
index 4bf186ac2f4..034fcbeec6a 100644
--- a/ext/dom/tests/modern/spec/Element_getAttributeNode.phpt
+++ b/ext/dom/tests/modern/spec/Element_getAttributeNode.phpt
@@ -7,7 +7,7 @@ dom
echo "--- Get after parsing ---\n";
-$dom = DOM\HTMLDocument::createFromString('<!DOCTYPE html><html><body align="foo" foo:bar="baz"></body></html>');
+$dom = Dom\HTMLDocument::createFromString('<!DOCTYPE html><html><body align="foo" foo:bar="baz"></body></html>');
$body = $dom->getElementsByTagName("body")[0];
var_dump($body->getAttributeNode("align")->textContent);
var_dump($body->getAttributeNode("foo:bar")->textContent);
diff --git a/ext/dom/tests/modern/spec/Element_getAttributeNodeNS.phpt b/ext/dom/tests/modern/spec/Element_getAttributeNodeNS.phpt
index 4cbc2d2558d..b993855bae8 100644
--- a/ext/dom/tests/modern/spec/Element_getAttributeNodeNS.phpt
+++ b/ext/dom/tests/modern/spec/Element_getAttributeNodeNS.phpt
@@ -7,7 +7,7 @@ dom
echo "--- Get after parsing ---\n";
-$dom = DOM\HTMLDocument::createFromString('<!DOCTYPE html><html><body align="foo" foo:bar="baz"></body></html>');
+$dom = Dom\HTMLDocument::createFromString('<!DOCTYPE html><html><body align="foo" foo:bar="baz"></body></html>');
$body = $dom->getElementsByTagName("body")[0];
echo "--- After parsing, i.e. without namespace ---\n";
diff --git a/ext/dom/tests/modern/spec/Element_hasAttribute.phpt b/ext/dom/tests/modern/spec/Element_hasAttribute.phpt
index e72fd366727..0f73ad84596 100644
--- a/ext/dom/tests/modern/spec/Element_hasAttribute.phpt
+++ b/ext/dom/tests/modern/spec/Element_hasAttribute.phpt
@@ -7,7 +7,7 @@ dom
echo "--- Get after parsing ---\n";
-$dom = DOM\HTMLDocument::createFromString('<!DOCTYPE html><html><body align="foo" foo:bar="baz"></body></html>');
+$dom = Dom\HTMLDocument::createFromString('<!DOCTYPE html><html><body align="foo" foo:bar="baz"></body></html>');
$body = $dom->getElementsByTagName("body")[0];
var_dump($body->hasAttribute("align"));
var_dump($body->hasAttribute("foo:bar"));
diff --git a/ext/dom/tests/modern/spec/Element_hasAttributeNS.phpt b/ext/dom/tests/modern/spec/Element_hasAttributeNS.phpt
index 6b8820f9452..bd24a6afc5f 100644
--- a/ext/dom/tests/modern/spec/Element_hasAttributeNS.phpt
+++ b/ext/dom/tests/modern/spec/Element_hasAttributeNS.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createFromString('<!DOCTYPE html><html><body align="foo" foo:bar="baz"></body></html>');
+$dom = Dom\HTMLDocument::createFromString('<!DOCTYPE html><html><body align="foo" foo:bar="baz"></body></html>');
$body = $dom->getElementsByTagName("body")[0];
echo "--- After parsing, i.e. without namespace ---\n";
diff --git a/ext/dom/tests/modern/spec/Element_insertAdjacentText.phpt b/ext/dom/tests/modern/spec/Element_insertAdjacentText.phpt
index 94bcaa13b89..862d1053d8f 100644
--- a/ext/dom/tests/modern/spec/Element_insertAdjacentText.phpt
+++ b/ext/dom/tests/modern/spec/Element_insertAdjacentText.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$foo = $dom->appendChild($dom->createElement("foo"));
try {
$foo->insertAdjacentText("beforebegin", "bar");
@@ -16,7 +16,7 @@ try {
$foo->insertAdjacentText("afterbegin", "bar");
$foo->insertAdjacentText("beforeend", "baz");
-echo $dom->saveHTML(), "\n";
+echo $dom->saveHtml(), "\n";
var_dump($foo->firstChild->textContent);
var_dump($foo->firstChild->nextSibling->textContent);
diff --git a/ext/dom/tests/modern/spec/Element_prefix_readonly.phpt b/ext/dom/tests/modern/spec/Element_prefix_readonly.phpt
index 37ceda2e4c0..7ebc3efaadc 100644
--- a/ext/dom/tests/modern/spec/Element_prefix_readonly.phpt
+++ b/ext/dom/tests/modern/spec/Element_prefix_readonly.phpt
@@ -1,18 +1,18 @@
--TEST--
-Ensure that DOM\Node::$prefix is read-only
+Ensure that Dom\Node::$prefix is read-only
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$div = $dom->createElement('div');
try {
$div->prefix = "foo";
} catch (Error $e) {
echo $e->getMessage(), "\n";
}
-echo $dom->saveXML();
+echo $dom->saveXml();
?>
--EXPECT--
-Cannot modify readonly property DOM\Element::$prefix
+Cannot modify readonly property Dom\Element::$prefix
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
diff --git a/ext/dom/tests/modern/spec/Element_removeAttribute.phpt b/ext/dom/tests/modern/spec/Element_removeAttribute.phpt
index 20ccb6c109b..6df71797aa0 100644
--- a/ext/dom/tests/modern/spec/Element_removeAttribute.phpt
+++ b/ext/dom/tests/modern/spec/Element_removeAttribute.phpt
@@ -7,41 +7,41 @@ dom
echo "--- Remove after parsing ---\n";
-$dom = DOM\HTMLDocument::createFromString('<!DOCTYPE html><html><body align="foo" foo:bar="baz"></body></html>');
+$dom = Dom\HTMLDocument::createFromString('<!DOCTYPE html><html><body align="foo" foo:bar="baz"></body></html>');
$body = $dom->getElementsByTagName("body")[0];
var_dump($body->removeAttribute("align"));
var_dump($body->removeAttribute("foo:bar"));
-echo $dom->saveHTML($body), "\n";
+echo $dom->saveHtml($body), "\n";
echo "--- Remove after creating without namespace ---\n";
$body->setAttributeNode($attr = $dom->createAttribute("prefix:local"));
$attr->value = "A";
var_dump($body->removeAttribute("prefix:local"));
-echo $dom->saveHTML($body), "\n";
+echo $dom->saveHtml($body), "\n";
echo "--- Remove after creating with namespace ---\n";
$body->setAttributeNode($attr = $dom->createAttributeNS("urn:a", "prefix:local2"));
$attr->value = "B";
var_dump($body->removeAttribute("prefix:local2"));
-echo $dom->saveHTML($body), "\n";
+echo $dom->saveHtml($body), "\n";
$body->setAttributeNode($attr = $dom->createAttributeNS("urn:a", "prefix:local2"));
$attr->value = "B";
var_dump($body->removeAttribute("Prefix:LOCAL2"));
-echo $dom->saveHTML($body), "\n";
+echo $dom->saveHtml($body), "\n";
echo "--- Remove after creating with namespace case sensitive ---\n";
$element = $dom->createElementNS("urn:a", "a:element");
$attr = $dom->createAttributeNS("urn:a", "Prefix:local2");
$element->setAttributeNode($attr);
-echo $dom->saveHTML($element), "\n";
+echo $dom->saveHtml($element), "\n";
$attr->value = "C";
var_dump($element->removeAttribute("Prefix:local2"));
var_dump($element->removeAttribute("Prefix:LOCAL2"));
var_dump($element->removeAttribute("prefix:local2"));
-echo $dom->saveHTML($element), "\n";
+echo $dom->saveHtml($element), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/Element_removeAttributeNS.phpt b/ext/dom/tests/modern/spec/Element_removeAttributeNS.phpt
index 7f31eacda51..3e0eac8722f 100644
--- a/ext/dom/tests/modern/spec/Element_removeAttributeNS.phpt
+++ b/ext/dom/tests/modern/spec/Element_removeAttributeNS.phpt
@@ -6,7 +6,7 @@ dom
<?php
function createFreshBody() {
- $dom = DOM\HTMLDocument::createFromString('<!DOCTYPE html><html><body align="foo" foo:bar="baz"></body></html>');
+ $dom = Dom\HTMLDocument::createFromString('<!DOCTYPE html><html><body align="foo" foo:bar="baz"></body></html>');
$body = $dom->getElementsByTagName("body")[0];
return $body;
}
@@ -15,35 +15,35 @@ echo "--- After parsing, i.e. without namespace ---\n";
$body = createFreshBody();
$body->removeAttributeNS(NULL, "align");
-echo $body->ownerDocument->saveHTML($body), "\n";
+echo $body->ownerDocument->saveHtml($body), "\n";
$body = createFreshBody();
$body->removeAttributeNS("", "align");
-echo $body->ownerDocument->saveHTML($body), "\n";
+echo $body->ownerDocument->saveHtml($body), "\n";
$body = createFreshBody();
$body->removeAttributeNS(NULL, "ALIGN");
-echo $body->ownerDocument->saveHTML($body), "\n";
+echo $body->ownerDocument->saveHtml($body), "\n";
$body = createFreshBody();
$body->removeAttributeNS("", "ALIGN");
-echo $body->ownerDocument->saveHTML($body), "\n";
+echo $body->ownerDocument->saveHtml($body), "\n";
$body = createFreshBody();
$body->removeAttributeNS(NULL, "foo:bar");
-echo $body->ownerDocument->saveHTML($body), "\n";
+echo $body->ownerDocument->saveHtml($body), "\n";
$body = createFreshBody();
$body->removeAttributeNS("", "foo:bar");
-echo $body->ownerDocument->saveHTML($body), "\n";
+echo $body->ownerDocument->saveHtml($body), "\n";
$body = createFreshBody();
$body->removeAttributeNS(NULL, "FOO:BAR");
-echo $body->ownerDocument->saveHTML($body), "\n";
+echo $body->ownerDocument->saveHtml($body), "\n";
$body = createFreshBody();
$body->removeAttributeNS("", "FOO:BAR");
-echo $body->ownerDocument->saveHTML($body), "\n";
+echo $body->ownerDocument->saveHtml($body), "\n";
echo "--- Special legacy case ---\n";
@@ -55,22 +55,22 @@ echo "--- Remove after creating without namespace ---\n";
$body = createFreshBody();
$body->setAttributeNode($attr = $body->ownerDocument->createAttribute("prefix:local"));
$attr->value = "A";
-echo $body->ownerDocument->saveHTML($body), "\n";
+echo $body->ownerDocument->saveHtml($body), "\n";
$body->removeAttributeNS(NULL, "prefix:LOCAL");
-echo $body->ownerDocument->saveHTML($body), "\n";
+echo $body->ownerDocument->saveHtml($body), "\n";
$body->removeAttributeNS(NULL, "prefix:local");
-echo $body->ownerDocument->saveHTML($body), "\n";
+echo $body->ownerDocument->saveHtml($body), "\n";
echo "--- Remove after creating with namespace ---\n";
$body = createFreshBody();
$body->setAttributeNode($attr = $body->ownerDocument->createAttributeNS("urn:a", "prefix:local2"));
$attr->value = "B";
-echo $body->ownerDocument->saveHTML($body), "\n";
+echo $body->ownerDocument->saveHtml($body), "\n";
$body->removeAttributeNS("urn:a", "LOCAL2");
-echo $body->ownerDocument->saveHTML($body), "\n";
+echo $body->ownerDocument->saveHtml($body), "\n";
$body->removeAttributeNS("urn:a", "local2");
-echo $body->ownerDocument->saveHTML($body), "\n";
+echo $body->ownerDocument->saveHtml($body), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/Element_removeAttribute_edge_cases.phpt b/ext/dom/tests/modern/spec/Element_removeAttribute_edge_cases.phpt
index fc5dbeae040..e50ef36e31f 100644
--- a/ext/dom/tests/modern/spec/Element_removeAttribute_edge_cases.phpt
+++ b/ext/dom/tests/modern/spec/Element_removeAttribute_edge_cases.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString('<root a="b"/>');
+$dom = Dom\XMLDocument::createFromString('<root a="b"/>');
try {
$dom->documentElement->removeAttributeNode($dom->createAttribute('test'));
} catch (DOMException $e) {
diff --git a/ext/dom/tests/modern/spec/Element_setAttributeNS.phpt b/ext/dom/tests/modern/spec/Element_setAttributeNS.phpt
index e23492303ac..a38048a47ce 100644
--- a/ext/dom/tests/modern/spec/Element_setAttributeNS.phpt
+++ b/ext/dom/tests/modern/spec/Element_setAttributeNS.phpt
@@ -7,13 +7,13 @@ dom
require __DIR__ . "/dump_attr.inc";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$container = $dom->appendChild($dom->createElement("container"));
echo "--- xmlns attribute ---\n";
$container->setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:foo", "1");
-echo $dom->saveHTML($container), "\n";
+echo $dom->saveHtml($container), "\n";
dumpAttrs($container);
echo "--- name validation ---\n";
@@ -26,22 +26,22 @@ try {
echo "--- ns attributes with same namespace but different prefix ---\n";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$container = $dom->appendChild($dom->createElement("container"));
$container->setAttributeNS("urn:a", "x:foo", "1");
$container->setAttributeNS("urn:a", "y:foo", "2");
-echo $dom->saveHTML($container), "\n";
+echo $dom->saveHtml($container), "\n";
dumpAttrs($container);
echo "--- ns attributes with different namespace but same prefix ---\n";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$container = $dom->appendChild($dom->createElement("container"));
$container->setAttributeNS("urn:a", "x:foo", "1");
$container->setAttributeNS("urn:b", "x:foo", "2");
-echo $dom->saveHTML($container), "\n";
+echo $dom->saveHtml($container), "\n";
dumpAttrs($container);
?>
diff --git a/ext/dom/tests/modern/spec/Element_setAttributeNode.phpt b/ext/dom/tests/modern/spec/Element_setAttributeNode.phpt
index 3379d6b8b36..c7de0f23149 100644
--- a/ext/dom/tests/modern/spec/Element_setAttributeNode.phpt
+++ b/ext/dom/tests/modern/spec/Element_setAttributeNode.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\Element::setAttributeNode(NS) in the same document
+Dom\Element::setAttributeNode(NS) in the same document
--EXTENSIONS--
dom
--FILE--
<?php
-$dom1 = DOM\HTMLDocument::createEmpty();
+$dom1 = Dom\HTMLDocument::createEmpty();
$container = $dom1->appendChild($dom1->createElement("container"));
echo "--- Without namespace ---\n";
@@ -33,7 +33,7 @@ var_dump($container->setAttributeNodeNS($attribute5) === null);
echo "--- Resulting document ---\n";
-echo $dom1->saveHTML(), "\n";
+echo $dom1->saveHtml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/Element_setAttributeNode_adoption.phpt b/ext/dom/tests/modern/spec/Element_setAttributeNode_adoption.phpt
index d395c16355b..87a2484b589 100644
--- a/ext/dom/tests/modern/spec/Element_setAttributeNode_adoption.phpt
+++ b/ext/dom/tests/modern/spec/Element_setAttributeNode_adoption.phpt
@@ -1,16 +1,16 @@
--TEST--
-DOM\Element::setAttributeNode(NS) adopting from another document
+Dom\Element::setAttributeNode(NS) adopting from another document
--EXTENSIONS--
dom
--FILE--
<?php
-$dom1 = DOM\HTMLDocument::createEmpty();
+$dom1 = Dom\HTMLDocument::createEmpty();
$container = $dom1->appendChild($dom1->createElement("container"));
echo "--- Without namespace ---\n";
-$dom2 = DOM\HTMLDocument::createEmpty();
+$dom2 = Dom\HTMLDocument::createEmpty();
$attr = $dom2->createAttribute("my-attribute");
$attr->value = "1";
@@ -23,12 +23,12 @@ unset($attr);
echo "--- With namespace ---\n";
-$dom2 = DOM\HTMLDocument::createEmpty();
+$dom2 = Dom\HTMLDocument::createEmpty();
$attr2 = $dom2->createAttributeNS("urn:a", "a:my-attribute");
$attr2->value = "2";
$dom1->documentElement->setAttributeNode($attr2);
-$dom2 = DOM\HTMLDocument::createEmpty();
+$dom2 = Dom\HTMLDocument::createEmpty();
$attr3 = $dom2->createAttributeNS("urn:b", "a:my-attribute");
$attr3->value = "3";
$dom1->documentElement->setAttributeNode($attr3);
@@ -38,7 +38,7 @@ var_dump($attr3->prefix, $attr3->namespaceURI, $attr3->localName);
echo "--- Resulting document ---\n";
-echo $dom1->saveHTML(), "\n";
+echo $dom1->saveHtml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/Element_setAttributeNode_inuse.phpt b/ext/dom/tests/modern/spec/Element_setAttributeNode_inuse.phpt
index 1e2e5e3b15f..ddbfbde7e61 100644
--- a/ext/dom/tests/modern/spec/Element_setAttributeNode_inuse.phpt
+++ b/ext/dom/tests/modern/spec/Element_setAttributeNode_inuse.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\Element::setAttributeNode(NS) inuse error
+Dom\Element::setAttributeNode(NS) inuse error
--EXTENSIONS--
dom
--FILE--
<?php
-$dom1 = DOM\HTMLDocument::createEmpty();
+$dom1 = Dom\HTMLDocument::createEmpty();
$container = $dom1->appendChild($dom1->createElement("container"));
$attr1 = $dom1->createAttribute("my-attribute");
$attr1->value = "1";
@@ -16,7 +16,7 @@ try {
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
-echo $dom1->saveHTML(), "\n";
+echo $dom1->saveHtml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/Element_setAttribute_with_namespace.phpt b/ext/dom/tests/modern/spec/Element_setAttribute_with_namespace.phpt
index d480dbaac5e..1d13d6f3123 100644
--- a/ext/dom/tests/modern/spec/Element_setAttribute_with_namespace.phpt
+++ b/ext/dom/tests/modern/spec/Element_setAttribute_with_namespace.phpt
@@ -7,32 +7,32 @@ dom
require __DIR__ . "/dump_attr.inc";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$container = $dom->appendChild($dom->createElementNS("urn:a", "container"));
$attrs = [];
-function setAttribute($container, string $name, string $value): DOM\Attr {
+function setAttribute($container, string $name, string $value): Dom\Attr {
$container->setAttribute($name, $value);
return $container->getAttributeNode($name);
}
$attrs[] = setAttribute($container, "foo:bar", "&hello1");
-echo $dom->saveHTML($container), "\n";
+echo $dom->saveHtml($container), "\n";
$attrs[] = setAttribute($container, "foo:bar", "&hello2");
-echo $dom->saveHTML($container), "\n";
+echo $dom->saveHtml($container), "\n";
$attrs[] = setAttribute($container, "bar", "&hello3");
-echo $dom->saveHTML($container), "\n";
+echo $dom->saveHtml($container), "\n";
$attrs[] = setAttribute($container, "xmlns", "&hello4");
-echo $dom->saveHTML($container), "\n";
+echo $dom->saveHtml($container), "\n";
$attrs[] = setAttribute($container, "XMLns", "&hello5");
-echo $dom->saveHTML($container), "\n";
+echo $dom->saveHtml($container), "\n";
$attrs[] = setAttribute($container, "BAR", "&hello6");
-echo $dom->saveHTML($container), "\n";
+echo $dom->saveHtml($container), "\n";
$container->setAttributeNode($dom->createAttributeNS("urn:b", "in:ns"));
$attrs[] = setAttribute($container, "in:ns", "&hello7");
-echo $dom->saveHTML($container), "\n";
+echo $dom->saveHtml($container), "\n";
// Dump at the end to check whether they influenced each other
foreach ($attrs as $attr) {
diff --git a/ext/dom/tests/modern/spec/Element_setAttribute_without_namespace.phpt b/ext/dom/tests/modern/spec/Element_setAttribute_without_namespace.phpt
index 7619988f4f1..4acc811faa9 100644
--- a/ext/dom/tests/modern/spec/Element_setAttribute_without_namespace.phpt
+++ b/ext/dom/tests/modern/spec/Element_setAttribute_without_namespace.phpt
@@ -7,28 +7,28 @@ dom
require __DIR__ . "/dump_attr.inc";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$container = $dom->appendChild($dom->createElement("container"));
$attrs = [];
-function setAttribute($container, string $name, string $value): DOM\Attr {
+function setAttribute($container, string $name, string $value): Dom\Attr {
$container->setAttribute($name, $value);
return $container->getAttributeNode($name);
}
$attrs[] = setAttribute($container, "foo:bar", "&hello1");
-echo $dom->saveHTML($container), "\n";
+echo $dom->saveHtml($container), "\n";
$attrs[] = setAttribute($container, "foo:bar", "&hello2");
-echo $dom->saveHTML($container), "\n";
+echo $dom->saveHtml($container), "\n";
$attrs[] = setAttribute($container, "bar", "&hello3");
-echo $dom->saveHTML($container), "\n";
+echo $dom->saveHtml($container), "\n";
$attrs[] = setAttribute($container, "xmlns", "&hello4");
-echo $dom->saveHTML($container), "\n";
+echo $dom->saveHtml($container), "\n";
$attrs[] = setAttribute($container, "XMLns", "&hello5");
-echo $dom->saveHTML($container), "\n";
+echo $dom->saveHtml($container), "\n";
$attrs[] = setAttribute($container, "BAR", "&hello6");
-echo $dom->saveHTML($container), "\n";
+echo $dom->saveHtml($container), "\n";
// Dump at the end to check whether they influenced each other
foreach ($attrs as $attr) {
diff --git a/ext/dom/tests/modern/spec/Element_tagName.phpt b/ext/dom/tests/modern/spec/Element_tagName.phpt
index f364ebf3be4..76327ed531b 100644
--- a/ext/dom/tests/modern/spec/Element_tagName.phpt
+++ b/ext/dom/tests/modern/spec/Element_tagName.phpt
@@ -1,5 +1,5 @@
--TEST--
-DOM\Element::$tagName HTML-uppercased qualified name
+Dom\Element::$tagName HTML-uppercased qualified name
--EXTENSIONS--
dom
--FILE--
@@ -7,7 +7,7 @@ dom
echo "--- For HTML document ---\n";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
var_dump($dom->createElementNS('http://www.w3.org/1999/xhtml', 'html')->tagName);
var_dump($dom->createElementNS('http://www.w3.org/1999/xhtml/', 'html')->tagName);
var_dump($dom->createElementNS('http://www.w3.org/1999/xhtml', 'foo:html')->tagName);
@@ -17,7 +17,7 @@ var_dump($dom->createElementNS(null, 'html')->tagName);
echo "--- For XML document ---\n";
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
var_dump($dom->createElementNS('http://www.w3.org/1999/xhtml', 'html')->tagName);
var_dump($dom->createElementNS('http://www.w3.org/1999/xhtml/', 'html')->tagName);
var_dump($dom->createElementNS('http://www.w3.org/1999/xhtml', 'foo:html')->tagName);
diff --git a/ext/dom/tests/modern/spec/Element_toggleAttribute.phpt b/ext/dom/tests/modern/spec/Element_toggleAttribute.phpt
index 457663b3cd2..f6dc3b58318 100644
--- a/ext/dom/tests/modern/spec/Element_toggleAttribute.phpt
+++ b/ext/dom/tests/modern/spec/Element_toggleAttribute.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$container = $dom->appendChild($dom->createElement('container'));
$container->toggleAttribute('hidden');
@@ -13,14 +13,14 @@ $container->toggleAttribute('xmlns:foo');
$container->toggleAttribute('xmlns:bar');
$container->toggleAttribute('xmlns');
-echo $dom->saveHTML(), "\n";
+echo $dom->saveHtml(), "\n";
$container->toggleAttribute('hidden');
$container->toggleAttribute('xmlns:foo');
$container->toggleAttribute('xmlns:bar');
$container->toggleAttribute('xmlns');
-echo $dom->saveHTML(), "\n";
+echo $dom->saveHtml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/HTMLDocument_createCDATASection.phpt b/ext/dom/tests/modern/spec/HTMLDocument_createCDATASection.phpt
index de9989510ad..1787ae29f95 100644
--- a/ext/dom/tests/modern/spec/HTMLDocument_createCDATASection.phpt
+++ b/ext/dom/tests/modern/spec/HTMLDocument_createCDATASection.phpt
@@ -1,10 +1,10 @@
--TEST--
-DOM\HTMLDocument::createCDATASection()
+Dom\HTMLDocument::createCDATASection()
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
try {
$dom->createCDATASection("foo");
} catch (DOMException $e) {
@@ -18,7 +18,7 @@ try {
echo $e->getMessage(), "\n";
}
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
try {
$dom->createCDATASection("]]>");
} catch (DOMException $e) {
diff --git a/ext/dom/tests/modern/spec/HTMLDocument_createProcessingInstruction.phpt b/ext/dom/tests/modern/spec/HTMLDocument_createProcessingInstruction.phpt
index 7cb459f9866..f1a60b875b1 100644
--- a/ext/dom/tests/modern/spec/HTMLDocument_createProcessingInstruction.phpt
+++ b/ext/dom/tests/modern/spec/HTMLDocument_createProcessingInstruction.phpt
@@ -1,10 +1,10 @@
--TEST--
-DOM\HTMLDocument::createProcessingInstruction()
+Dom\HTMLDocument::createProcessingInstruction()
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
try {
$dom->createProcessingInstruction("?>", "");
} catch (DOMException $e) {
@@ -25,7 +25,7 @@ try {
}
$dom->appendChild($dom->createProcessingInstruction("foo", ""));
$dom->appendChild($dom->createProcessingInstruction("foo", "bar"));
-echo $dom->saveHTML();
+echo $dom->saveHtml();
?>
--EXPECT--
int(5)
diff --git a/ext/dom/tests/modern/spec/HTMLDocument_getElementsByTagName.phpt b/ext/dom/tests/modern/spec/HTMLDocument_getElementsByTagName.phpt
index c19a94ada25..206ee6e640d 100644
--- a/ext/dom/tests/modern/spec/HTMLDocument_getElementsByTagName.phpt
+++ b/ext/dom/tests/modern/spec/HTMLDocument_getElementsByTagName.phpt
@@ -8,7 +8,7 @@ dom
require __DIR__ . "/node_list_dump.inc";
require __DIR__ . "/create_element_util.inc";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$container = $dom->appendChild(createElement($dom, "container"));
$container->appendChild(createElement($dom, "HTML", "1"));
$container->appendChild(createElementNS($dom, "http://www.w3.org/1999/xhtml", "html", "2"));
diff --git a/ext/dom/tests/modern/spec/HTMLDocument_importNode_01.phpt b/ext/dom/tests/modern/spec/HTMLDocument_importNode_01.phpt
index 8108567a04f..5d5b9938de9 100644
--- a/ext/dom/tests/modern/spec/HTMLDocument_importNode_01.phpt
+++ b/ext/dom/tests/modern/spec/HTMLDocument_importNode_01.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString(<<<XML
+$dom = Dom\XMLDocument::createFromString(<<<XML
<?xml version="1.0"?>
<html>
<body xmlns="http://www.w3.org/1999/xhtml">
@@ -19,7 +19,7 @@ $dom = DOM\XMLDocument::createFromString(<<<XML
XML);
// Note the HTMLDocument class!
-$dom2 = DOM\HTMLDocument::createEmpty();
+$dom2 = Dom\HTMLDocument::createEmpty();
$imported = $dom2->importNode($dom->documentElement, true);
$dom2->appendChild($imported);
@@ -28,7 +28,7 @@ $default_p = $body->lastElementChild;
var_dump($default_p->prefix);
var_dump($default_p->namespaceURI);
-echo $dom2->saveXML();
+echo $dom2->saveXml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/NamedNodeMap_dimensions.phpt b/ext/dom/tests/modern/spec/NamedNodeMap_dimensions.phpt
index eb015911baa..38e00defe62 100644
--- a/ext/dom/tests/modern/spec/NamedNodeMap_dimensions.phpt
+++ b/ext/dom/tests/modern/spec/NamedNodeMap_dimensions.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString('<root a="1" b="2" c="3"></root>');
+$dom = Dom\XMLDocument::createFromString('<root a="1" b="2" c="3"></root>');
$attributes = $dom->documentElement->attributes;
$test_values = [-1, 0, 1, 2, 3, 1.0, 1.1, true, null, "0", "", "1", "8", "a", "b", "c", "d"];
@@ -58,9 +58,9 @@ string(1) "b"
bool(true)
bool(false)
--- true ---
-Cannot access offset of type bool on DOM\NamedNodeMap
+Cannot access offset of type bool on Dom\NamedNodeMap
--- null ---
-Cannot access offset of type null on DOM\NamedNodeMap
+Cannot access offset of type null on Dom\NamedNodeMap
--- "0" ---
string(1) "a"
bool(true)
diff --git a/ext/dom/tests/modern/spec/NamedNodeMap_dimensions_errors.phpt b/ext/dom/tests/modern/spec/NamedNodeMap_dimensions_errors.phpt
index 8f5101c55e4..848b1a2c0b0 100644
--- a/ext/dom/tests/modern/spec/NamedNodeMap_dimensions_errors.phpt
+++ b/ext/dom/tests/modern/spec/NamedNodeMap_dimensions_errors.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString('<root a="1" b="2" c="3"></root>');
+$dom = Dom\XMLDocument::createFromString('<root a="1" b="2" c="3"></root>');
$attributes = $dom->documentElement->attributes;
try {
@@ -16,4 +16,4 @@ try {
?>
--EXPECT--
-Cannot append to DOM\NamedNodeMap
+Cannot append to Dom\NamedNodeMap
diff --git a/ext/dom/tests/modern/spec/NamedNodeMap_getNamedItem.phpt b/ext/dom/tests/modern/spec/NamedNodeMap_getNamedItem.phpt
index ab6f7e027d3..0e7d021f4e5 100644
--- a/ext/dom/tests/modern/spec/NamedNodeMap_getNamedItem.phpt
+++ b/ext/dom/tests/modern/spec/NamedNodeMap_getNamedItem.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createFromString(<<<HTML
+$dom = Dom\HTMLDocument::createFromString(<<<HTML
<!DOCTYPE html>
<html>
<head>
@@ -36,7 +36,7 @@ var_dump($attributes["xmlns:foo"]->value);
echo "--- On XML document ---\n";
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
$dom->appendChild($dom->importNode($body, true));
$body = $dom->getElementsByTagName('body')->item(0);
diff --git a/ext/dom/tests/modern/spec/NodeList_dimensions.phpt b/ext/dom/tests/modern/spec/NodeList_dimensions.phpt
index a20e1c98ed8..f5fe6480e64 100644
--- a/ext/dom/tests/modern/spec/NodeList_dimensions.phpt
+++ b/ext/dom/tests/modern/spec/NodeList_dimensions.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString('<root><a/><b/><c/></root>');
+$dom = Dom\XMLDocument::createFromString('<root><a/><b/><c/></root>');
$children = $dom->documentElement->childNodes;
$test_values = [-1, 0, 1, 2, 3, 1.0, 1.1, true, null, "0", "1", "", "foo"];
@@ -58,9 +58,9 @@ string(1) "b"
bool(true)
bool(false)
--- true ---
-Cannot access offset of type bool on DOM\NodeList
+Cannot access offset of type bool on Dom\NodeList
--- null ---
-Cannot access offset of type null on DOM\NodeList
+Cannot access offset of type null on Dom\NodeList
--- "0" ---
string(1) "a"
bool(true)
@@ -70,6 +70,6 @@ string(1) "b"
bool(true)
bool(false)
--- "" ---
-Cannot access offset of type string on DOM\NodeList
+Cannot access offset of type string on Dom\NodeList
--- "foo" ---
-Cannot access offset of type string on DOM\NodeList
+Cannot access offset of type string on Dom\NodeList
diff --git a/ext/dom/tests/modern/spec/NodeList_dimensions_errors.phpt b/ext/dom/tests/modern/spec/NodeList_dimensions_errors.phpt
index 9c0b10e6f75..bfb882823b7 100644
--- a/ext/dom/tests/modern/spec/NodeList_dimensions_errors.phpt
+++ b/ext/dom/tests/modern/spec/NodeList_dimensions_errors.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString('<root><a/><b/><c/></root>');
+$dom = Dom\XMLDocument::createFromString('<root><a/><b/><c/></root>');
$children = $dom->documentElement->childNodes;
try {
@@ -16,4 +16,4 @@ try {
?>
--EXPECT--
-Cannot append to DOM\NodeList
+Cannot append to Dom\NodeList
diff --git a/ext/dom/tests/modern/spec/Node_appendChild_attribute.phpt b/ext/dom/tests/modern/spec/Node_appendChild_attribute.phpt
index c18e2527c02..3e3a5674c6a 100644
--- a/ext/dom/tests/modern/spec/Node_appendChild_attribute.phpt
+++ b/ext/dom/tests/modern/spec/Node_appendChild_attribute.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\Node::appendChild() with attribute should fail
+Dom\Node::appendChild() with attribute should fail
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
$element = $dom->createElement('foo');
$attr = $dom->createAttribute('bar');
diff --git a/ext/dom/tests/modern/spec/Node_appendChild_fragment_multiple_elements.phpt b/ext/dom/tests/modern/spec/Node_appendChild_fragment_multiple_elements.phpt
index 86b90e16087..fc62d89811b 100644
--- a/ext/dom/tests/modern/spec/Node_appendChild_fragment_multiple_elements.phpt
+++ b/ext/dom/tests/modern/spec/Node_appendChild_fragment_multiple_elements.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\Node::appendChild() with fragment of multiple elements
+Dom\Node::appendChild() with fragment of multiple elements
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
$fragment = $dom->createDocumentFragment();
$fragment->appendChild($dom->createElement('foo'));
@@ -17,7 +17,7 @@ try {
echo $e->getMessage(), "\n";
}
-echo $dom->saveXML($fragment), "\n";
+echo $dom->saveXml($fragment), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/Node_appendChild_invalid_parent.phpt b/ext/dom/tests/modern/spec/Node_appendChild_invalid_parent.phpt
index 6f2e3f3762a..af99bfc3805 100644
--- a/ext/dom/tests/modern/spec/Node_appendChild_invalid_parent.phpt
+++ b/ext/dom/tests/modern/spec/Node_appendChild_invalid_parent.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\Node::appendChild() invalid parent
+Dom\Node::appendChild() invalid parent
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
$text = $dom->createTextNode('Hello World');
$cdata = $dom->createCDATASection('Hello World');
diff --git a/ext/dom/tests/modern/spec/Node_baseURI.phpt b/ext/dom/tests/modern/spec/Node_baseURI.phpt
index 80a07fa280d..b262bda51f6 100644
--- a/ext/dom/tests/modern/spec/Node_baseURI.phpt
+++ b/ext/dom/tests/modern/spec/Node_baseURI.phpt
@@ -5,14 +5,14 @@ dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$html = $dom->appendChild($dom->createElement('html'));
var_dump($html->baseURI);
-$dom = DOM\HTMLDocument::createFromFile(__DIR__ . "/../../empty.html", LIBXML_NOERROR);
+$dom = Dom\HTMLDocument::createFromFile(__DIR__ . "/../../empty.html", LIBXML_NOERROR);
var_dump($dom->documentElement->baseURI);
-$dom = DOM\HTMLDocument::createFromString(<<<HTML
+$dom = Dom\HTMLDocument::createFromString(<<<HTML
<!DOCTYPE html>
<html>
<head>
diff --git a/ext/dom/tests/modern/spec/Node_cloneNode_copy_document_properties.phpt b/ext/dom/tests/modern/spec/Node_cloneNode_copy_document_properties.phpt
index a6928b4a697..7894aa0a313 100644
--- a/ext/dom/tests/modern/spec/Node_cloneNode_copy_document_properties.phpt
+++ b/ext/dom/tests/modern/spec/Node_cloneNode_copy_document_properties.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\Node::cloneNode() should copy the document properties
+Dom\Node::cloneNode() should copy the document properties
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$dom = $dom->cloneNode();
$dom->appendChild($dom->createElement("foo"));
diff --git a/ext/dom/tests/modern/spec/Node_getRootNode.phpt b/ext/dom/tests/modern/spec/Node_getRootNode.phpt
index 826a83055fe..b63ce50f98e 100644
--- a/ext/dom/tests/modern/spec/Node_getRootNode.phpt
+++ b/ext/dom/tests/modern/spec/Node_getRootNode.phpt
@@ -1,5 +1,5 @@
--TEST--
-DOM\Node::getRootNode()
+Dom\Node::getRootNode()
--EXTENSIONS--
dom
--FILE--
@@ -7,7 +7,7 @@ dom
// Same as DOMNode_getRootNode.phpt but for modern DOM
-$dom = DOM\XMLDocument::createFromString('<?xml version="1.0"?><html><body/></html>');
+$dom = Dom\XMLDocument::createFromString('<?xml version="1.0"?><html><body/></html>');
var_dump($dom->documentElement->firstElementChild->getRootNode() === $dom);
$p = $dom->createElement('p');
diff --git a/ext/dom/tests/modern/spec/Node_insertBefore_01.phpt b/ext/dom/tests/modern/spec/Node_insertBefore_01.phpt
index 7672e8e9719..967334bbeba 100644
--- a/ext/dom/tests/modern/spec/Node_insertBefore_01.phpt
+++ b/ext/dom/tests/modern/spec/Node_insertBefore_01.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\Node::insertBefore() with DocumentFragment and dtd
+Dom\Node::insertBefore() with DocumentFragment and dtd
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createFromString('<!DOCTYPE html><html><head></head><body></body></html>');
+$dom = Dom\HTMLDocument::createFromString('<!DOCTYPE html><html><head></head><body></body></html>');
$dom->documentElement->remove();
$fragment = $dom->createDocumentFragment();
@@ -17,7 +17,7 @@ try {
echo $e->getMessage(), "\n";
}
-echo $dom->saveHTML(), "\n";
+echo $dom->saveHtml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/Node_insertBefore_02.phpt b/ext/dom/tests/modern/spec/Node_insertBefore_02.phpt
index aa252e7eed0..390dba0f176 100644
--- a/ext/dom/tests/modern/spec/Node_insertBefore_02.phpt
+++ b/ext/dom/tests/modern/spec/Node_insertBefore_02.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\Node::insertBefore() with DocumentFragment and a document element
+Dom\Node::insertBefore() with DocumentFragment and a document element
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createFromString('<!DOCTYPE html><html><head></head><body></body></html>');
+$dom = Dom\HTMLDocument::createFromString('<!DOCTYPE html><html><head></head><body></body></html>');
$fragment = $dom->createDocumentFragment();
$fragment->appendChild($dom->createElement('a'));
@@ -16,7 +16,7 @@ try {
echo $e->getMessage(), "\n";
}
-echo $dom->saveHTML(), "\n";
+echo $dom->saveHtml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/Node_isDefaultNamespace.phpt b/ext/dom/tests/modern/spec/Node_isDefaultNamespace.phpt
index 56eee90553c..cd89174df7b 100644
--- a/ext/dom/tests/modern/spec/Node_isDefaultNamespace.phpt
+++ b/ext/dom/tests/modern/spec/Node_isDefaultNamespace.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\Node::isDefaultNamespace()
+Dom\Node::isDefaultNamespace()
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createFromString(<<<HTML
+$dom = Dom\HTMLDocument::createFromString(<<<HTML
<!DOCTYPE html>
<html>
<body>
diff --git a/ext/dom/tests/modern/spec/Node_isEqualNode_01.phpt b/ext/dom/tests/modern/spec/Node_isEqualNode_01.phpt
index 51b5648d8a1..c31d8259511 100644
--- a/ext/dom/tests/modern/spec/Node_isEqualNode_01.phpt
+++ b/ext/dom/tests/modern/spec/Node_isEqualNode_01.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\Node::isEqualNode edge cases 01
+Dom\Node::isEqualNode edge cases 01
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$dom->append($dom->createElement("container"));
$e1 = $dom->documentElement->appendChild($dom->createElementNS("urn:example1", "example:foo"));
$e1->after("\n");
@@ -14,11 +14,11 @@ $e2 = $dom->documentElement->appendChild($dom->createElementNS("urn:example2", "
$e2->setAttributeNS("urn:example2", "example2:bar", "baz1");
$e2->setAttributeNS("urn:example1", "example2:bar", "baz2");
-$dom2 = DOM\HTMLDocument::createFromString("<!DOCTYPE HTML>" . $dom->saveHTML());
+$dom2 = Dom\HTMLDocument::createFromString("<!DOCTYPE HTML>" . $dom->saveHtml());
// Shouldn't match because the attributes can't roundtrip.
-var_dump($dom->saveHTML($dom->getElementsByTagName("container")[0]));
-var_dump($dom2->saveHTML($dom2->getElementsByTagName("container")[0]));
+var_dump($dom->saveHtml($dom->getElementsByTagName("container")[0]));
+var_dump($dom2->saveHtml($dom2->getElementsByTagName("container")[0]));
var_dump($dom->getElementsByTagName("container")[0]->isEqualNode($dom2->getElementsByTagName("container")[0]));
?>
diff --git a/ext/dom/tests/modern/spec/Node_isEqualNode_02.phpt b/ext/dom/tests/modern/spec/Node_isEqualNode_02.phpt
index bc7f23a7d98..32728595ca5 100644
--- a/ext/dom/tests/modern/spec/Node_isEqualNode_02.phpt
+++ b/ext/dom/tests/modern/spec/Node_isEqualNode_02.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\Node::isEqualNode edge cases 02
+Dom\Node::isEqualNode edge cases 02
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$dom->append($dom->createElement("container"));
$e1 = $dom->documentElement->appendChild($dom->createElement("foo1"));
$e1->after("\n");
@@ -17,10 +17,10 @@ $e2->setAttribute("bar2", "baz");
$e2->setAttributeNodeNS($child = $dom->createAttributeNS("http://example.com", "foo:bar"));
$e2->removeAttributeNode($child);
-$dom2 = DOM\HTMLDocument::createFromString("<!DOCTYPE HTML>" . $dom->saveHTML());
+$dom2 = Dom\HTMLDocument::createFromString("<!DOCTYPE HTML>" . $dom->saveHtml());
-var_dump($dom->saveHTML($dom->getElementsByTagName("container")[0]));
-var_dump($dom2->saveHTML($dom2->getElementsByTagName("container")[0]));
+var_dump($dom->saveHtml($dom->getElementsByTagName("container")[0]));
+var_dump($dom2->saveHtml($dom2->getElementsByTagName("container")[0]));
var_dump($dom->getElementsByTagName("container")[0]->isEqualNode($dom2->getElementsByTagName("container")[0]));
?>
diff --git a/ext/dom/tests/modern/spec/Node_lookupNamespaceURI.phpt b/ext/dom/tests/modern/spec/Node_lookupNamespaceURI.phpt
index c4e1015144d..9512891709a 100644
--- a/ext/dom/tests/modern/spec/Node_lookupNamespaceURI.phpt
+++ b/ext/dom/tests/modern/spec/Node_lookupNamespaceURI.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\Node::lookupNamespaceURI()
+Dom\Node::lookupNamespaceURI()
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createFromString(<<<HTML
+$dom = Dom\HTMLDocument::createFromString(<<<HTML
<!DOCTYPE html>
<html>
<body>
@@ -56,7 +56,7 @@ var_dump($body->lookupNamespaceURI(NULL));
var_dump($body->lookupNamespaceURI("a"));
echo "--- lookup in empty document ---\n";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
var_dump($dom->lookupNamespaceURI(""));
var_dump($dom->lookupNamespaceURI(NULL));
var_dump($dom->lookupNamespaceURI("a"));
diff --git a/ext/dom/tests/modern/spec/Node_lookupPrefix.phpt b/ext/dom/tests/modern/spec/Node_lookupPrefix.phpt
index 4bb52004027..913ede69cec 100644
--- a/ext/dom/tests/modern/spec/Node_lookupPrefix.phpt
+++ b/ext/dom/tests/modern/spec/Node_lookupPrefix.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\Node::lookupPrefix()
+Dom\Node::lookupPrefix()
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString(<<<XML
+$dom = Dom\XMLDocument::createFromString(<<<XML
<?xml version="1.0"?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:x="test">
diff --git a/ext/dom/tests/modern/spec/Node_nodeName.phpt b/ext/dom/tests/modern/spec/Node_nodeName.phpt
index 84343731a00..ac669b6ec90 100644
--- a/ext/dom/tests/modern/spec/Node_nodeName.phpt
+++ b/ext/dom/tests/modern/spec/Node_nodeName.phpt
@@ -1,5 +1,5 @@
--TEST--
-DOM\Node::$nodeName
+Dom\Node::$nodeName
--EXTENSIONS--
dom
--FILE--
@@ -7,7 +7,7 @@ dom
echo "--- For HTML document ---\n";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$dom->appendChild($dom->createElement('container'));
var_dump($dom->createAttributeNS('http://www.w3.org/1999/xhtml', 'html')->nodeName);
@@ -24,7 +24,7 @@ var_dump($dom->createElementNS(null, 'html')->nodeName);
echo "--- For XML document ---\n";
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
$dom->appendChild($dom->createElement('container'));
var_dump($dom->createAttributeNS('http://www.w3.org/1999/xhtml', 'html')->nodeName);
diff --git a/ext/dom/tests/modern/spec/Node_nodeValue_element.phpt b/ext/dom/tests/modern/spec/Node_nodeValue_element.phpt
index 749614ea9fc..a3e23b1381d 100644
--- a/ext/dom/tests/modern/spec/Node_nodeValue_element.phpt
+++ b/ext/dom/tests/modern/spec/Node_nodeValue_element.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\Node::$nodeValue on an element
+Dom\Node::$nodeValue on an element
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$foo = $dom->createElement("foo");
$foo->textContent = "bar";
var_dump($foo->nodeValue);
diff --git a/ext/dom/tests/modern/spec/Node_normalize.phpt b/ext/dom/tests/modern/spec/Node_normalize.phpt
index 04848e5d019..7233ff4c5bd 100644
--- a/ext/dom/tests/modern/spec/Node_normalize.phpt
+++ b/ext/dom/tests/modern/spec/Node_normalize.phpt
@@ -1,5 +1,5 @@
--TEST--
-DOM\Node::normalize()
+Dom\Node::normalize()
--EXTENSIONS--
dom
--FILE--
@@ -19,7 +19,7 @@ dom
* Normalize title. Calculate the number of title text nodes (1).
*/
-$doc = DOM\XMLDocument::createEmpty();
+$doc = Dom\XMLDocument::createEmpty();
$root = $doc->createElement('book');
$doc->appendChild($root);
diff --git a/ext/dom/tests/modern/spec/Node_normalize_edge_case.phpt b/ext/dom/tests/modern/spec/Node_normalize_edge_case.phpt
index 03b75ede7f3..0e3a52b1bbc 100644
--- a/ext/dom/tests/modern/spec/Node_normalize_edge_case.phpt
+++ b/ext/dom/tests/modern/spec/Node_normalize_edge_case.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\Node::normalize() edge case
+Dom\Node::normalize() edge case
--EXTENSIONS--
dom
--FILE--
<?php
-$doc = DOM\XMLDocument::createEmpty();
+$doc = Dom\XMLDocument::createEmpty();
$container = $doc->appendChild($doc->createElement("container"));
$container->appendChild($doc->createTextNode(""));
@@ -14,7 +14,7 @@ $container->appendChild($doc->createTextNode(""));
$doc->normalize();
-echo $doc->saveXML(), "\n";
+echo $doc->saveXml(), "\n";
var_dump($middle->textContent);
diff --git a/ext/dom/tests/modern/spec/Node_replaceChild_edge_cases.phpt b/ext/dom/tests/modern/spec/Node_replaceChild_edge_cases.phpt
index e76fdc62ee7..afa6d1e8a81 100644
--- a/ext/dom/tests/modern/spec/Node_replaceChild_edge_cases.phpt
+++ b/ext/dom/tests/modern/spec/Node_replaceChild_edge_cases.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\Node::replaceChild() edge cases
+Dom\Node::replaceChild() edge cases
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createFromString("<!DOCTYPE html><html></html>");
+$dom = Dom\HTMLDocument::createFromString("<!DOCTYPE html><html></html>");
$dom->documentElement->remove();
$parent = $dom->createElement("parent");
$child = $dom->createElement("child");
@@ -46,7 +46,7 @@ try {
echo "--- Invalid child to replace with ---\n";
try {
- $entityReference = $dom->importNode(DOM\XMLDocument::createEmpty()->createEntityReference("foo"));
+ $entityReference = $dom->importNode(Dom\XMLDocument::createEmpty()->createEntityReference("foo"));
$parent->replaceChild($entityReference, $child);
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
@@ -108,14 +108,14 @@ try {
echo "--- Replace parent with itself ---\n";
$dom->replaceChild($parent, $parent);
-echo $dom->saveHTML(), "\n";
+echo $dom->saveHtml(), "\n";
echo "--- Replace parent with single-child fragment ---\n";
$fragment = $dom->createDocumentFragment();
$fragment->appendChild($dom->createElement("new-child"));
$dom->replaceChild($fragment, $parent);
-echo $dom->saveHTML(), "\n";
+echo $dom->saveHtml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/ParentNode_append_exception_consistency.phpt b/ext/dom/tests/modern/spec/ParentNode_append_exception_consistency.phpt
index a8a65ca7bc5..67a964a7ec5 100644
--- a/ext/dom/tests/modern/spec/ParentNode_append_exception_consistency.phpt
+++ b/ext/dom/tests/modern/spec/ParentNode_append_exception_consistency.phpt
@@ -4,7 +4,7 @@ Consistency of parent node after exception in ParentNode::append()
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
$fragment = $dom->createDocumentFragment();
$fragment->append($element = $dom->createElement("foo"));
$fragment->append($dom->createElement("bar"));
@@ -18,7 +18,7 @@ var_dump($element->parentNode);
?>
--EXPECT--
Exception: Cannot have more than one element child in a document
-object(DOM\DocumentFragment)#2 (17) {
+object(Dom\DocumentFragment)#2 (17) {
["firstElementChild"]=>
string(22) "(object value omitted)"
["lastElementChild"]=>
diff --git a/ext/dom/tests/modern/spec/ParentNode_edge_case.phpt b/ext/dom/tests/modern/spec/ParentNode_edge_case.phpt
index 5df27d5a276..367f1437c67 100644
--- a/ext/dom/tests/modern/spec/ParentNode_edge_case.phpt
+++ b/ext/dom/tests/modern/spec/ParentNode_edge_case.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$container = $dom->createElement('container');
try {
$container->append($dom);
diff --git a/ext/dom/tests/modern/spec/ParentNode_hierarchy_text_nodes.phpt b/ext/dom/tests/modern/spec/ParentNode_hierarchy_text_nodes.phpt
index a4ebc594507..f81450ca261 100644
--- a/ext/dom/tests/modern/spec/ParentNode_hierarchy_text_nodes.phpt
+++ b/ext/dom/tests/modern/spec/ParentNode_hierarchy_text_nodes.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
try {
$dom->append("bar");
diff --git a/ext/dom/tests/modern/spec/ProcessingInstruction_data_manipulation.phpt b/ext/dom/tests/modern/spec/ProcessingInstruction_data_manipulation.phpt
index 498561a8b78..33198c8552a 100644
--- a/ext/dom/tests/modern/spec/ProcessingInstruction_data_manipulation.phpt
+++ b/ext/dom/tests/modern/spec/ProcessingInstruction_data_manipulation.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString('<root><?pi value?></root>');
+$dom = Dom\XMLDocument::createFromString('<root><?pi value?></root>');
$pi = $dom->documentElement->firstChild;
diff --git a/ext/dom/tests/modern/spec/Text_splitText_edge_case.phpt b/ext/dom/tests/modern/spec/Text_splitText_edge_case.phpt
index 5b46a2ba8dc..4bd79b9b4a8 100644
--- a/ext/dom/tests/modern/spec/Text_splitText_edge_case.phpt
+++ b/ext/dom/tests/modern/spec/Text_splitText_edge_case.phpt
@@ -1,10 +1,10 @@
--TEST--
-DOM\Text:splitText() edge case
+Dom\Text:splitText() edge case
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$text = $dom->createTextNode('Hello World!');
var_dump($text->splitText(5)->wholeText);
try {
@@ -20,5 +20,5 @@ try {
?>
--EXPECT--
string(7) " World!"
-DOM\Text::splitText(): Argument #1 ($offset) must be greater than or equal to 0
+Dom\Text::splitText(): Argument #1 ($offset) must be greater than or equal to 0
Index Size Error
diff --git a/ext/dom/tests/modern/spec/XMLDocument_getElementsByTagName.phpt b/ext/dom/tests/modern/spec/XMLDocument_getElementsByTagName.phpt
index ca521c6ff2c..4fa06f5e88d 100644
--- a/ext/dom/tests/modern/spec/XMLDocument_getElementsByTagName.phpt
+++ b/ext/dom/tests/modern/spec/XMLDocument_getElementsByTagName.phpt
@@ -8,7 +8,7 @@ dom
require __DIR__ . "/node_list_dump.inc";
require __DIR__ . "/create_element_util.inc";
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
$container = $dom->appendChild(createElement($dom, "container"));
$container->appendChild(createElement($dom, "HTML", "1"));
$container->appendChild(createElementNS($dom, "http://www.w3.org/1999/xhtml", "html", "2"));
diff --git a/ext/dom/tests/modern/spec/XMLDocument_version.phpt b/ext/dom/tests/modern/spec/XMLDocument_version.phpt
index accc06ce3d7..82f38839ea2 100644
--- a/ext/dom/tests/modern/spec/XMLDocument_version.phpt
+++ b/ext/dom/tests/modern/spec/XMLDocument_version.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString('<root><child/></root>');
+$dom = Dom\XMLDocument::createFromString('<root><child/></root>');
var_dump($dom->xmlVersion);
foreach (['0.1', '1.0', '1.1', '', 'foo'] as $version) {
diff --git a/ext/dom/tests/modern/spec/appendChild_dtd_legacy.phpt b/ext/dom/tests/modern/spec/appendChild_dtd_legacy.phpt
index 25a106479f1..20a69b3b545 100644
--- a/ext/dom/tests/modern/spec/appendChild_dtd_legacy.phpt
+++ b/ext/dom/tests/modern/spec/appendChild_dtd_legacy.phpt
@@ -27,7 +27,7 @@ try {
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
-echo $other->saveXML();
+echo $other->saveXml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/append_text_nodes_invalid_hierarchy.phpt b/ext/dom/tests/modern/spec/append_text_nodes_invalid_hierarchy.phpt
index 5b66c030a4f..ea530d675c3 100644
--- a/ext/dom/tests/modern/spec/append_text_nodes_invalid_hierarchy.phpt
+++ b/ext/dom/tests/modern/spec/append_text_nodes_invalid_hierarchy.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
try {
$dom->append("foo", "bar", "baz", $dom);
@@ -19,7 +19,7 @@ try {
echo $e->getMessage(), "\n";
}
-var_dump($dom->saveHTML());
+var_dump($dom->saveHtml());
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/attribute_entity_expansion.phpt b/ext/dom/tests/modern/spec/attribute_entity_expansion.phpt
index 19a8f91024e..2475a5e13ff 100644
--- a/ext/dom/tests/modern/spec/attribute_entity_expansion.phpt
+++ b/ext/dom/tests/modern/spec/attribute_entity_expansion.phpt
@@ -4,36 +4,36 @@ Attribute entity expansion
dom
--FILE--
<?php
-$doc = DOM\HTMLDocument::createEmpty();
+$doc = Dom\HTMLDocument::createEmpty();
$elt = $doc->createElement('elt');
$doc->appendChild($elt);
$elt->setAttribute('a','&');
-print $doc->saveHTML($elt) . "\n";
+print $doc->saveHtml($elt) . "\n";
$attr = $elt->getAttributeNode('a');
$attr->value = '&';
print "$attr->value\n";
-print $doc->saveHTML($elt) . "\n";
+print $doc->saveHtml($elt) . "\n";
$attr->removeChild($attr->firstChild);
-print $doc->saveHTML($elt) . "\n";
+print $doc->saveHtml($elt) . "\n";
$attr->nodeValue = '&';
print "$attr->nodeValue\n";
-print $doc->saveHTML($elt) . "\n";
+print $doc->saveHtml($elt) . "\n";
$attr->nodeValue = '&';
print "$attr->nodeValue\n";
-print $doc->saveHTML($elt) . "\n";
+print $doc->saveHtml($elt) . "\n";
$elt->removeAttributeNode($attr);
$elt->setAttributeNS('http://www.w3.org/2000/svg', 'svg:id','&');
-print $doc->saveHTML($elt) . "\n";
+print $doc->saveHtml($elt) . "\n";
$attr = $elt->getAttributeNodeNS('http://www.w3.org/2000/svg', 'id');
$attr->value = '<&';
print "$attr->value\n";
-print $doc->saveHTML($elt) . "\n";
+print $doc->saveHtml($elt) . "\n";
?>
--EXPECT--
<elt a="&"></elt>
diff --git a/ext/dom/tests/modern/spec/attribute_entity_expansion_legacy.phpt b/ext/dom/tests/modern/spec/attribute_entity_expansion_legacy.phpt
index 9b8ed50801f..72aa18c9da1 100644
--- a/ext/dom/tests/modern/spec/attribute_entity_expansion_legacy.phpt
+++ b/ext/dom/tests/modern/spec/attribute_entity_expansion_legacy.phpt
@@ -8,32 +8,32 @@ $doc = new DOMDocument;
$elt = $doc->createElement('elt');
$doc->appendChild($elt);
$elt->setAttribute('a','&');
-print $doc->saveXML($elt) . "\n";
+print $doc->saveXml($elt) . "\n";
$attr = $elt->getAttributeNode('a');
$attr->value = '&';
print "$attr->value\n";
-print $doc->saveXML($elt) . "\n";
+print $doc->saveXml($elt) . "\n";
$attr->removeChild($attr->firstChild);
-print $doc->saveXML($elt) . "\n";
+print $doc->saveXml($elt) . "\n";
$attr->nodeValue = '&';
print "$attr->nodeValue\n";
-print $doc->saveXML($elt) . "\n";
+print $doc->saveXml($elt) . "\n";
$attr->nodeValue = '&';
print "$attr->nodeValue\n";
-print $doc->saveXML($elt) . "\n";
+print $doc->saveXml($elt) . "\n";
$elt->removeAttributeNode($attr);
$elt->setAttributeNS('http://www.w3.org/2000/svg', 'svg:id','&');
-print $doc->saveXML($elt) . "\n";
+print $doc->saveXml($elt) . "\n";
$attr = $elt->getAttributeNodeNS('http://www.w3.org/2000/svg', 'id');
$attr->value = '<&';
print "$attr->value\n";
-print $doc->saveXML($elt) . "\n";
+print $doc->saveXml($elt) . "\n";
?>
--EXPECTF--
<elt a="&"/>
diff --git a/ext/dom/tests/modern/spec/bug47530.phpt b/ext/dom/tests/modern/spec/bug47530.phpt
index 16d3078d07b..847296cbece 100644
--- a/ext/dom/tests/modern/spec/bug47530.phpt
+++ b/ext/dom/tests/modern/spec/bug47530.phpt
@@ -6,23 +6,23 @@ dom
<?php
function test_document_fragment_with_import() {
- $doc = DOM\XMLDocument::createFromString('<html xmlns="https://php.net/something" xmlns:ns="https://php.net/whatever"><element ns:foo="https://php.net/bar"/></html>');
+ $doc = Dom\XMLDocument::createFromString('<html xmlns="https://php.net/something" xmlns:ns="https://php.net/whatever"><element ns:foo="https://php.net/bar"/></html>');
$root = $doc->documentElement;
$frag = $doc->createDocumentFragment();
$frag->appendChild($doc->importNode($root->firstChild));
$root->appendChild($frag);
- echo $doc->saveXML(), "\n";
+ echo $doc->saveXml(), "\n";
}
function test_document_fragment_without_import() {
- $doc = DOM\XMLDocument::createFromString('<html xmlns=""><element xmlns:foo="https://php.net/bar"/></html>');
+ $doc = Dom\XMLDocument::createFromString('<html xmlns=""><element xmlns:foo="https://php.net/bar"/></html>');
$frag = $doc->createDocumentFragment();
$frag->appendChild($doc->createElementNS('https://php.net/bar', 'bar'));
$frag->appendChild($doc->createElementNS('', 'bar'));
$element = $doc->documentElement->firstChild;
$element->appendChild($frag);
unset($frag); // Free fragment, should not break getting the namespaceURI below
- echo $doc->saveXML(), "\n";
+ echo $doc->saveXml(), "\n";
unset($doc);
var_dump($element->firstChild->tagName);
var_dump($element->firstChild->namespaceURI);
@@ -40,13 +40,13 @@ function test_document_import() {
</feed>
XML;
- $dom = DOM\XMLDocument::createFromString($xml);
+ $dom = Dom\XMLDocument::createFromString($xml);
- $dom2 = DOM\XMLDocument::createEmpty();
+ $dom2 = Dom\XMLDocument::createEmpty();
$importedNode = $dom2->importNode($dom->documentElement, true);
$dom2->appendChild($importedNode);
- echo $dom2->saveXML(), "\n";
+ echo $dom2->saveXml(), "\n";
}
function test_partial_document_import() {
@@ -61,9 +61,9 @@ function test_partial_document_import() {
</feed>
XML;
- $dom = DOM\XMLDocument::createFromString($xml);
+ $dom = Dom\XMLDocument::createFromString($xml);
- $dom2 = DOM\XMLDocument::createFromString('<?xml version="1.0"?><container xmlns:test="https://php.net/test" xmlns="https://php.net/example"/>');
+ $dom2 = Dom\XMLDocument::createFromString('<?xml version="1.0"?><container xmlns:test="https://php.net/test" xmlns="https://php.net/example"/>');
$importedNode = $dom2->importNode($dom->documentElement, true);
$dom2->documentElement->appendChild($importedNode);
@@ -71,28 +71,28 @@ XML;
unset($importedNode);
unset($dom);
- echo $dom2->saveXML(), "\n";
+ echo $dom2->saveXml(), "\n";
}
function test_document_import_with_attributes() {
- $dom = DOM\XMLDocument::createFromString('<?xml version="1.0"?><div xmlns="https://php.net/default" xmlns:example="https://php.net/example"><p example:test="test"/><i/></div>');
- $dom2 = DOM\XMLDocument::createFromString('<?xml version="1.0"?><div xmlns:example="https://php.net/somethingelse"/>');
+ $dom = Dom\XMLDocument::createFromString('<?xml version="1.0"?><div xmlns="https://php.net/default" xmlns:example="https://php.net/example"><p example:test="test"/><i/></div>');
+ $dom2 = Dom\XMLDocument::createFromString('<?xml version="1.0"?><div xmlns:example="https://php.net/somethingelse"/>');
$dom2->documentElement->appendChild($dom2->importNode($dom->documentElement->firstChild));
- echo $dom2->saveXML(), "\n";
+ echo $dom2->saveXml(), "\n";
$dom2->documentElement->firstChild->appendChild($dom2->importNode($dom->documentElement->firstChild->nextSibling));
- echo $dom2->saveXML(), "\n";
+ echo $dom2->saveXml(), "\n";
}
function test_appendChild_with_shadowing() {
- $dom = DOM\XMLDocument::createFromString('<?xml version="1.0"?><container xmlns:default="http://php.net/default"><a xmlns:foo="http://php.net/bar"/><b xmlns:foo="http://php.net/foo"><default:test foo:bar=""/><foo:test2/></b></container>');
+ $dom = Dom\XMLDocument::createFromString('<?xml version="1.0"?><container xmlns:default="http://php.net/default"><a xmlns:foo="http://php.net/bar"/><b xmlns:foo="http://php.net/foo"><default:test foo:bar=""/><foo:test2/></b></container>');
$a = $dom->documentElement->firstElementChild;
$b = $a->nextSibling;
$b->remove();
$a->appendChild($b);
- echo $dom->saveXML(), "\n";
+ echo $dom->saveXml(), "\n";
}
echo "-- Test document fragment with import --\n";
diff --git a/ext/dom/tests/modern/spec/bug47847.phpt b/ext/dom/tests/modern/spec/bug47847.phpt
index 70a0d7bc135..5318e58c64e 100644
--- a/ext/dom/tests/modern/spec/bug47847.phpt
+++ b/ext/dom/tests/modern/spec/bug47847.phpt
@@ -4,7 +4,7 @@ Bug #47847 (importNode loses the namespace of an XML element)
dom
--FILE--
<?php
-$fromdom = DOM\XMLDocument::createFromString(<<<XML
+$fromdom = Dom\XMLDocument::createFromString(<<<XML
<?xml version="1.0"?>
<ns:container xmlns:ns="http://php.net">
<ns:inner xmlns="http://php.net">
@@ -13,11 +13,11 @@ $fromdom = DOM\XMLDocument::createFromString(<<<XML
</ns:container>
XML);
-$aDOM = DOM\XMLDocument::createEmpty();
+$aDOM = Dom\XMLDocument::createEmpty();
$imported = $aDOM->importNode($fromdom->documentElement->firstElementChild, true);
$aDOM->appendChild($imported);
-echo $aDOM->saveXML(), "\n";
+echo $aDOM->saveXml(), "\n";
var_dump($aDOM->documentElement->firstElementChild->prefix);
?>
diff --git a/ext/dom/tests/modern/spec/bug55294.phpt b/ext/dom/tests/modern/spec/bug55294.phpt
index b0acd5f2118..a99d17679b9 100644
--- a/ext/dom/tests/modern/spec/bug55294.phpt
+++ b/ext/dom/tests/modern/spec/bug55294.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$aDOM = DOM\XMLDocument::createFromString(<<<EOXML
+$aDOM = Dom\XMLDocument::createFromString(<<<EOXML
<A xmlns="http://example.com/A">
<B>
<C xmlns="http://example.com/C" xmlns:default="http://example.com/Z" />
@@ -14,11 +14,11 @@ $aDOM = DOM\XMLDocument::createFromString(<<<EOXML
EOXML
);
-$bDOM = DOM\XMLDocument::createEmpty();
+$bDOM = Dom\XMLDocument::createEmpty();
$node = $bDOM->importNode($aDOM->getElementsByTagNameNS('http://example.com/A', 'B')->item(0), true);
$bDOM->appendChild($node);
-echo $bDOM->saveXML(), "\n";
+echo $bDOM->saveXml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/bug81468.phpt b/ext/dom/tests/modern/spec/bug81468.phpt
index 3e0835ece1c..a56dff94c70 100644
--- a/ext/dom/tests/modern/spec/bug81468.phpt
+++ b/ext/dom/tests/modern/spec/bug81468.phpt
@@ -7,23 +7,23 @@ dom
// Note: the original expectation from https://bugs.php.net/bug.php?id=81468 isn't *entirely* right
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
$dom
->appendChild($dom->createElementNS('some:namespace', 'foo'))
->appendChild($dom->createElement('bar'));
-echo ($xml = $dom->saveXML()), "\n";
+echo ($xml = $dom->saveXml()), "\n";
-$xpath = new DOM\XPath($dom);
+$xpath = new Dom\XPath($dom);
$xpath->registerNamespace('n', 'some:namespace');
echo "/n:foo/bar -> ", count($xpath->query('/n:foo/bar')), "\n";
echo "/n:foo/n:bar -> ", count($xpath->query('/n:foo/n:bar')), "\n";
//
-$dom = DOM\XMLDocument::createFromString($xml);
-echo ($xml = $dom->saveXML()), "\n";
+$dom = Dom\XMLDocument::createFromString($xml);
+echo ($xml = $dom->saveXml()), "\n";
-$xpath = new DOM\XPath($dom);
+$xpath = new Dom\XPath($dom);
$xpath->registerNamespace('n', 'some:namespace');
echo "/n:foo/bar -> ", count($xpath->query('/n:foo/bar')), "\n";
echo "/n:foo/n:bar -> ", count($xpath->query('/n:foo/n:bar')), "\n";
diff --git a/ext/dom/tests/modern/spec/clone_conflicting_namespace_prefix.phpt b/ext/dom/tests/modern/spec/clone_conflicting_namespace_prefix.phpt
index b2afdfad3b7..29259c9c8e1 100644
--- a/ext/dom/tests/modern/spec/clone_conflicting_namespace_prefix.phpt
+++ b/ext/dom/tests/modern/spec/clone_conflicting_namespace_prefix.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString(<<<XML
+$dom = Dom\XMLDocument::createFromString(<<<XML
<?xml version="1.0"?>
<root>
<a:root1 xmlns:a="urn:a">
@@ -20,7 +20,7 @@ XML);
$dom->documentElement->firstElementChild->setAttributeNS("urn:y", "a:foo", "bar");
-echo $dom->saveXML(), "\n";
+echo $dom->saveXml(), "\n";
$clone = clone $dom->documentElement->firstElementChild;
var_dump($clone->nodeName, $clone->namespaceURI);
@@ -29,7 +29,7 @@ foreach ($clone->attributes as $attr) {
var_dump($attr->name, $attr->namespaceURI);
}
-echo $dom->saveXML($clone), "\n";
+echo $dom->saveXml($clone), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/clone_document.phpt b/ext/dom/tests/modern/spec/clone_document.phpt
index 8a855bcb23c..6f23c888e80 100644
--- a/ext/dom/tests/modern/spec/clone_document.phpt
+++ b/ext/dom/tests/modern/spec/clone_document.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString(<<<XML
+$dom = Dom\XMLDocument::createFromString(<<<XML
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE root [
<!ELEMENT child (#PCDATA)>
@@ -28,19 +28,19 @@ var_dump($dom->getElementsByTagName("child2")[0]->firstChild->nodeName);
echo "---\n";
$clone = clone $dom;
-echo $clone->saveXML(), "\n";
+echo $clone->saveXml(), "\n";
var_dump($clone->getElementsByTagName("child2")[0]->firstChild->nodeName);
echo "---\n";
$clone = $dom->cloneNode(false);
-echo $clone->saveXML(), "\n";
+echo $clone->saveXml(), "\n";
echo "---\n";
$clone = $dom->documentElement->cloneNode(false);
-echo $clone->ownerDocument->saveXML($clone), "\n";
+echo $clone->ownerDocument->saveXml($clone), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/clone_dtd_node.phpt b/ext/dom/tests/modern/spec/clone_dtd_node.phpt
index 7fd74022eab..f0b78aec9b1 100644
--- a/ext/dom/tests/modern/spec/clone_dtd_node.phpt
+++ b/ext/dom/tests/modern/spec/clone_dtd_node.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\HTMLDocument::createFromString('<!DOCTYPE html><html></html>');
+$dom = Dom\HTMLDocument::createFromString('<!DOCTYPE html><html></html>');
$dt1 = clone $dom->doctype;
var_dump($dt1 === $dom->doctype);
diff --git a/ext/dom/tests/modern/spec/clone_entity_reference.phpt b/ext/dom/tests/modern/spec/clone_entity_reference.phpt
index b42d33e1005..aed1bc850c2 100644
--- a/ext/dom/tests/modern/spec/clone_entity_reference.phpt
+++ b/ext/dom/tests/modern/spec/clone_entity_reference.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString(<<<XML
+$dom = Dom\XMLDocument::createFromString(<<<XML
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE root [
<!ENTITY foo "bar">
@@ -14,14 +14,14 @@ $dom = DOM\XMLDocument::createFromString(<<<XML
XML);
$clone = $dom->documentElement->cloneNode(true);
-echo $dom->saveXML($clone), "\n";
+echo $dom->saveXml($clone), "\n";
var_dump($clone->firstChild->firstChild);
?>
--EXPECTF--
<root>&foo;</root>
-object(DOM\Entity)#4 (17) {
+object(Dom\Entity)#4 (17) {
["publicId"]=>
NULL
["systemId"]=>
diff --git a/ext/dom/tests/modern/spec/clone_text_nodes.phpt b/ext/dom/tests/modern/spec/clone_text_nodes.phpt
index 6809dc76900..88ccad36fdf 100644
--- a/ext/dom/tests/modern/spec/clone_text_nodes.phpt
+++ b/ext/dom/tests/modern/spec/clone_text_nodes.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
$root = $dom->appendChild($dom->createElementNS("urn:a", "a:root"));
$root->setAttribute("foo", "bar");
@@ -17,19 +17,19 @@ $child->appendChild($dom->createTextNode("c"));
$child2 = $root->appendChild($dom->createElement("child2"));
$child2->appendChild($dom->createTextNode("d"));
-echo $dom->saveXML(), "\n";
+echo $dom->saveXml(), "\n";
$clone = clone $root;
var_dump($clone->firstChild->textContent);
var_dump($clone->firstChild->nextSibling->textContent);
var_dump($clone->firstChild->nextSibling->nextSibling->textContent);
-echo $dom->saveXML($clone), "\n";
+echo $dom->saveXml($clone), "\n";
$clone = $child2->cloneNode(true);
-echo $dom->saveXML($clone), "\n";
+echo $dom->saveXml($clone), "\n";
$clone = $child2->cloneNode(false);
-echo $dom->saveXML($clone), "\n";
+echo $dom->saveXml($clone), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/default_namespace_move.phpt b/ext/dom/tests/modern/spec/default_namespace_move.phpt
index ee6d43fce82..1b937087f6e 100644
--- a/ext/dom/tests/modern/spec/default_namespace_move.phpt
+++ b/ext/dom/tests/modern/spec/default_namespace_move.phpt
@@ -5,18 +5,18 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
$root = $dom->appendChild($dom->createElementNS('urn:a', 'foo:bar'));
$child = $root->appendChild($dom->createElementNS('urn:a', 'foo:baz'));
$child->setAttributeNS("urn:b", "foo:attr", "value");
$root->remove();
$dom->appendChild($child);
-echo $dom->saveXML(), "\n";
+echo $dom->saveXml(), "\n";
-$dom2 = DOM\XMLDocument::createEmpty();
+$dom2 = Dom\XMLDocument::createEmpty();
$child = $dom2->importNode($child, true);
$dom2->appendChild($child);
-echo $dom2->saveXML(), "\n";
+echo $dom2->saveXml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/documentURI_URL.phpt b/ext/dom/tests/modern/spec/documentURI_URL.phpt
index 20ba9bbb044..3e5a797eae6 100644
--- a/ext/dom/tests/modern/spec/documentURI_URL.phpt
+++ b/ext/dom/tests/modern/spec/documentURI_URL.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString('<root><child/></root>');
+$dom = Dom\XMLDocument::createFromString('<root><child/></root>');
var_dump($dom->documentURI);
var_dump($dom->URL);
@@ -29,7 +29,7 @@ var_dump($dom->URL);
--EXPECTF--
string(%d) "%s"
string(%d) "%s"
-Cannot assign null to property DOM\Document::$URL of type string
+Cannot assign null to property Dom\Document::$URL of type string
string(0) ""
string(0) ""
string(%d) "%s"
diff --git a/ext/dom/tests/modern/spec/dom_parsing_gh44.phpt b/ext/dom/tests/modern/spec/dom_parsing_gh44.phpt
index e25e48a1aa1..042a6039cc9 100644
--- a/ext/dom/tests/modern/spec/dom_parsing_gh44.phpt
+++ b/ext/dom/tests/modern/spec/dom_parsing_gh44.phpt
@@ -5,9 +5,9 @@ dom
--FILE--
<?php
-$root = DOM\XMLDocument::createFromString('<root xmlns:ns2="uri2"><child xmlns:ns1="uri1" xmlns:a0="uri1" xmlns:NS1="uri1"/></root>')->documentElement;
+$root = Dom\XMLDocument::createFromString('<root xmlns:ns2="uri2"><child xmlns:ns1="uri1" xmlns:a0="uri1" xmlns:NS1="uri1"/></root>')->documentElement;
$root->firstChild->setAttributeNS('uri3', 'attr1', 'value1');
-echo $root->ownerDocument->saveXML(), "\n";
+echo $root->ownerDocument->saveXml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/dom_parsing_gh45.phpt b/ext/dom/tests/modern/spec/dom_parsing_gh45.phpt
index bd13c848e0e..2b47f409e07 100644
--- a/ext/dom/tests/modern/spec/dom_parsing_gh45.phpt
+++ b/ext/dom/tests/modern/spec/dom_parsing_gh45.phpt
@@ -5,11 +5,11 @@ dom
--FILE--
<?php
-$root = DOM\XMLDocument::createFromString('<el1 xmlns:p="u1" xmlns:q="u1"><el2 xmlns:q="u2"/></el1>')->documentElement;
+$root = Dom\XMLDocument::createFromString('<el1 xmlns:p="u1" xmlns:q="u1"><el2 xmlns:q="u2"/></el1>')->documentElement;
$root->firstChild->setAttributeNS('u1', 'name', 'v');
$attr = $root->firstChild->getAttributeNodeNS("u1", "name");
var_dump($attr->prefix, $attr->namespaceURI);
-echo $root->ownerDocument->saveXML($root), "\n";
+echo $root->ownerDocument->saveXml($root), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/dom_parsing_gh47.phpt b/ext/dom/tests/modern/spec/dom_parsing_gh47.phpt
index 16cd4abd413..55bc816f1b9 100644
--- a/ext/dom/tests/modern/spec/dom_parsing_gh47.phpt
+++ b/ext/dom/tests/modern/spec/dom_parsing_gh47.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$document = DOM\XMLDocument::createFromString(<<<XML
+$document = Dom\XMLDocument::createFromString(<<<XML
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -23,10 +23,10 @@ $document = DOM\XMLDocument::createFromString(<<<XML
</html>
XML);
-echo $document->saveXML(), "\n";
+echo $document->saveXml(), "\n";
$people = $document->getElementsByTagNameNS(null, 'people')->item(0);
-echo $document->saveXML($people), "\n";
+echo $document->saveXml($people), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/dom_parsing_gh47_bis.phpt b/ext/dom/tests/modern/spec/dom_parsing_gh47_bis.phpt
index c142702ebda..4c01c2041a2 100644
--- a/ext/dom/tests/modern/spec/dom_parsing_gh47_bis.phpt
+++ b/ext/dom/tests/modern/spec/dom_parsing_gh47_bis.phpt
@@ -7,11 +7,11 @@ dom
// Adapted from https://github.com/web-platform-tests/wpt/blob/master/domparsing/XMLSerializer-serializeToString.html
-$dom = DOM\XMLDocument::createFromString('<root xmlns=""><child xmlns=""/></root>');
-echo $dom->saveXML(), "\n";
+$dom = Dom\XMLDocument::createFromString('<root xmlns=""><child xmlns=""/></root>');
+echo $dom->saveXml(), "\n";
-$dom = DOM\XMLDocument::createFromString('<root xmlns="urn:u1"><child xmlns="urn:u1"/></root>');
-echo $dom->saveXML(), "\n";
+$dom = Dom\XMLDocument::createFromString('<root xmlns="urn:u1"><child xmlns="urn:u1"/></root>');
+echo $dom->saveXml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/gh11404_1.phpt b/ext/dom/tests/modern/spec/gh11404_1.phpt
index 884f3560c06..ec9c0a30f75 100644
--- a/ext/dom/tests/modern/spec/gh11404_1.phpt
+++ b/ext/dom/tests/modern/spec/gh11404_1.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom1 = DOM\XMLDocument::createFromString('<?xml version="1.0"?><with xmlns="some:ns" />');
+$dom1 = Dom\XMLDocument::createFromString('<?xml version="1.0"?><with xmlns="some:ns" />');
$nodeA = $dom1->createElement('none');
$nodeB = $dom1->createElementNS(null, 'none');
@@ -13,7 +13,7 @@ $nodeB = $dom1->createElementNS(null, 'none');
$dom1->documentElement->appendChild($nodeA);
$dom1->documentElement->appendChild($nodeB);
-echo $dom1->saveXML(), "\n";
+echo $dom1->saveXml(), "\n";
var_dump($nodeA->namespaceURI, $nodeB->namespaceURI);
diff --git a/ext/dom/tests/modern/spec/gh11404_2.phpt b/ext/dom/tests/modern/spec/gh11404_2.phpt
index 601c2d4e5ac..946a3a0140a 100644
--- a/ext/dom/tests/modern/spec/gh11404_2.phpt
+++ b/ext/dom/tests/modern/spec/gh11404_2.phpt
@@ -5,9 +5,9 @@ dom
--FILE--
<?php
-$dom1 = DOM\XMLDocument::createFromString('<?xml version="1.0" ?><with xmlns="some:ns" />');
+$dom1 = Dom\XMLDocument::createFromString('<?xml version="1.0" ?><with xmlns="some:ns" />');
-$dom2 = DOM\XMLDocument::createFromString('<?xml version="1.0" ?><none />');
+$dom2 = Dom\XMLDocument::createFromString('<?xml version="1.0" ?><none />');
$dom1->documentElement->append(
$dom1->importNode(
@@ -15,7 +15,7 @@ $dom1->documentElement->append(
)
);
-echo $dom1->saveXML();
+echo $dom1->saveXml();
?>
--EXPECT--
<?xml version="1.0" encoding="UTF-8"?>
diff --git a/ext/dom/tests/modern/spec/import_entity_reference.phpt b/ext/dom/tests/modern/spec/import_entity_reference.phpt
index 02d51af68aa..67013cf0c9f 100644
--- a/ext/dom/tests/modern/spec/import_entity_reference.phpt
+++ b/ext/dom/tests/modern/spec/import_entity_reference.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString(<<<XML
+$dom = Dom\XMLDocument::createFromString(<<<XML
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE root [
<!ENTITY foo "bar">
@@ -13,16 +13,16 @@ $dom = DOM\XMLDocument::createFromString(<<<XML
<root>&foo;</root>
XML);
-$importer = DOM\XMLDocument::createEmpty();
+$importer = Dom\XMLDocument::createEmpty();
$imported = $importer->importNode($dom->documentElement, true);
-echo $importer->saveXML($imported), "\n";
+echo $importer->saveXml($imported), "\n";
var_dump($imported->firstChild);
?>
--EXPECT--
<root>&foo;</root>
-object(DOM\EntityReference)#3 (14) {
+object(Dom\EntityReference)#3 (14) {
["nodeType"]=>
int(5)
["nodeName"]=>
diff --git a/ext/dom/tests/modern/spec/import_of_lone_attribute.phpt b/ext/dom/tests/modern/spec/import_of_lone_attribute.phpt
index b612c409e04..1a4ddbe6a2c 100644
--- a/ext/dom/tests/modern/spec/import_of_lone_attribute.phpt
+++ b/ext/dom/tests/modern/spec/import_of_lone_attribute.phpt
@@ -5,15 +5,15 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
$root = $dom->appendChild($dom->createElement('root'));
$root->setAttributeNS("urn:a", "a:foo", "bar");
$attr = $root->getAttributeNodeNS("urn:a", "foo");
-$importer = DOM\XMLDocument::createEmpty();
+$importer = Dom\XMLDocument::createEmpty();
$attr = $importer->importNode($attr, true);
-echo $importer->saveXML($attr), "\n";
+echo $importer->saveXml($attr), "\n";
unset($dom);
unset($root);
diff --git a/ext/dom/tests/modern/spec/import_of_namepace_conflicting_attributes.phpt b/ext/dom/tests/modern/spec/import_of_namepace_conflicting_attributes.phpt
index e66ec34efa7..71598e0414b 100644
--- a/ext/dom/tests/modern/spec/import_of_namepace_conflicting_attributes.phpt
+++ b/ext/dom/tests/modern/spec/import_of_namepace_conflicting_attributes.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
$root = $dom->appendChild($dom->createElement('root'));
$root->setAttributeNS("urn:a", "a:root1", "bar");
@@ -17,7 +17,7 @@ $child = $root->appendChild($dom->createElement("child"));
$child->setAttributeNS("urn:x", "a:child1", "bar");
$child1 = $child->getAttributeNodeNS("urn:x", "child1");
-echo $dom->saveXML(), "\n";
+echo $dom->saveXml(), "\n";
var_dump($root1->prefix, $root1->namespaceURI);
var_dump($root2->prefix, $root2->namespaceURI);
@@ -25,9 +25,9 @@ var_dump($root2->prefix, $root2->namespaceURI);
$child->removeAttribute("a:child1");
$root->setAttributeNodeNS($child1);
-$importer = DOM\XMLDocument::createEmpty();
+$importer = Dom\XMLDocument::createEmpty();
$imported = $importer->importNode($root, true);
-echo $importer->saveXML($imported), "\n";
+echo $importer->saveXml($imported), "\n";
var_dump($imported->getAttributeNodeNS("urn:a", "root1")->prefix);
var_dump($imported->getAttributeNodeNS("urn:a", "root1")->namespaceURI);
diff --git a/ext/dom/tests/modern/spec/pre_insertion_validation.phpt b/ext/dom/tests/modern/spec/pre_insertion_validation.phpt
index b0f426be5ce..d16e3ffad9d 100644
--- a/ext/dom/tests/modern/spec/pre_insertion_validation.phpt
+++ b/ext/dom/tests/modern/spec/pre_insertion_validation.phpt
@@ -4,7 +4,7 @@ ParentNode/ChildNode pre-insertion validation
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString("<!DOCTYPE root><root/>");
+$dom = Dom\XMLDocument::createFromString("<!DOCTYPE root><root/>");
$doctype = $dom->doctype;
$dom->removeChild($doctype);
@@ -66,11 +66,11 @@ try {
echo "--- Document output ---\n";
-echo $dom->saveXML(), "\n";
+echo $dom->saveXml(), "\n";
echo "--- Document fragment edge cases with multiple elements ---\n";
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
$fragment = $dom->createDocumentFragment();
$fragment->append($dom->createElement("foo"));
$fragment->append($dom->createElement("bar"));
@@ -82,7 +82,7 @@ try {
echo "--- Document fragment edge cases with text ---\n";
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
$fragment = $dom->createDocumentFragment();
$fragment->append("foo");
$fragment->append($dom->createCDATASection("bar"));
diff --git a/ext/dom/tests/modern/spec/reconciliation_of_attributes.phpt b/ext/dom/tests/modern/spec/reconciliation_of_attributes.phpt
index be2db111092..bd52ad4b4bc 100644
--- a/ext/dom/tests/modern/spec/reconciliation_of_attributes.phpt
+++ b/ext/dom/tests/modern/spec/reconciliation_of_attributes.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
$root = $dom->appendChild($dom->createElement('root'));
$root->setAttributeNS("urn:a", "a:root1", "bar");
@@ -21,7 +21,7 @@ $child1 = $child->getAttributeNodeNS("urn:x", "child1");
$child->setAttributeNS("urn:a", "a:child2", "bar");
$child2 = $child->getAttributeNodeNS("urn:a", "child2");
-echo $dom->saveXML(), "\n";
+echo $dom->saveXml(), "\n";
var_dump($root1->prefix, $root1->namespaceURI);
var_dump($root2->prefix, $root2->namespaceURI);
@@ -33,7 +33,7 @@ $root->setAttributeNodeNS($child1);
var_dump($child1->prefix, $child1->namespaceURI);
var_dump($child2->prefix, $child2->namespaceURI);
-echo $dom->saveXML(), "\n";
+echo $dom->saveXml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/reconciliation_of_elements.phpt b/ext/dom/tests/modern/spec/reconciliation_of_elements.phpt
index f05ad8669c9..cddd39538e2 100644
--- a/ext/dom/tests/modern/spec/reconciliation_of_elements.phpt
+++ b/ext/dom/tests/modern/spec/reconciliation_of_elements.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString(<<<XML
+$dom = Dom\XMLDocument::createFromString(<<<XML
<?xml version="1.0"?>
<root>
<a:root1 xmlns:a="urn:a">
@@ -23,7 +23,7 @@ $a_child = $dom->getElementsByTagName("a:child")[0];
$root->append($a_child);
-echo $dom->saveXML(), "\n";
+echo $dom->saveXml(), "\n";
echo "---\n";
@@ -31,7 +31,7 @@ echo "---\n";
$root->remove();
unset($root);
-echo $dom->saveXML($a_child), "\n";
+echo $dom->saveXml($a_child), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/serialize_default_and_prefixed_xmlns.phpt b/ext/dom/tests/modern/spec/serialize_default_and_prefixed_xmlns.phpt
index 3bb61d1f63a..4d62141bbb3 100644
--- a/ext/dom/tests/modern/spec/serialize_default_and_prefixed_xmlns.phpt
+++ b/ext/dom/tests/modern/spec/serialize_default_and_prefixed_xmlns.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString(<<<XML
+$dom = Dom\XMLDocument::createFromString(<<<XML
<?xml version="1.0" encoding="UTF-8"?>
<root>
<a:child xmlns:a="urn:a" xmlns="urn:default">
@@ -14,7 +14,7 @@ $dom = DOM\XMLDocument::createFromString(<<<XML
</root>
XML);
-echo $dom->saveXML();
+echo $dom->saveXml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/serialize_element_unqualified.phpt b/ext/dom/tests/modern/spec/serialize_element_unqualified.phpt
index 23ecc1321a8..4ef10638d1f 100644
--- a/ext/dom/tests/modern/spec/serialize_element_unqualified.phpt
+++ b/ext/dom/tests/modern/spec/serialize_element_unqualified.phpt
@@ -5,14 +5,14 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString('<root xmlns:p1="u1"><child xmlns:p2="u1"><p1:child2/></child></root>');
-echo $dom->saveXML(), "\n";
+$dom = Dom\XMLDocument::createFromString('<root xmlns:p1="u1"><child xmlns:p2="u1"><p1:child2/></child></root>');
+echo $dom->saveXml(), "\n";
-$dom = DOM\XMLDocument::createFromString('<root xmlns:p1="u1"><child xmlns:p2="u1"></child></root>');
+$dom = Dom\XMLDocument::createFromString('<root xmlns:p1="u1"><child xmlns:p2="u1"></child></root>');
$root = $dom->documentElement;
$child2 = $root->ownerDocument->createElementNS('u1', 'child2');
$root->firstChild->appendChild($child2);
-echo $dom->saveXML(), "\n";
+echo $dom->saveXml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/serialize_non_default_empty_xmlns.phpt b/ext/dom/tests/modern/spec/serialize_non_default_empty_xmlns.phpt
index ab91d3e104b..e64bcaabda9 100644
--- a/ext/dom/tests/modern/spec/serialize_non_default_empty_xmlns.phpt
+++ b/ext/dom/tests/modern/spec/serialize_non_default_empty_xmlns.phpt
@@ -5,12 +5,12 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString('<test xmlns="urn:a"><a:child xmlns:a=" "/></test>');
+$dom = Dom\XMLDocument::createFromString('<test xmlns="urn:a"><a:child xmlns:a=" "/></test>');
-echo $dom->saveXML(), "\n";
+echo $dom->saveXml(), "\n";
?>
--EXPECTF--
-Warning: DOM\XMLDocument::createFromString(): xmlns:a: ' ' is not a valid URI in Entity, line: 1 in %s on line %d
+Warning: Dom\XMLDocument::createFromString(): xmlns:a: ' ' is not a valid URI in Entity, line: 1 in %s on line %d
<?xml version="1.0" encoding="UTF-8"?>
<test xmlns="urn:a"><a:child xmlns:a=" "/></test>
diff --git a/ext/dom/tests/modern/spec/serialize_xml_attribute.phpt b/ext/dom/tests/modern/spec/serialize_xml_attribute.phpt
index 8fd583c6b5f..a633efed549 100644
--- a/ext/dom/tests/modern/spec/serialize_xml_attribute.phpt
+++ b/ext/dom/tests/modern/spec/serialize_xml_attribute.phpt
@@ -5,11 +5,11 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString("<root/>");
+$dom = Dom\XMLDocument::createFromString("<root/>");
$root = $dom->documentElement;
$root->setAttribute("foo", "<>\"& \t\n\rfoo ");
-echo $dom->saveXML(), "\n";
+echo $dom->saveXml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/serialize_xml_namespace_on_elements.phpt b/ext/dom/tests/modern/spec/serialize_xml_namespace_on_elements.phpt
index 7e0ab39c666..6954fa9ae6e 100644
--- a/ext/dom/tests/modern/spec/serialize_xml_namespace_on_elements.phpt
+++ b/ext/dom/tests/modern/spec/serialize_xml_namespace_on_elements.phpt
@@ -5,11 +5,11 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
$root = $dom->appendChild($dom->createElementNS("http://www.w3.org/XML/1998/namespace", "xml:test"));
$root->appendChild($dom->createElementNS("http://www.w3.org/XML/1998/namespace", "xml:child"));
-echo $dom->saveXML(), "\n";
+echo $dom->saveXml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/serialize_xml_ns_decl.phpt b/ext/dom/tests/modern/spec/serialize_xml_ns_decl.phpt
index dc308b1ca82..70cae693b09 100644
--- a/ext/dom/tests/modern/spec/serialize_xml_ns_decl.phpt
+++ b/ext/dom/tests/modern/spec/serialize_xml_ns_decl.phpt
@@ -1,14 +1,14 @@
--TEST--
-Document::saveXML() with XML namespace declaration
+Document::saveXml() with XML namespace declaration
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString('<root/>');
+$dom = Dom\XMLDocument::createFromString('<root/>');
$root = $dom->documentElement;
$root->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:xml', 'http://www.w3.org/XML/1998/namespace');
-echo $dom->saveXML(), "\n";
+echo $dom->saveXml(), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/textContent_edge_cases.phpt b/ext/dom/tests/modern/spec/textContent_edge_cases.phpt
index b482ce01c79..2252013c7a3 100644
--- a/ext/dom/tests/modern/spec/textContent_edge_cases.phpt
+++ b/ext/dom/tests/modern/spec/textContent_edge_cases.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString('<container>text<?pi value?></container>');
+$dom = Dom\XMLDocument::createFromString('<container>text<?pi value?></container>');
echo "document text content: ";
var_dump($dom->textContent);
@@ -34,12 +34,12 @@ echo "pi node text content: ";
var_dump($pi->textContent);
$container->textContent = NULL;
-echo $dom->saveXML(), "\n";
+echo $dom->saveXml(), "\n";
?>
--EXPECT--
document text content: NULL
-Cannot modify readonly property DOM\XMLDocument::$textContent
+Cannot modify readonly property Dom\XMLDocument::$textContent
text node text content: string(4) "text"
pi node text content: string(5) "value"
text node text content: string(0) ""
diff --git a/ext/dom/tests/modern/spec/text_merging.phpt b/ext/dom/tests/modern/spec/text_merging.phpt
index b3cd382158b..343d2b45b9f 100644
--- a/ext/dom/tests/modern/spec/text_merging.phpt
+++ b/ext/dom/tests/modern/spec/text_merging.phpt
@@ -5,20 +5,20 @@ dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
$element = $dom->createElement("div");
$span = $dom->createElement("span");
$span->textContent = "qux";
$element->append("foo", "bar", "baz", $span, $dom->createCDATASection("a"), $dom->createCDATASection("b"));
$dom->append($element);
-echo $dom->saveXML(), "\n";
+echo $dom->saveXml(), "\n";
var_dump($element->firstChild->textContent);
var_dump($element->firstChild->nextSibling->textContent);
var_dump($element->firstChild->nextSibling->nextSibling->textContent);
$dom->normalize();
-echo $dom->saveXML(), "\n";
+echo $dom->saveXml(), "\n";
var_dump($element->firstChild->textContent);
var_dump($element->firstChild->nextSibling->textContent);
diff --git a/ext/dom/tests/modern/spec/xml_serialize_LIBXML_NOEMPTYTAG.phpt b/ext/dom/tests/modern/spec/xml_serialize_LIBXML_NOEMPTYTAG.phpt
index 9ce097a40d6..a8a8c597986 100644
--- a/ext/dom/tests/modern/spec/xml_serialize_LIBXML_NOEMPTYTAG.phpt
+++ b/ext/dom/tests/modern/spec/xml_serialize_LIBXML_NOEMPTYTAG.phpt
@@ -5,11 +5,11 @@ dom
--FILE--
<?php
-$doc = DOM\XMLDocument::createFromString('<root><child/><br xmlns="http://www.w3.org/1999/xhtml"/></root>');
-echo $doc->saveXML($doc, LIBXML_NOEMPTYTAG), "\n";
+$doc = Dom\XMLDocument::createFromString('<root><child/><br xmlns="http://www.w3.org/1999/xhtml"/></root>');
+echo $doc->saveXml($doc, LIBXML_NOEMPTYTAG), "\n";
$doc->formatOutput = true;
-echo $doc->saveXML($doc, LIBXML_NOEMPTYTAG), "\n";
+echo $doc->saveXml($doc, LIBXML_NOEMPTYTAG), "\n";
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/spec/xml_serialize_formatting.phpt b/ext/dom/tests/modern/spec/xml_serialize_formatting.phpt
index c704157b5b0..c79945e3d0c 100644
--- a/ext/dom/tests/modern/spec/xml_serialize_formatting.phpt
+++ b/ext/dom/tests/modern/spec/xml_serialize_formatting.phpt
@@ -23,9 +23,9 @@ $tests = [
foreach ($tests as $test) {
echo "---\n";
- $dom = DOM\XMLDocument::createFromString($test);
+ $dom = Dom\XMLDocument::createFromString($test);
$dom->formatOutput = true;
- echo $dom->saveXML(), "\n";
+ echo $dom->saveXml(), "\n";
}
?>
diff --git a/ext/dom/tests/modern/xml/DTDNamedNodeMap.phpt b/ext/dom/tests/modern/xml/DTDNamedNodeMap.phpt
index 29a251003cc..c94dce263ef 100644
--- a/ext/dom/tests/modern/xml/DTDNamedNodeMap.phpt
+++ b/ext/dom/tests/modern/xml/DTDNamedNodeMap.phpt
@@ -1,11 +1,11 @@
--TEST--
-DTDNamedNodeMap
+DtdNamedNodeMap
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString(<<<XML
+$dom = Dom\XMLDocument::createFromString(<<<XML
<?xml version="1.0"?>
<!DOCTYPE root [
<!ENTITY test "entity is only for test purposes">
@@ -26,7 +26,7 @@ var_dump($doctype->notations["GIF"]);
?>
--EXPECTF--
-object(DOM\DocumentType)#2 (24) {
+object(Dom\DocumentType)#2 (24) {
["name"]=>
string(4) "root"
["entities"]=>
@@ -78,7 +78,7 @@ object(DOM\DocumentType)#2 (24) {
["textContent"]=>
NULL
}
-object(DOM\Entity)#4 (17) {
+object(Dom\Entity)#4 (17) {
["publicId"]=>
NULL
["systemId"]=>
@@ -114,7 +114,7 @@ object(DOM\Entity)#4 (17) {
["textContent"]=>
NULL
}
-object(DOM\Entity)#3 (17) {
+object(Dom\Entity)#3 (17) {
["publicId"]=>
string(1) "-"
["systemId"]=>
@@ -150,7 +150,7 @@ object(DOM\Entity)#3 (17) {
["textContent"]=>
NULL
}
-object(DOM\Notation)#4 (13) {
+object(Dom\Notation)#4 (13) {
["nodeType"]=>
int(12)
["nodeName"]=>
diff --git a/ext/dom/tests/modern/xml/XMLDocument_createFromFile_empty_input.phpt b/ext/dom/tests/modern/xml/XMLDocument_createFromFile_empty_input.phpt
index 9b7be6c2e0c..7aac2b92f45 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_createFromFile_empty_input.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_createFromFile_empty_input.phpt
@@ -4,15 +4,15 @@ XMLDocument::createFromFile() - empty input
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromFile("php://memory");
+$dom = Dom\XMLDocument::createFromFile("php://memory");
var_dump($dom->documentURI);
fclose($memory);
?>
--EXPECTF--
-Warning: DOM\XMLDocument::createFromFile(): Document is empty in php://memory, line: 1 in %s on line %d
+Warning: Dom\XMLDocument::createFromFile(): Document is empty in php://memory, line: 1 in %s on line %d
Fatal error: Uncaught Exception: XML document is malformed in %s:%d
Stack trace:
-#0 %s(%d): DOM\XMLDocument::createFromFile('php://memory')
+#0 %s(%d): Dom\XMLDocument::createFromFile('php://memory')
#1 {main}
thrown in %s on line %d
diff --git a/ext/dom/tests/modern/xml/XMLDocument_createFromFile_override_encoding.phpt b/ext/dom/tests/modern/xml/XMLDocument_createFromFile_override_encoding.phpt
index 59f96a97a09..f48c5f7f5a1 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_createFromFile_override_encoding.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_createFromFile_override_encoding.phpt
@@ -1,29 +1,29 @@
--TEST--
-DOM\XMLDocument::createFromFile() with overrideEncoding
+Dom\XMLDocument::createFromFile() with overrideEncoding
--EXTENSIONS--
dom
--FILE--
<?php
try {
- DOM\XMLDocument::createFromFile(__DIR__ . '/dummy.xml', overrideEncoding: 'nonexistent');
+ Dom\XMLDocument::createFromFile(__DIR__ . '/dummy.xml', overrideEncoding: 'nonexistent');
} catch (ValueError $e) {
echo $e->getMessage(), "\n";
}
// The override encoding matches with the document encoding attribute
-$dom = DOM\XMLDocument::createFromFile(__DIR__ . '/dummy.xml', overrideEncoding: 'UTF-8');
+$dom = Dom\XMLDocument::createFromFile(__DIR__ . '/dummy.xml', overrideEncoding: 'UTF-8');
var_dump($dom->documentElement->lastChild->textContent);
var_dump($dom->charset);
// The override encoding mismatches with the document encoding attribute
-$dom = DOM\XMLDocument::createFromFile(__DIR__ . '/dummy.xml', overrideEncoding: 'Windows-1252');
+$dom = Dom\XMLDocument::createFromFile(__DIR__ . '/dummy.xml', overrideEncoding: 'Windows-1252');
var_dump($dom->documentElement->lastChild->textContent);
var_dump($dom->charset);
?>
--EXPECT--
-DOM\XMLDocument::createFromFile(): Argument #3 ($overrideEncoding) must be a valid document encoding
+Dom\XMLDocument::createFromFile(): Argument #3 ($overrideEncoding) must be a valid document encoding
string(2) "é"
string(5) "UTF-8"
string(4) "é"
diff --git a/ext/dom/tests/modern/xml/XMLDocument_createFromString_override_encoding.phpt b/ext/dom/tests/modern/xml/XMLDocument_createFromString_override_encoding.phpt
index b972aec07cb..e45f74847dd 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_createFromString_override_encoding.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_createFromString_override_encoding.phpt
@@ -1,29 +1,29 @@
--TEST--
-DOM\XMLDocument::createFromString() with overrideEncoding
+Dom\XMLDocument::createFromString() with overrideEncoding
--EXTENSIONS--
dom
--FILE--
<?php
try {
- DOM\XMLDocument::createFromString(file_get_contents(__DIR__ . '/dummy.xml'), overrideEncoding: 'nonexistent');
+ Dom\XMLDocument::createFromString(file_get_contents(__DIR__ . '/dummy.xml'), overrideEncoding: 'nonexistent');
} catch (ValueError $e) {
echo $e->getMessage(), "\n";
}
// The override encoding matches with the document encoding attribute
-$dom = DOM\XMLDocument::createFromString(file_get_contents(__DIR__ . '/dummy.xml'), overrideEncoding: 'UTF-8');
+$dom = Dom\XMLDocument::createFromString(file_get_contents(__DIR__ . '/dummy.xml'), overrideEncoding: 'UTF-8');
var_dump($dom->documentElement->lastChild->textContent);
var_dump($dom->charset);
// The override encoding mismatches with the document encoding attribute
-$dom = DOM\XMLDocument::createFromString(file_get_contents(__DIR__ . '/dummy.xml'), overrideEncoding: 'Windows-1252');
+$dom = Dom\XMLDocument::createFromString(file_get_contents(__DIR__ . '/dummy.xml'), overrideEncoding: 'Windows-1252');
var_dump($dom->documentElement->lastChild->textContent);
var_dump($dom->charset);
?>
--EXPECT--
-DOM\XMLDocument::createFromString(): Argument #3 ($overrideEncoding) must be a valid document encoding
+Dom\XMLDocument::createFromString(): Argument #3 ($overrideEncoding) must be a valid document encoding
string(2) "é"
string(5) "UTF-8"
string(4) "é"
diff --git a/ext/dom/tests/modern/xml/XMLDocument_debug.phpt b/ext/dom/tests/modern/xml/XMLDocument_debug.phpt
index bc277f0d052..c9ae2afa95f 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_debug.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_debug.phpt
@@ -1,16 +1,16 @@
--TEST--
-DOM\XMLDocument debug
+Dom\XMLDocument debug
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
var_dump($dom);
?>
--EXPECT--
-object(DOM\XMLDocument)#1 (29) {
+object(Dom\XMLDocument)#1 (29) {
["xmlEncoding"]=>
string(5) "UTF-8"
["xmlStandalone"]=>
diff --git a/ext/dom/tests/modern/xml/XMLDocument_documentURI.phpt b/ext/dom/tests/modern/xml/XMLDocument_documentURI.phpt
index f31c19d0ef6..9b65df78742 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_documentURI.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_documentURI.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\XMLDocument::documentURI
+Dom\XMLDocument::documentURI
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromFile(__DIR__ . "/test foo.xml", LIBXML_NOERROR);
+$dom = Dom\XMLDocument::createFromFile(__DIR__ . "/test foo.xml", LIBXML_NOERROR);
var_dump($dom->documentURI);
?>
diff --git a/ext/dom/tests/modern/xml/XMLDocument_fromEmptyDocument_01.phpt b/ext/dom/tests/modern/xml/XMLDocument_fromEmptyDocument_01.phpt
index cc8f3f159b0..3726e9b0a23 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_fromEmptyDocument_01.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_fromEmptyDocument_01.phpt
@@ -1,16 +1,16 @@
--TEST--
-DOM\XMLDocument::createEmpty 01
+Dom\XMLDocument::createEmpty 01
--EXTENSIONS--
dom
--FILE--
<?php
-DOM\XMLDocument::createEmpty(encoding: "foo");
+Dom\XMLDocument::createEmpty(encoding: "foo");
?>
--EXPECTF--
-Fatal error: Uncaught ValueError: DOM\XMLDocument::createEmpty(): Argument #2 ($encoding) is not a valid document encoding in %s:%d
+Fatal error: Uncaught ValueError: Dom\XMLDocument::createEmpty(): Argument #2 ($encoding) is not a valid document encoding in %s:%d
Stack trace:
-#0 %s(%d): DOM\XMLDocument::createEmpty('1.0', 'foo')
+#0 %s(%d): Dom\XMLDocument::createEmpty('1.0', 'foo')
#1 {main}
thrown in %s on line %d
diff --git a/ext/dom/tests/modern/xml/XMLDocument_fromEmptyDocument_02.phpt b/ext/dom/tests/modern/xml/XMLDocument_fromEmptyDocument_02.phpt
index cda5210f838..a804394bc84 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_fromEmptyDocument_02.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_fromEmptyDocument_02.phpt
@@ -1,16 +1,16 @@
--TEST--
-DOM\XMLDocument::createEmpty 02
+Dom\XMLDocument::createEmpty 02
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createEmpty("1.1");
+$dom = Dom\XMLDocument::createEmpty("1.1");
var_dump($dom);
?>
--EXPECT--
-object(DOM\XMLDocument)#1 (29) {
+object(Dom\XMLDocument)#1 (29) {
["xmlEncoding"]=>
string(5) "UTF-8"
["xmlStandalone"]=>
diff --git a/ext/dom/tests/modern/xml/XMLDocument_fromEmptyDocument_03.phpt b/ext/dom/tests/modern/xml/XMLDocument_fromEmptyDocument_03.phpt
index bbbace2b064..e8cbea5dba9 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_fromEmptyDocument_03.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_fromEmptyDocument_03.phpt
@@ -1,13 +1,13 @@
--TEST--
-DOM\XMLDocument::createEmpty 03
+Dom\XMLDocument::createEmpty 03
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createEmpty("1.0", "ASCII");
+$dom = Dom\XMLDocument::createEmpty("1.0", "ASCII");
$dom->append($dom->createElement("foo"));
-echo $dom->saveXML();
+echo $dom->saveXml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/xml/XMLDocument_fromFile_01.phpt b/ext/dom/tests/modern/xml/XMLDocument_fromFile_01.phpt
index 5e4243795f7..a595007c8aa 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_fromFile_01.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_fromFile_01.phpt
@@ -1,16 +1,16 @@
--TEST--
-DOM\XMLDocument::createFromFile 01
+Dom\XMLDocument::createFromFile 01
--EXTENSIONS--
dom
--FILE--
<?php
-DOM\XMLDocument::createFromString("");
+Dom\XMLDocument::createFromString("");
?>
--EXPECTF--
-Fatal error: Uncaught ValueError: DOM\XMLDocument::createFromString(): Argument #1 ($source) must not be empty in %s:%d
+Fatal error: Uncaught ValueError: Dom\XMLDocument::createFromString(): Argument #1 ($source) must not be empty in %s:%d
Stack trace:
-#0 %s(%d): DOM\XMLDocument::createFromString('')
+#0 %s(%d): Dom\XMLDocument::createFromString('')
#1 {main}
thrown in %s on line %d
diff --git a/ext/dom/tests/modern/xml/XMLDocument_fromFile_02.phpt b/ext/dom/tests/modern/xml/XMLDocument_fromFile_02.phpt
index 2d593c124ab..1fccbd5ed2b 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_fromFile_02.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_fromFile_02.phpt
@@ -1,18 +1,18 @@
--TEST--
-DOM\XMLDocument::createFromFile 02
+Dom\XMLDocument::createFromFile 02
--EXTENSIONS--
dom
--FILE--
<?php
-DOM\XMLDocument::createFromFile("\\0");
+Dom\XMLDocument::createFromFile("\\0");
?>
--EXPECTF--
-Warning: DOM\XMLDocument::createFromFile(): I/O warning : failed to load external entity "%s" in %s on line %d
+Warning: Dom\XMLDocument::createFromFile(): I/O warning : failed to load external entity "%s" in %s on line %d
Fatal error: Uncaught Exception: Cannot open file '\0' in %s:%d
Stack trace:
-#0 %s(%d): DOM\XMLDocument::createFromFile('\\0')
+#0 %s(%d): Dom\XMLDocument::createFromFile('\\0')
#1 {main}
thrown in %s on line %d
diff --git a/ext/dom/tests/modern/xml/XMLDocument_fromFile_03.phpt b/ext/dom/tests/modern/xml/XMLDocument_fromFile_03.phpt
index f129450b38c..73c1b0d2235 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_fromFile_03.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_fromFile_03.phpt
@@ -1,16 +1,16 @@
--TEST--
-DOM\XMLDocument::createFromFile 03
+Dom\XMLDocument::createFromFile 03
--EXTENSIONS--
dom
--FILE--
<?php
try {
- DOM\XMLDocument::createFromFile("%00");
+ Dom\XMLDocument::createFromFile("%00");
} catch (ValueError $e) {
echo $e->getMessage();
}
?>
--EXPECT--
-DOM\XMLDocument::createFromFile(): Argument #1 ($path) must not contain percent-encoded NUL bytes
+Dom\XMLDocument::createFromFile(): Argument #1 ($path) must not contain percent-encoded NUL bytes
diff --git a/ext/dom/tests/modern/xml/XMLDocument_fromFile_04.phpt b/ext/dom/tests/modern/xml/XMLDocument_fromFile_04.phpt
index fcf8709e954..a24193c8c9d 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_fromFile_04.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_fromFile_04.phpt
@@ -1,12 +1,12 @@
--TEST--
-DOM\XMLDocument::createFromFile 04
+Dom\XMLDocument::createFromFile 04
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromFile(__DIR__."/../../book.xml");
-echo $dom->saveXML();
+$dom = Dom\XMLDocument::createFromFile(__DIR__."/../../book.xml");
+echo $dom->saveXml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/xml/XMLDocument_fromString_01.phpt b/ext/dom/tests/modern/xml/XMLDocument_fromString_01.phpt
index f4b7771e852..9eee72ab52b 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_fromString_01.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_fromString_01.phpt
@@ -1,16 +1,16 @@
--TEST--
-DOM\XMLDocument::createFromString 01
+Dom\XMLDocument::createFromString 01
--EXTENSIONS--
dom
--FILE--
<?php
-DOM\XMLDocument::createFromString("");
+Dom\XMLDocument::createFromString("");
?>
--EXPECTF--
-Fatal error: Uncaught ValueError: DOM\XMLDocument::createFromString(): Argument #1 ($source) must not be empty in %s:%d
+Fatal error: Uncaught ValueError: Dom\XMLDocument::createFromString(): Argument #1 ($source) must not be empty in %s:%d
Stack trace:
-#0 %s(%d): DOM\XMLDocument::createFromString('')
+#0 %s(%d): Dom\XMLDocument::createFromString('')
#1 {main}
thrown in %s on line %d
diff --git a/ext/dom/tests/modern/xml/XMLDocument_fromString_02.phpt b/ext/dom/tests/modern/xml/XMLDocument_fromString_02.phpt
index 3576af5f6a6..2d846bddc55 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_fromString_02.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_fromString_02.phpt
@@ -1,12 +1,12 @@
--TEST--
-DOM\XMLDocument::createFromString 02
+Dom\XMLDocument::createFromString 02
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString('<?xml version="1.0"?><container/>');
-var_dump($dom->saveXMLFile("php://stdout"));
+$dom = Dom\XMLDocument::createFromString('<?xml version="1.0"?><container/>');
+var_dump($dom->saveXmlFile("php://stdout"));
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/xml/XMLDocument_fromString_03.phpt b/ext/dom/tests/modern/xml/XMLDocument_fromString_03.phpt
index 2c2bb2ba33a..4f29c01c264 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_fromString_03.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_fromString_03.phpt
@@ -1,5 +1,5 @@
--TEST--
-DOM\XMLDocument::createFromString 03
+Dom\XMLDocument::createFromString 03
--EXTENSIONS--
dom
--FILE--
@@ -10,18 +10,18 @@ $flags = [
];
try {
- DOM\XMLDocument::createFromString('<?xml version="1.0"?><container/>', -1);
+ Dom\XMLDocument::createFromString('<?xml version="1.0"?><container/>', -1);
} catch (ValueError $e) {
echo $e->getMessage();
}
foreach ($flags as $flag) {
- var_dump(DOM\XMLDocument::createFromString('<?xml version="1.0"?><container/>', $flag) instanceof DOM\XMLDocument);
+ var_dump(Dom\XMLDocument::createFromString('<?xml version="1.0"?><container/>', $flag) instanceof Dom\XMLDocument);
}
?>
--EXPECT--
-DOM\XMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_RECOVER, LIBXML_NOENT, LIBXML_DTDLOAD, LIBXML_DTDATTR, LIBXML_DTDVALID, LIBXML_NOERROR, LIBXML_NOWARNING, LIBXML_NOBLANKS, LIBXML_XINCLUDE, LIBXML_NSCLEAN, LIBXML_NOCDATA, LIBXML_NONET, LIBXML_PEDANTIC, LIBXML_COMPACT, LIBXML_PARSEHUGE, LIBXML_BIGLINES)bool(true)
+Dom\XMLDocument::createFromString(): Argument #2 ($options) contains invalid flags (allowed flags: LIBXML_RECOVER, LIBXML_NOENT, LIBXML_DTDLOAD, LIBXML_DTDATTR, LIBXML_DTDVALID, LIBXML_NOERROR, LIBXML_NOWARNING, LIBXML_NOBLANKS, LIBXML_XINCLUDE, LIBXML_NSCLEAN, LIBXML_NOCDATA, LIBXML_NONET, LIBXML_PEDANTIC, LIBXML_COMPACT, LIBXML_PARSEHUGE, LIBXML_BIGLINES)bool(true)
bool(true)
bool(true)
bool(true)
diff --git a/ext/dom/tests/modern/xml/XMLDocument_fromString_04.phpt b/ext/dom/tests/modern/xml/XMLDocument_fromString_04.phpt
index a124d2e4df1..0a63a6e8a86 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_fromString_04.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_fromString_04.phpt
@@ -1,5 +1,5 @@
--TEST--
-DOM\XMLDocument::createFromString 04
+Dom\XMLDocument::createFromString 04
--EXTENSIONS--
dom
--SKIPIF--
@@ -9,9 +9,9 @@ if (getenv('SKIP_ASAN') && LIBXML_VERSION < 20911) die('xleak leaks under libxml
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString('<?xml version="1.0" encoding="Windows-1251"?><container/>');
+$dom = Dom\XMLDocument::createFromString('<?xml version="1.0" encoding="Windows-1251"?><container/>');
var_dump($dom->charset);
-echo $dom->saveXML();
+echo $dom->saveXml();
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/xml/XMLDocument_node_ownerDocument_for_XML.phpt b/ext/dom/tests/modern/xml/XMLDocument_node_ownerDocument_for_XML.phpt
index 0a0b541476a..946f9495114 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_node_ownerDocument_for_XML.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_node_ownerDocument_for_XML.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\XMLDocument getting ownerDocument from a node in an XML document should yield a DOM\XMLDocument
+Dom\XMLDocument getting ownerDocument from a node in an XML document should yield a Dom\XMLDocument
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString('<?xml version="1.0"?><container/>');
+$dom = Dom\XMLDocument::createFromString('<?xml version="1.0"?><container/>');
$element = $dom->documentElement;
unset($dom);
@@ -13,7 +13,7 @@ var_dump($element->ownerDocument);
?>
--EXPECTF--
-object(DOM\XMLDocument)#1 (29) {
+object(Dom\XMLDocument)#1 (29) {
["xmlEncoding"]=>
string(5) "UTF-8"
["xmlStandalone"]=>
diff --git a/ext/dom/tests/modern/xml/XMLDocument_saveXML_node.phpt b/ext/dom/tests/modern/xml/XMLDocument_saveXML_node.phpt
index 73a48eb454d..2e00e9a6887 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_saveXML_node.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_saveXML_node.phpt
@@ -1,15 +1,15 @@
--TEST--
-DOM\XMLDocument::saveXML(File) node
+Dom\XMLDocument::saveXml(File) node
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createEmpty("1.0", "ASCII");
+$dom = Dom\XMLDocument::createEmpty("1.0", "ASCII");
$root = $dom->appendChild($dom->createElement("root"));
$child1 = $root->appendChild($dom->createElement("child1"));
$child2 = $root->appendChild($dom->createElement("child2"));
-echo $dom->saveXML($child1);
+echo $dom->saveXml($child1);
?>
--EXPECT--
diff --git a/ext/dom/tests/modern/xml/XMLDocument_xpath.phpt b/ext/dom/tests/modern/xml/XMLDocument_xpath.phpt
index 6a7d903948f..62442a868b2 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_xpath.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_xpath.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\XMLDocument interaction with XPath
+Dom\XMLDocument interaction with XPath
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString(<<<XML
+$dom = Dom\XMLDocument::createFromString(<<<XML
<?xml version="1.0"?>
<root>
<p>hi</p>
@@ -16,7 +16,7 @@ $dom = DOM\XMLDocument::createFromString(<<<XML
</root>
XML);
-$xpath = new DOM\XPath($dom);
+$xpath = new Dom\XPath($dom);
echo "--- Get data of the paragraph ---\n";
@@ -48,12 +48,12 @@ var_dump($xpath->evaluate("//*/namespace::*"));
?>
--EXPECT--
--- Get data of the paragraph ---
-object(DOM\NodeList)#4 (1) {
+object(Dom\NodeList)#4 (1) {
["length"]=>
int(1)
}
string(2) "hi"
-object(DOM\NodeList)#5 (1) {
+object(Dom\NodeList)#5 (1) {
["length"]=>
int(1)
}
@@ -62,12 +62,12 @@ string(2) "hi"
float(2)
bool(true)
--- Get data of special nodes ---
-string(25) "DOM\ProcessingInstruction"
+string(25) "Dom\ProcessingInstruction"
string(4) "data"
-string(11) "DOM\Comment"
+string(11) "Dom\Comment"
string(9) " comment "
--- Get a namespace node ---
-object(DOM\NodeList)#5 (1) {
+object(Dom\NodeList)#5 (1) {
["length"]=>
int(0)
}
diff --git a/ext/dom/tests/modern/xml/XMLDocument_xpath_errors.phpt b/ext/dom/tests/modern/xml/XMLDocument_xpath_errors.phpt
index 6eeac8c83b7..1ef52b50961 100644
--- a/ext/dom/tests/modern/xml/XMLDocument_xpath_errors.phpt
+++ b/ext/dom/tests/modern/xml/XMLDocument_xpath_errors.phpt
@@ -1,13 +1,13 @@
--TEST--
-DOM\XMLDocument interaction with XPath evaluate - errors
+Dom\XMLDocument interaction with XPath evaluate - errors
--EXTENSIONS--
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromString('<root/>');
+$dom = Dom\XMLDocument::createFromString('<root/>');
-$xpath = new DOM\XPath($dom);
+$xpath = new Dom\XPath($dom);
try {
var_dump($xpath->evaluate('-'));
@@ -17,5 +17,5 @@ try {
?>
--EXPECTF--
-Warning: DOM\XPath::evaluate(): Invalid expression in %s on line %d
+Warning: Dom\XPath::evaluate(): Invalid expression in %s on line %d
string(35) "Could not evaluate XPath expression"
diff --git a/ext/dom/tests/modern/xml/bug48339.phpt b/ext/dom/tests/modern/xml/bug48339.phpt
index 1e57927ae7f..1c7a2eed53e 100644
--- a/ext/dom/tests/modern/xml/bug48339.phpt
+++ b/ext/dom/tests/modern/xml/bug48339.phpt
@@ -4,12 +4,12 @@ Bug #48339 (DOMElement::setIdAttribute() throws 'Not Found Error' exception)
dom
--FILE--
<?php
-$document = DOM\XMLDocument::createEmpty();
+$document = Dom\XMLDocument::createEmpty();
$element = $document->createElement('test');
$element = $document->appendChild($element);
$element->setAttribute("xml:id", 1);
$element->setIdAttribute("xml:id", TRUE);
-echo $document->saveXML(), "\n";
+echo $document->saveXml(), "\n";
?>
--EXPECT--
<?xml version="1.0" encoding="UTF-8"?>
diff --git a/ext/dom/tests/modern/xml/simplexml_interop.phpt b/ext/dom/tests/modern/xml/simplexml_interop.phpt
index 80bb478060f..a1b02b7bdd8 100644
--- a/ext/dom/tests/modern/xml/simplexml_interop.phpt
+++ b/ext/dom/tests/modern/xml/simplexml_interop.phpt
@@ -8,15 +8,15 @@ simplexml
$sxe = simplexml_load_string('<container xmlns="urn:a">foo</container>');
-$element = DOM\import_simplexml($sxe);
+$element = Dom\import_simplexml($sxe);
var_dump($element->attributes);
-echo $element->ownerDocument->saveXML($element), "\n";
+echo $element->ownerDocument->saveXml($element), "\n";
$element->appendChild($element->ownerDocument->createElementNS('urn:a', 'child'));
-echo $element->ownerDocument->saveXML($element), "\n";
+echo $element->ownerDocument->saveXml($element), "\n";
$sxe->addChild('name', 'value');
-echo $element->ownerDocument->saveXML($element), "\n";
+echo $element->ownerDocument->saveXml($element), "\n";
// This should fail because it has been imported already above in modern DOM
try {
@@ -26,16 +26,16 @@ try {
}
// Import again and compare
-var_dump(DOM\import_simplexml($sxe) === $element);
+var_dump(Dom\import_simplexml($sxe) === $element);
?>
--EXPECT--
-object(DOM\NamedNodeMap)#3 (1) {
+object(Dom\NamedNodeMap)#3 (1) {
["length"]=>
int(1)
}
<container xmlns="urn:a">foo</container>
<container xmlns="urn:a">foo<child/></container>
<container xmlns="urn:a">foo<child/><name>value</name></container>
-dom_import_simplexml(): Argument #1 ($node) must not be already imported as a DOM\Node
+dom_import_simplexml(): Argument #1 ($node) must not be already imported as a Dom\Node
bool(true)
diff --git a/ext/dom/tests/modern/xml/xpath_query_context_in_scope_ns.phpt b/ext/dom/tests/modern/xml/xpath_query_context_in_scope_ns.phpt
index d5e7d8d7f38..dbc20e269a1 100644
--- a/ext/dom/tests/modern/xml/xpath_query_context_in_scope_ns.phpt
+++ b/ext/dom/tests/modern/xml/xpath_query_context_in_scope_ns.phpt
@@ -1,5 +1,5 @@
--TEST--
-Test DOM\XPath::query() with registering a context node's in-scope namespaces
+Test Dom\XPath::query() with registering a context node's in-scope namespaces
--EXTENSIONS--
dom
--FILE--
@@ -21,7 +21,7 @@ function dump($xpath, $query, $context) {
}
}
-$dom = DOM\XMLDocument::createFromString(<<<XML
+$dom = Dom\XMLDocument::createFromString(<<<XML
<a xmlns="urn:a" xmlns:d="urn:d">
<b:b xmlns:b="urn:b">
<c:c1 xmlns:c="urn:c1">
@@ -39,7 +39,7 @@ XML);
$c1 = $dom->getElementsByTagNameNS('*', 'c1')->item(0);
$c2 = $dom->getElementsByTagNameNS('*', 'c1')->item(0);
-$xpath = new DOM\XPath($dom);
+$xpath = new Dom\XPath($dom);
echo "=== Tests with c1 ===\n\n";
diff --git a/ext/dom/tests/not_serializable.phpt b/ext/dom/tests/not_serializable.phpt
index bce87754dba..36053070f40 100644
--- a/ext/dom/tests/not_serializable.phpt
+++ b/ext/dom/tests/not_serializable.phpt
@@ -34,7 +34,7 @@ try {
echo $e->getMessage(), "\n";
}
-$dom = DOM\XMLDocument::createEmpty();
+$dom = Dom\XMLDocument::createEmpty();
try {
serialize($dom);
} catch (Exception $e) {
@@ -42,7 +42,7 @@ try {
}
try {
- serialize(new DOM\XPath($dom));
+ serialize(new Dom\XPath($dom));
} catch (Exception $e) {
echo $e->getMessage(), "\n";
}
@@ -53,5 +53,5 @@ Serialization of 'DOMDocument' is not allowed, unless serialization methods are
Serialization of 'DOMElement' is not allowed, unless serialization methods are implemented in a subclass
Serialization of 'DOMXPath' is not allowed
Serialization of 'DOMNameSpaceNode' is not allowed, unless serialization methods are implemented in a subclass
-Serialization of 'DOM\XMLDocument' is not allowed, unless serialization methods are implemented in a subclass
-Serialization of 'DOM\XPath' is not allowed
+Serialization of 'Dom\XMLDocument' is not allowed, unless serialization methods are implemented in a subclass
+Serialization of 'Dom\XPath' is not allowed
diff --git a/ext/dom/tests/xml_parsing_LIBXML_RECOVER.phpt b/ext/dom/tests/xml_parsing_LIBXML_RECOVER.phpt
index 89e693d4756..09ff6803b44 100644
--- a/ext/dom/tests/xml_parsing_LIBXML_RECOVER.phpt
+++ b/ext/dom/tests/xml_parsing_LIBXML_RECOVER.phpt
@@ -9,7 +9,7 @@ $dom = new DOMDocument;
$dom->loadXML('<root><child/>', options: LIBXML_RECOVER);
echo $dom->saveXML();
-$dom = DOM\XMLDocument::createFromString('<root><child/>', options: LIBXML_RECOVER);
+$dom = Dom\XMLDocument::createFromString('<root><child/>', options: LIBXML_RECOVER);
echo $dom->saveXML(), "\n";
?>
@@ -18,6 +18,6 @@ Warning: DOMDocument::loadXML(): %s
<?xml version="1.0"?>
<root><child/></root>
-Warning: DOM\XMLDocument::createFromString(): %s
+Warning: Dom\XMLDocument::createFromString(): %s
<?xml version="1.0" encoding="UTF-8"?>
<root><child/></root>
diff --git a/ext/dom/xml_document.c b/ext/dom/xml_document.c
index ac1d39eb3b1..6c30baf605f 100644
--- a/ext/dom/xml_document.c
+++ b/ext/dom/xml_document.c
@@ -86,7 +86,7 @@ static void dom_mark_namespaces_as_attributes_too(php_dom_libxml_ns_mapper *ns_m
}
}
-PHP_METHOD(DOM_XMLDocument, createEmpty)
+PHP_METHOD(Dom_XMLDocument, createEmpty)
{
const char *version = NULL;
size_t encoding_len = strlen("UTF-8");
@@ -238,12 +238,12 @@ void dom_document_convert_to_modern(php_libxml_ref_obj *document, xmlDocPtr lxml
dom_mark_namespaces_as_attributes_too(ns_mapper, lxml_doc);
}
-PHP_METHOD(DOM_XMLDocument, createFromString)
+PHP_METHOD(Dom_XMLDocument, createFromString)
{
load_from_helper(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);
}
-PHP_METHOD(DOM_XMLDocument, createFromFile)
+PHP_METHOD(Dom_XMLDocument, createFromFile)
{
load_from_helper(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
}
diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index 8919559373e..d33d3f07a27 100644
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -161,7 +161,7 @@ PHP_METHOD(DOMXPath, __construct)
dom_xpath_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, dom_document_class_entry);
}
-PHP_METHOD(DOM_XPath, __construct)
+PHP_METHOD(Dom_XPath, __construct)
{
dom_xpath_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, dom_abstract_base_document_class_entry);
}
@@ -391,7 +391,7 @@ PHP_METHOD(DOMXPath, query)
php_xpath_eval(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_DOM_XPATH_QUERY, false);
}
-PHP_METHOD(DOM_XPath, query)
+PHP_METHOD(Dom_XPath, query)
{
php_xpath_eval(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_DOM_XPATH_QUERY, true);
}
@@ -403,7 +403,7 @@ PHP_METHOD(DOMXPath, evaluate)
php_xpath_eval(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_DOM_XPATH_EVALUATE, false);
}
-PHP_METHOD(DOM_XPath, evaluate)
+PHP_METHOD(Dom_XPath, evaluate)
{
php_xpath_eval(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_DOM_XPATH_EVALUATE, true);
}
diff --git a/ext/simplexml/tests/getDocNamespaces_no_internal_declaration.phpt b/ext/simplexml/tests/getDocNamespaces_no_internal_declaration.phpt
index 55a3405fe91..322dee45692 100644
--- a/ext/simplexml/tests/getDocNamespaces_no_internal_declaration.phpt
+++ b/ext/simplexml/tests/getDocNamespaces_no_internal_declaration.phpt
@@ -25,7 +25,7 @@ $dom->loadXML($xml);
$sxe = simplexml_import_dom($dom);
var_dump($sxe->getDocNamespaces(true));
-$dom = DOM\XMLDocument::createFromString($xml);
+$dom = Dom\XMLDocument::createFromString($xml);
$sxe = simplexml_import_dom($dom);
var_dump($sxe->getDocNamespaces(true));
diff --git a/ext/simplexml/tests/simplexml_import_new_dom.phpt b/ext/simplexml/tests/simplexml_import_new_dom.phpt
index b0e00c731e5..4e205bd5901 100644
--- a/ext/simplexml/tests/simplexml_import_new_dom.phpt
+++ b/ext/simplexml/tests/simplexml_import_new_dom.phpt
@@ -5,7 +5,7 @@ simplexml
dom
--FILE--
<?php
-$dom = DOM\XMLDocument::createFromFile(__DIR__."/book.xml");
+$dom = Dom\XMLDocument::createFromFile(__DIR__."/book.xml");
$s = simplexml_import_dom($dom);
$books = $s->book;
foreach ($books as $book) {
diff --git a/ext/xsl/php_xsl.stub.php b/ext/xsl/php_xsl.stub.php
index c01e218162e..24da81b7d71 100644
--- a/ext/xsl/php_xsl.stub.php
+++ b/ext/xsl/php_xsl.stub.php
@@ -80,25 +80,25 @@ class XSLTProcessor
public int $maxTemplateVars;
/**
- * @param DOMDocument|DOM\Document|SimpleXMLElement $stylesheet
+ * @param DOMDocument|Dom\Document|SimpleXMLElement $stylesheet
* @tentative-return-type
*/
public function importStylesheet(object $stylesheet): bool {}
/**
- * @param DOMDocument|DOM\Document|SimpleXMLElement $document
+ * @param DOMDocument|Dom\Document|SimpleXMLElement $document
* @tentative-return-type
*/
public function transformToDoc(object $document, ?string $returnClass = null): object|false {}
/**
- * @param DOMDocument|DOM\Document|SimpleXMLElement $document
+ * @param DOMDocument|Dom\Document|SimpleXMLElement $document
* @tentative-return-type
*/
public function transformToUri(object $document, string $uri): int {}
/**
- * @param DOMDocument|DOM\Document|SimpleXMLElement $document
+ * @param DOMDocument|Dom\Document|SimpleXMLElement $document
* @tentative-return-type
*/
public function transformToXml(object $document): string|null|false {}
diff --git a/ext/xsl/php_xsl_arginfo.h b/ext/xsl/php_xsl_arginfo.h
index 033e1e8e3b2..20559328d81 100644
--- a/ext/xsl/php_xsl_arginfo.h
+++ b/ext/xsl/php_xsl_arginfo.h
@@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
- * Stub hash: f7f9951cbb437f1985016dc06490d55f711bc725 */
+ * Stub hash: 5b4ce3f5f7dee60bde803b3c2eb3994777f56914 */
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_XSLTProcessor_importStylesheet, 0, 1, _IS_BOOL, 0)
ZEND_ARG_TYPE_INFO(0, stylesheet, IS_OBJECT, 0)
diff --git a/ext/xsl/tests/XSLTProcessor_namespace_mapper_lifetime.phpt b/ext/xsl/tests/XSLTProcessor_namespace_mapper_lifetime.phpt
index 2bd7c30dc8f..0d334031df7 100644
--- a/ext/xsl/tests/XSLTProcessor_namespace_mapper_lifetime.phpt
+++ b/ext/xsl/tests/XSLTProcessor_namespace_mapper_lifetime.phpt
@@ -6,7 +6,7 @@ xsl
--FILE--
<?php
-$input = DOM\XMLDocument::createFromString(<<<XML
+$input = Dom\XMLDocument::createFromString(<<<XML
<root>
<hello>World</hello>
</root>
@@ -26,8 +26,8 @@ XML;
$processor = new XSLTProcessor();
// The fact that this is a temporary is important!
// And yes, this is done twice on purpose to check for leaks
-$processor->importStylesheet(DOM\XMLDocument::createFromString($xslXML));
-$processor->importStylesheet(DOM\XMLDocument::createFromString($xslXML));
+$processor->importStylesheet(Dom\XMLDocument::createFromString($xslXML));
+$processor->importStylesheet(Dom\XMLDocument::createFromString($xslXML));
$processor->registerPHPFunctions();
echo $processor->transformToXML($input), "\n";
diff --git a/ext/xsl/tests/auto_registration_namespaces_new_dom.phpt b/ext/xsl/tests/auto_registration_namespaces_new_dom.phpt
index f3e7f6b0601..e2a99bcb714 100644
--- a/ext/xsl/tests/auto_registration_namespaces_new_dom.phpt
+++ b/ext/xsl/tests/auto_registration_namespaces_new_dom.phpt
@@ -6,7 +6,7 @@ xsl
--FILE--
<?php
-$sheet = DOM\XMLDocument::createFromString(<<<XML
+$sheet = Dom\XMLDocument::createFromString(<<<XML
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:php="http://php.net/xsl"
xmlns:str="http://exslt.org/strings"
@@ -22,7 +22,7 @@ XML);
// Make sure it will auto-register urn:test
$sheet->documentElement->append($sheet->createElementNS('urn:test', 'test:dummy'));
-$input = DOM\XMLDocument::createFromString(<<<XML
+$input = Dom\XMLDocument::createFromString(<<<XML
<root>
<hello>World</hello>
</root>