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 2de4b36e2ef4..0d1d168f91c5 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,12 +1,12 @@
--TEST--
-DOM\HTMLDocument::createFromString() - parser warning 03
+Dom\HTMLDocument::createFromString() - parser warning 03
--EXTENSIONS--
dom
--FILE--
saveHTML(), "\n";
?>
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 44dac9eb5392..84ac73e2860d 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 047c18640849..941556920bd1 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,11 +1,11 @@
--TEST--
-DOM\HTMLDocument::createFromString() - document without body
+Dom\HTMLDocument::createFromString() - document without body
--EXTENSIONS--
dom
--FILE--
foo '
');
+$dom = Dom\HTMLDocument::createFromString('foo '
');
echo $dom->saveHTML(), "\n";
?>
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 c1e281b5331a..0d3ad1a474ac 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 a97385de37d9..21ea76313b78 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) {
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 86b5a6d28f54..d02100cfcbe9 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 3889d1fd2ff6..c6445bdc0604 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";
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 108c38346781..9efae8cefbe8 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_entity_reference.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_entity_reference.phpt
@@ -9,7 +9,7 @@ $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";
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 d4a888bffe82..f5dd60eb156d 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_escape_attribute.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_escape_attribute.phpt
@@ -1,11 +1,11 @@
--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();
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 c7b11a7a4c74..d278b93980a4 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_escape_nbsp.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_escape_nbsp.phpt
@@ -1,11 +1,11 @@
--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);
+$dom = Dom\HTMLDocument::createFromString("these must transform: \xc2\xa0\xc2\xa0 but these not: \xa0|\xc2...
", LIBXML_NOERROR);
echo $dom->saveHTML();
?>
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 dc8881bfc6a7..02bff8e22de7 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"));
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 27824c61eeec..2d2879f1f7c1 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_cdata.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_cdata.phpt
@@ -1,15 +1,15 @@
--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();
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 4abc382a3ae1..751a33abbc43 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_comment.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_comment.phpt
@@ -1,11 +1,11 @@
--TEST--
-DOM\HTMLDocument serialization of comment
+Dom\HTMLDocument serialization of comment
--EXTENSIONS--
dom
--FILE--
appendChild($dom->createComment("foobaré\"<>-&"));
echo $dom->saveHTML();
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 5be17d704191..ec068f549310 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--
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 03813a625208..19a2b5f09a95 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");
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 7241c34f7754..bc7c1e6db0fb 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,7 +33,7 @@ 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");
@@ -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 69c47eca4ace..208b305016e1 100644
--- a/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_fragment.phpt
+++ b/ext/dom/tests/modern/html/serializer/HTMLDocument_serialize_fragment.phpt
@@ -1,11 +1,11 @@
--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"));
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 28fb38024a7b..82dbd1f64aef 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--
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 76321f473805..60b71e2bfbd2 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,18 +1,18 @@
--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 "--- 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));
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 94af74ffaeb2..5c8dc7161c60 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,17 +1,17 @@
--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 "--- 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));
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 7f5b9ab822f2..ab62bef94403 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,17 +1,17 @@
--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 "--- 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));
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 d4ae507c7617..701737e6b622 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,17 +1,17 @@
--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 "--- 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));
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 2e9fd671775f..ac98a36fd887 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,17 +1,17 @@
--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 "--- 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));
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 753fa73633b9..7ca496e7cf8c 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,17 +1,17 @@
--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 "--- 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)));
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 c45bef620faa..10b2bf5d1457 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,11 +1,11 @@
--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();
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 5b5959e5adb6..9cbc70fd8e5a 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));
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 025bee90ced7..4c21b432a99b 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,11 +1,11 @@
--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();
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 115f3233eb2e..fa907a026e43 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,11 +1,11 @@
--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));
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 ec6822d77582..82a9530a006d 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,11 +1,11 @@
--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));
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 e4acf241e7d0..ff8c2389ba30 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);
diff --git a/ext/dom/tests/modern/spec/Attr_name.phpt b/ext/dom/tests/modern/spec/Attr_name.phpt
index 2510de3eb1c2..89c0aff2223e 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 924f58d70362..5ac9dec306ce 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,7 +7,7 @@ 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";
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 b89b389ee31a..03d9d67086e3 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"));
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 f00625df3521..2285f60c7f21 100644
--- a/ext/dom/tests/modern/spec/CharacterData_insertData_negative_offset.phpt
+++ b/ext/dom/tests/modern/spec/CharacterData_insertData_negative_offset.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
createComment("foobarbaz");
try {
$comment->insertData(-1, "A");
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 5c0be698bda8..8ed7f37c226a 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,7 +11,7 @@ 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");
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 96402847f73c..dfde274119dd 100644
--- a/ext/dom/tests/modern/spec/CharacterData_replaceData_negative_count.phpt
+++ b/ext/dom/tests/modern/spec/CharacterData_replaceData_negative_count.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
createComment("foobarbaz");
$comment->replaceData(0, -1, "A");
echo $dom->saveHTML($comment), "\n";
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 9382ed254975..dcb709b9caa7 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,7 +11,7 @@ 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";
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 82f1f9ed77d3..9584dbfe647e 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));
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 a0b5414bb898..2ea2d618107f 100644
--- a/ext/dom/tests/modern/spec/CharacterData_substringData_negative_arguments.phpt
+++ b/ext/dom/tests/modern/spec/CharacterData_substringData_negative_arguments.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
createComment("foobarbaz");
var_dump($comment->substringData(0, -1));
echo $dom->saveHTML($comment), "\n";
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 c29eb0b77929..fc498fbaf558 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,7 +11,7 @@ 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";
diff --git a/ext/dom/tests/modern/spec/Document_createAttribute.phpt b/ext/dom/tests/modern/spec/Document_createAttribute.phpt
index 7a9ead916c8b..9d52b3659758 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 e0cb36c9ffd6..81f501a452a9 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');
diff --git a/ext/dom/tests/modern/spec/Document_createElement.phpt b/ext/dom/tests/modern/spec/Document_createElement.phpt
index 72a330fa8e2f..e7112bbf90c9 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 3eeb1bd2cbb8..cbdbe5dfd983 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 d2113b2d1ef1..6d8fc878b6ce 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 0f18891e62c9..12df0f49c827 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 a7025655ec40..55e31d2afb96 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, "", $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";
?>
--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 d396477c6941..af8c57e68fad 100644
--- a/ext/dom/tests/modern/spec/Document_implementation_createDocumentType.phpt
+++ b/ext/dom/tests/modern/spec/Document_implementation_createDocumentType.phpt
@@ -13,7 +13,7 @@ $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);
@@ -25,7 +25,7 @@ foreach ($test_matrix as $test_item) {
?>
--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 622a690abc0e..74e17fb5a4f0 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 c66808e3895e..673aed3ef556 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 fe3568bb0c26..97c55b101d47 100644
--- a/ext/dom/tests/modern/spec/Document_implementation_createHTMLDocument.phpt
+++ b/ext/dom/tests/modern/spec/Document_implementation_createHTMLDocument.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
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 55e53c3ccc16..f2bf45f010de 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);
-$new = DOM\XMLDocument::createEmpty();
+$new = Dom\XMLDocument::createEmpty();
$new->append($new->importLegacyNode($old->documentElement, true));
unset($old);
@@ -37,7 +37,7 @@ 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 779a41efb557..9f02411fd8bb 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 73dc64f503d4..6f4f7a0d89ad 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('');
+$dom = Dom\HTMLDocument::createFromString('');
$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 cfaae5bb8979..9b27c79b93af 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--
');
+$dom = Dom\HTMLDocument::createFromString('');
$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 4bf186ac2f41..034fcbeec6a5 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('');
+$dom = Dom\HTMLDocument::createFromString('');
$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 4cbc2d2558d9..b993855bae8c 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('');
+$dom = Dom\HTMLDocument::createFromString('');
$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 e72fd3667273..0f73ad845962 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('');
+$dom = Dom\HTMLDocument::createFromString('');
$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 6b8820f9452b..bd24a6afc5f5 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--
');
+$dom = Dom\HTMLDocument::createFromString('');
$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 94bcaa13b896..0d82a49dd44e 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--
appendChild($dom->createElement("foo"));
try {
$foo->insertAdjacentText("beforebegin", "bar");
diff --git a/ext/dom/tests/modern/spec/Element_prefix_readonly.phpt b/ext/dom/tests/modern/spec/Element_prefix_readonly.phpt
index 37ceda2e4c05..14e6bdc99d36 100644
--- a/ext/dom/tests/modern/spec/Element_prefix_readonly.phpt
+++ b/ext/dom/tests/modern/spec/Element_prefix_readonly.phpt
@@ -1,10 +1,10 @@
--TEST--
-Ensure that DOM\Node::$prefix is read-only
+Ensure that Dom\Node::$prefix is read-only
--EXTENSIONS--
dom
--FILE--
createElement('div');
try {
$div->prefix = "foo";
@@ -14,5 +14,5 @@ try {
echo $dom->saveXML();
?>
--EXPECT--
-Cannot modify readonly property DOM\Element::$prefix
+Cannot modify readonly property Dom\Element::$prefix
diff --git a/ext/dom/tests/modern/spec/Element_removeAttribute.phpt b/ext/dom/tests/modern/spec/Element_removeAttribute.phpt
index 20ccb6c109b9..c8cb65cb1c05 100644
--- a/ext/dom/tests/modern/spec/Element_removeAttribute.phpt
+++ b/ext/dom/tests/modern/spec/Element_removeAttribute.phpt
@@ -7,7 +7,7 @@ dom
echo "--- Remove after parsing ---\n";
-$dom = DOM\HTMLDocument::createFromString('');
+$dom = Dom\HTMLDocument::createFromString('');
$body = $dom->getElementsByTagName("body")[0];
var_dump($body->removeAttribute("align"));
var_dump($body->removeAttribute("foo:bar"));
diff --git a/ext/dom/tests/modern/spec/Element_removeAttributeNS.phpt b/ext/dom/tests/modern/spec/Element_removeAttributeNS.phpt
index 7f31eacda516..a96808b2bf6c 100644
--- a/ext/dom/tests/modern/spec/Element_removeAttributeNS.phpt
+++ b/ext/dom/tests/modern/spec/Element_removeAttributeNS.phpt
@@ -6,7 +6,7 @@ dom
');
+ $dom = Dom\HTMLDocument::createFromString('');
$body = $dom->getElementsByTagName("body")[0];
return $body;
}
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 fc5dbeae0405..e50ef36e31fa 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--
');
+$dom = Dom\XMLDocument::createFromString('');
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 e23492303ac3..b43ee850a95b 100644
--- a/ext/dom/tests/modern/spec/Element_setAttributeNS.phpt
+++ b/ext/dom/tests/modern/spec/Element_setAttributeNS.phpt
@@ -7,7 +7,7 @@ dom
require __DIR__ . "/dump_attr.inc";
-$dom = DOM\HTMLDocument::createEmpty();
+$dom = Dom\HTMLDocument::createEmpty();
$container = $dom->appendChild($dom->createElement("container"));
echo "--- xmlns attribute ---\n";
@@ -26,7 +26,7 @@ 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");
@@ -36,7 +36,7 @@ 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");
diff --git a/ext/dom/tests/modern/spec/Element_setAttributeNode.phpt b/ext/dom/tests/modern/spec/Element_setAttributeNode.phpt
index 3379d6b8b367..8c07fedf6df5 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--
appendChild($dom1->createElement("container"));
echo "--- Without namespace ---\n";
diff --git a/ext/dom/tests/modern/spec/Element_setAttributeNode_adoption.phpt b/ext/dom/tests/modern/spec/Element_setAttributeNode_adoption.phpt
index d395c16355b9..86e516f1f7cb 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--
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);
diff --git a/ext/dom/tests/modern/spec/Element_setAttributeNode_inuse.phpt b/ext/dom/tests/modern/spec/Element_setAttributeNode_inuse.phpt
index 1e2e5e3b15fd..11fdd0fa65ea 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--
appendChild($dom1->createElement("container"));
$attr1 = $dom1->createAttribute("my-attribute");
$attr1->value = "1";
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 d480dbaac5ee..24ec3a89f879 100644
--- a/ext/dom/tests/modern/spec/Element_setAttribute_with_namespace.phpt
+++ b/ext/dom/tests/modern/spec/Element_setAttribute_with_namespace.phpt
@@ -7,12 +7,12 @@ 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);
}
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 7619988f4f15..59d808a86d5f 100644
--- a/ext/dom/tests/modern/spec/Element_setAttribute_without_namespace.phpt
+++ b/ext/dom/tests/modern/spec/Element_setAttribute_without_namespace.phpt
@@ -7,12 +7,12 @@ 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);
}
diff --git a/ext/dom/tests/modern/spec/Element_tagName.phpt b/ext/dom/tests/modern/spec/Element_tagName.phpt
index f364ebf3be43..76327ed531b5 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 457663b3cd25..c24dbb015f77 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--
appendChild($dom->createElement('container'));
$container->toggleAttribute('hidden');
diff --git a/ext/dom/tests/modern/spec/HTMLDocument_createCDATASection.phpt b/ext/dom/tests/modern/spec/HTMLDocument_createCDATASection.phpt
index de9989510ad7..1787ae29f95d 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--
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 7cb459f9866d..ee9b12050eac 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--
createProcessingInstruction("?>", "");
} catch (DOMException $e) {
diff --git a/ext/dom/tests/modern/spec/HTMLDocument_getElementsByTagName.phpt b/ext/dom/tests/modern/spec/HTMLDocument_getElementsByTagName.phpt
index c19a94ada25b..206ee6e640d9 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 8108567a04f3..dbd94fd31af6 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--
@@ -19,7 +19,7 @@ $dom = DOM\XMLDocument::createFromString(<<importNode($dom->documentElement, true);
$dom2->appendChild($imported);
diff --git a/ext/dom/tests/modern/spec/NamedNodeMap_dimensions.phpt b/ext/dom/tests/modern/spec/NamedNodeMap_dimensions.phpt
index eb015911baac..38e00defe622 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--
');
+$dom = Dom\XMLDocument::createFromString('');
$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 8f5101c55e4f..848b1a2c0b02 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--
');
+$dom = Dom\XMLDocument::createFromString('');
$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 ab6f7e027d34..0e7d021f4e5b 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--
@@ -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 a20e1c98ed84..f5fe6480e641 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--
');
+$dom = Dom\XMLDocument::createFromString('');
$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 9c0b10e6f754..bfb882823b78 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--
');
+$dom = Dom\XMLDocument::createFromString('');
$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 c18e2527c020..3e3a5674c6a6 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--
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 86b90e160871..64ab835940e0 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--
createDocumentFragment();
$fragment->appendChild($dom->createElement('foo'));
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 6f2e3f3762a0..af99bfc38057 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--
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 80a07fa280db..b262bda51f65 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--
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(<<
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 a6928b4a697e..7894aa0a3131 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--
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 826a83055fee..b63ce50f98eb 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('');
+$dom = Dom\XMLDocument::createFromString('');
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 7672e8e9719a..3def93dc1863 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--
');
+$dom = Dom\HTMLDocument::createFromString('');
$dom->documentElement->remove();
$fragment = $dom->createDocumentFragment();
diff --git a/ext/dom/tests/modern/spec/Node_insertBefore_02.phpt b/ext/dom/tests/modern/spec/Node_insertBefore_02.phpt
index aa252e7eed09..917324cf15b7 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--
');
+$dom = Dom\HTMLDocument::createFromString('');
$fragment = $dom->createDocumentFragment();
$fragment->appendChild($dom->createElement('a'));
diff --git a/ext/dom/tests/modern/spec/Node_isDefaultNamespace.phpt b/ext/dom/tests/modern/spec/Node_isDefaultNamespace.phpt
index 56eee90553c5..cd89174df7b5 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--
diff --git a/ext/dom/tests/modern/spec/Node_isEqualNode_01.phpt b/ext/dom/tests/modern/spec/Node_isEqualNode_01.phpt
index 51b5648d8a1b..0c462369893b 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--
append($dom->createElement("container"));
$e1 = $dom->documentElement->appendChild($dom->createElementNS("urn:example1", "example:foo"));
$e1->after("\n");
@@ -14,7 +14,7 @@ $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("" . $dom->saveHTML());
+$dom2 = Dom\HTMLDocument::createFromString("" . $dom->saveHTML());
// Shouldn't match because the attributes can't roundtrip.
var_dump($dom->saveHTML($dom->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 bc7f23a7d987..d12b700cd583 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--
append($dom->createElement("container"));
$e1 = $dom->documentElement->appendChild($dom->createElement("foo1"));
$e1->after("\n");
@@ -17,7 +17,7 @@ $e2->setAttribute("bar2", "baz");
$e2->setAttributeNodeNS($child = $dom->createAttributeNS("http://example.com", "foo:bar"));
$e2->removeAttributeNode($child);
-$dom2 = DOM\HTMLDocument::createFromString("" . $dom->saveHTML());
+$dom2 = Dom\HTMLDocument::createFromString("" . $dom->saveHTML());
var_dump($dom->saveHTML($dom->getElementsByTagName("container")[0]));
var_dump($dom2->saveHTML($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 c4e1015144d9..9512891709af 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--
@@ -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 4bb52004027a..913ede69cec1 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--
diff --git a/ext/dom/tests/modern/spec/Node_nodeName.phpt b/ext/dom/tests/modern/spec/Node_nodeName.phpt
index 84343731a00a..ac669b6ec906 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 749614ea9fc7..a3e23b1381d4 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--
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 04848e5d019a..7233ff4c5bd8 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 03b75ede7f39..47d8edf7fe2d 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--
appendChild($doc->createElement("container"));
$container->appendChild($doc->createTextNode(""));
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 e76fdc62ee73..1d50f9724bed 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--
");
+$dom = Dom\HTMLDocument::createFromString("");
$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";
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 a8a65ca7bc58..67a964a7ec51 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--
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 5df27d5a2765..367f1437c67d 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--
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 a4ebc5945070..f81450ca261e 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--
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 498561a8b788..33198c8552aa 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--
');
+$dom = Dom\XMLDocument::createFromString('');
$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 5b46a2ba8dcf..4bd79b9b4a8b 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--
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 ca521c6ff2cb..4fa06f5e88d4 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 accc06ce3d77..82f38839ea27 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--
');
+$dom = Dom\XMLDocument::createFromString('');
var_dump($dom->xmlVersion);
foreach (['0.1', '1.0', '1.1', '', 'foo'] as $version) {
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 5b66c030a4f1..6a01beca15c8 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--
append("foo", "bar", "baz", $dom);
diff --git a/ext/dom/tests/modern/spec/attribute_entity_expansion.phpt b/ext/dom/tests/modern/spec/attribute_entity_expansion.phpt
index 19a8f91024eb..286852d5bd07 100644
--- a/ext/dom/tests/modern/spec/attribute_entity_expansion.phpt
+++ b/ext/dom/tests/modern/spec/attribute_entity_expansion.phpt
@@ -4,7 +4,7 @@ Attribute entity expansion
dom
--FILE--
createElement('elt');
$doc->appendChild($elt);
$elt->setAttribute('a','&');
diff --git a/ext/dom/tests/modern/spec/bug47530.phpt b/ext/dom/tests/modern/spec/bug47530.phpt
index 16d3078d07b9..0f8888ffeb37 100644
--- a/ext/dom/tests/modern/spec/bug47530.phpt
+++ b/ext/dom/tests/modern/spec/bug47530.phpt
@@ -6,7 +6,7 @@ dom
');
+ $doc = Dom\XMLDocument::createFromString('');
$root = $doc->documentElement;
$frag = $doc->createDocumentFragment();
$frag->appendChild($doc->importNode($root->firstChild));
@@ -15,7 +15,7 @@ function test_document_fragment_with_import() {
}
function test_document_fragment_without_import() {
- $doc = DOM\XMLDocument::createFromString('');
+ $doc = Dom\XMLDocument::createFromString('');
$frag = $doc->createDocumentFragment();
$frag->appendChild($doc->createElementNS('https://php.net/bar', 'bar'));
$frag->appendChild($doc->createElementNS('', 'bar'));
@@ -40,9 +40,9 @@ function test_document_import() {
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);
@@ -61,9 +61,9 @@ function test_partial_document_import() {
XML;
- $dom = DOM\XMLDocument::createFromString($xml);
+ $dom = Dom\XMLDocument::createFromString($xml);
- $dom2 = DOM\XMLDocument::createFromString('');
+ $dom2 = Dom\XMLDocument::createFromString('');
$importedNode = $dom2->importNode($dom->documentElement, true);
$dom2->documentElement->appendChild($importedNode);
@@ -75,8 +75,8 @@ XML;
}
function test_document_import_with_attributes() {
- $dom = DOM\XMLDocument::createFromString('');
- $dom2 = DOM\XMLDocument::createFromString('');
+ $dom = Dom\XMLDocument::createFromString('');
+ $dom2 = Dom\XMLDocument::createFromString('');
$dom2->documentElement->appendChild($dom2->importNode($dom->documentElement->firstChild));
echo $dom2->saveXML(), "\n";
@@ -85,7 +85,7 @@ function test_document_import_with_attributes() {
}
function test_appendChild_with_shadowing() {
- $dom = DOM\XMLDocument::createFromString('');
+ $dom = Dom\XMLDocument::createFromString('');
$a = $dom->documentElement->firstElementChild;
$b = $a->nextSibling;
diff --git a/ext/dom/tests/modern/spec/bug47847.phpt b/ext/dom/tests/modern/spec/bug47847.phpt
index 70a0d7bc1358..ae1743eac736 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--
@@ -13,7 +13,7 @@ $fromdom = DOM\XMLDocument::createFromString(<<
XML);
-$aDOM = DOM\XMLDocument::createEmpty();
+$aDOM = Dom\XMLDocument::createEmpty();
$imported = $aDOM->importNode($fromdom->documentElement->firstElementChild, true);
$aDOM->appendChild($imported);
diff --git a/ext/dom/tests/modern/spec/bug55294.phpt b/ext/dom/tests/modern/spec/bug55294.phpt
index b0acd5f2118c..ebb1ca191b9e 100644
--- a/ext/dom/tests/modern/spec/bug55294.phpt
+++ b/ext/dom/tests/modern/spec/bug55294.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
@@ -14,7 +14,7 @@ $aDOM = DOM\XMLDocument::createFromString(<<importNode($aDOM->getElementsByTagNameNS('http://example.com/A', 'B')->item(0), true);
$bDOM->appendChild($node);
diff --git a/ext/dom/tests/modern/spec/bug81468.phpt b/ext/dom/tests/modern/spec/bug81468.phpt
index 3e0835ece1c4..29b5794fcca1 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";
-$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);
+$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 b2afdfad3b74..ad0c560adb2e 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--
diff --git a/ext/dom/tests/modern/spec/clone_document.phpt b/ext/dom/tests/modern/spec/clone_document.phpt
index 8a855bcb23ce..46f140150824 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--
diff --git a/ext/dom/tests/modern/spec/clone_dtd_node.phpt b/ext/dom/tests/modern/spec/clone_dtd_node.phpt
index 7fd74022eab4..f0b78aec9b14 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--
');
+$dom = Dom\HTMLDocument::createFromString('');
$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 b42d33e10059..7810a16df4a4 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--
@@ -21,7 +21,7 @@ var_dump($clone->firstChild->firstChild);
?>
--EXPECTF--
&foo;
-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 6809dc769005..345383364557 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--
appendChild($dom->createElementNS("urn:a", "a:root"));
$root->setAttribute("foo", "bar");
diff --git a/ext/dom/tests/modern/spec/default_namespace_move.phpt b/ext/dom/tests/modern/spec/default_namespace_move.phpt
index ee6d43fce82a..c837a8d178d1 100644
--- a/ext/dom/tests/modern/spec/default_namespace_move.phpt
+++ b/ext/dom/tests/modern/spec/default_namespace_move.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
appendChild($dom->createElementNS('urn:a', 'foo:bar'));
$child = $root->appendChild($dom->createElementNS('urn:a', 'foo:baz'));
$child->setAttributeNS("urn:b", "foo:attr", "value");
@@ -13,7 +13,7 @@ $root->remove();
$dom->appendChild($child);
echo $dom->saveXML(), "\n";
-$dom2 = DOM\XMLDocument::createEmpty();
+$dom2 = Dom\XMLDocument::createEmpty();
$child = $dom2->importNode($child, true);
$dom2->appendChild($child);
echo $dom2->saveXML(), "\n";
diff --git a/ext/dom/tests/modern/spec/documentURI_URL.phpt b/ext/dom/tests/modern/spec/documentURI_URL.phpt
index 20ba9bbb0449..3e5a797eae67 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--
');
+$dom = Dom\XMLDocument::createFromString('');
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 e25e48a1aa11..9926fcd418e5 100644
--- a/ext/dom/tests/modern/spec/dom_parsing_gh44.phpt
+++ b/ext/dom/tests/modern/spec/dom_parsing_gh44.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
')->documentElement;
+$root = Dom\XMLDocument::createFromString('')->documentElement;
$root->firstChild->setAttributeNS('uri3', 'attr1', 'value1');
echo $root->ownerDocument->saveXML(), "\n";
diff --git a/ext/dom/tests/modern/spec/dom_parsing_gh45.phpt b/ext/dom/tests/modern/spec/dom_parsing_gh45.phpt
index bd13c848e0e4..25312ca1916f 100644
--- a/ext/dom/tests/modern/spec/dom_parsing_gh45.phpt
+++ b/ext/dom/tests/modern/spec/dom_parsing_gh45.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
')->documentElement;
+$root = Dom\XMLDocument::createFromString('')->documentElement;
$root->firstChild->setAttributeNS('u1', 'name', 'v');
$attr = $root->firstChild->getAttributeNodeNS("u1", "name");
var_dump($attr->prefix, $attr->namespaceURI);
diff --git a/ext/dom/tests/modern/spec/dom_parsing_gh47.phpt b/ext/dom/tests/modern/spec/dom_parsing_gh47.phpt
index 16cd4abd4130..552339b91f80 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--
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 c142702ebda9..498c4dd9ffc3 100644
--- a/ext/dom/tests/modern/spec/dom_parsing_gh47_bis.phpt
+++ b/ext/dom/tests/modern/spec/dom_parsing_gh47_bis.phpt
@@ -7,10 +7,10 @@ dom
// Adapted from https://github.com/web-platform-tests/wpt/blob/master/domparsing/XMLSerializer-serializeToString.html
-$dom = DOM\XMLDocument::createFromString('');
+$dom = Dom\XMLDocument::createFromString('');
echo $dom->saveXML(), "\n";
-$dom = DOM\XMLDocument::createFromString('');
+$dom = Dom\XMLDocument::createFromString('');
echo $dom->saveXML(), "\n";
?>
diff --git a/ext/dom/tests/modern/spec/gh11404_1.phpt b/ext/dom/tests/modern/spec/gh11404_1.phpt
index 884f3560c064..7bb61578fa61 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--
');
+$dom1 = Dom\XMLDocument::createFromString('');
$nodeA = $dom1->createElement('none');
$nodeB = $dom1->createElementNS(null, 'none');
diff --git a/ext/dom/tests/modern/spec/gh11404_2.phpt b/ext/dom/tests/modern/spec/gh11404_2.phpt
index 601c2d4e5ac1..b320f467606a 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--
');
+$dom1 = Dom\XMLDocument::createFromString('');
-$dom2 = DOM\XMLDocument::createFromString('');
+$dom2 = Dom\XMLDocument::createFromString('');
$dom1->documentElement->append(
$dom1->importNode(
diff --git a/ext/dom/tests/modern/spec/import_entity_reference.phpt b/ext/dom/tests/modern/spec/import_entity_reference.phpt
index 02d51af68aad..0922cce088c8 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--
@@ -13,7 +13,7 @@ $dom = DOM\XMLDocument::createFromString(<<&foo;
XML);
-$importer = DOM\XMLDocument::createEmpty();
+$importer = Dom\XMLDocument::createEmpty();
$imported = $importer->importNode($dom->documentElement, true);
echo $importer->saveXML($imported), "\n";
@@ -22,7 +22,7 @@ var_dump($imported->firstChild);
?>
--EXPECT--
&foo;
-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 b612c409e043..e4d612654486 100644
--- a/ext/dom/tests/modern/spec/import_of_lone_attribute.phpt
+++ b/ext/dom/tests/modern/spec/import_of_lone_attribute.phpt
@@ -5,13 +5,13 @@ dom
--FILE--
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";
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 e66ec34efa71..d6fc5f7b1789 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--
appendChild($dom->createElement('root'));
$root->setAttributeNS("urn:a", "a:root1", "bar");
@@ -25,7 +25,7 @@ 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";
diff --git a/ext/dom/tests/modern/spec/pre_insertion_validation.phpt b/ext/dom/tests/modern/spec/pre_insertion_validation.phpt
index b0f426be5cec..ac06f072748a 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--
");
+$dom = Dom\XMLDocument::createFromString("");
$doctype = $dom->doctype;
$dom->removeChild($doctype);
@@ -70,7 +70,7 @@ 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 be2db111092f..a439dfc8611b 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--
appendChild($dom->createElement('root'));
$root->setAttributeNS("urn:a", "a:root1", "bar");
diff --git a/ext/dom/tests/modern/spec/reconciliation_of_elements.phpt b/ext/dom/tests/modern/spec/reconciliation_of_elements.phpt
index f05ad8669c95..41e3729e31f4 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--
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 3bb61d1f63ae..9d3798eaed46 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--
diff --git a/ext/dom/tests/modern/spec/serialize_element_unqualified.phpt b/ext/dom/tests/modern/spec/serialize_element_unqualified.phpt
index 23ecc1321a82..10cd94441ea9 100644
--- a/ext/dom/tests/modern/spec/serialize_element_unqualified.phpt
+++ b/ext/dom/tests/modern/spec/serialize_element_unqualified.phpt
@@ -5,10 +5,10 @@ dom
--FILE--
');
+$dom = Dom\XMLDocument::createFromString('');
echo $dom->saveXML(), "\n";
-$dom = DOM\XMLDocument::createFromString('');
+$dom = Dom\XMLDocument::createFromString('');
$root = $dom->documentElement;
$child2 = $root->ownerDocument->createElementNS('u1', 'child2');
$root->firstChild->appendChild($child2);
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 ab91d3e104b9..b158aabf45e5 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--
');
+$dom = Dom\XMLDocument::createFromString('');
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
diff --git a/ext/dom/tests/modern/spec/serialize_xml_attribute.phpt b/ext/dom/tests/modern/spec/serialize_xml_attribute.phpt
index 8fd583c6b5f1..9c0624fbe0ff 100644
--- a/ext/dom/tests/modern/spec/serialize_xml_attribute.phpt
+++ b/ext/dom/tests/modern/spec/serialize_xml_attribute.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
");
+$dom = Dom\XMLDocument::createFromString("");
$root = $dom->documentElement;
$root->setAttribute("foo", "<>\"& \t\n\rfoo ");
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 7e0ab39c666d..cab862c76ebb 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,7 +5,7 @@ dom
--FILE--
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"));
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 dc308b1ca829..895133331666 100644
--- a/ext/dom/tests/modern/spec/serialize_xml_ns_decl.phpt
+++ b/ext/dom/tests/modern/spec/serialize_xml_ns_decl.phpt
@@ -5,7 +5,7 @@ dom
--FILE--
');
+$dom = Dom\XMLDocument::createFromString('');
$root = $dom->documentElement;
$root->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:xml', 'http://www.w3.org/XML/1998/namespace');
echo $dom->saveXML(), "\n";
diff --git a/ext/dom/tests/modern/spec/textContent_edge_cases.phpt b/ext/dom/tests/modern/spec/textContent_edge_cases.phpt
index b482ce01c790..f4d9d942f2d5 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--
text