ext/dom: applied fixers to improve test robustness

Author: NickSdot

ext/dom/tests/DOM4_ChildNode_wrong_document.phpt

@@ -18,8 +18,8 @@ function test($method) {
     try {
         $element->$method($dom2->documentElement->firstChild);
         echo "FAIL";
-    } catch (DOMException $e) {
-        echo $e->getMessage() . "\n";
+    } catch (Throwable $e) {
+        echo $e::class, ': ', $e->getMessage(), "\n";
     }
 }
 
@@ -29,6 +29,6 @@ test("replaceWith");
 
 ?>
 --EXPECT--
-Wrong Document Error
-Wrong Document Error
-Wrong Document Error
+DOMException: Wrong Document Error
+DOMException: Wrong Document Error
+DOMException: Wrong Document Error

ext/dom/tests/DOM4_DOMNode_removeDanglingElement.phpt

@@ -11,9 +11,9 @@ $element = $dom->createElement('test');
 
 try {
     $element->remove();
-} catch (DOMException $e) {
-    echo $e->getMessage();
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-Not Found Error
+DOMException: Not Found Error

ext/dom/tests/DOM4_ParentNode_append_invalidtypes.phpt

@@ -11,9 +11,9 @@ $dom->loadXML('<test />');
 
 try {
     $dom->documentElement->append(array());
-} catch(TypeError $e) {
-    echo "OK! {$e->getMessage()}";
+} catch(Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-OK! DOMElement::append(): Argument #1 must be of type DOMNode|string, array given
+TypeError: DOMElement::append(): Argument #1 must be of type DOMNode|string, array given

ext/dom/tests/DOM4_ParentNode_append_with_attributes.phpt

@@ -18,13 +18,13 @@ $element = $dom->documentElement;
 
 try {
     $element->append($replacement, $addition);
-} catch (DOMException $e) {
-    echo $e->getMessage() . "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 echo $dom->saveXML();
 ?>
 --EXPECT--
-Hierarchy Request Error
+DOMException: Hierarchy Request Error
 <?xml version="1.0"?>
 <test attr-one="21"/>

ext/dom/tests/DOM4_ParentNode_append_wrong_document.phpt

@@ -18,14 +18,14 @@ function test($method) {
     try {
         $element->$method($dom2->documentElement->firstChild);
         echo "FAIL";
-    } catch (DOMException $e) {
-        echo $e->getMessage() . "\n";
+    } catch (Throwable $e) {
+        echo $e::class, ': ', $e->getMessage(), "\n";
     }
 }
 
 test("append");
 test("prepend");
 ?>
 --EXPECT--
-Wrong Document Error
-Wrong Document Error
+DOMException: Wrong Document Error
+DOMException: Wrong Document Error

ext/dom/tests/DOMAttr_construct_error_001.phpt

@@ -9,9 +9,9 @@ dom
 <?php
 try {
     $attr = new DOMAttr();
-} catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-DOMAttr::__construct() expects at least 1 argument, 0 given
+ArgumentCountError: DOMAttr::__construct() expects at least 1 argument, 0 given

ext/dom/tests/DOMCDATASection_construct_error_001.phpt

@@ -9,9 +9,9 @@ dom
 <?php
     try {
         $section = new DOMCDataSection();
-    } catch (TypeError $e) {
-        echo $e->getMessage();
+    } catch (Throwable $e) {
+        echo $e::class, ': ', $e->getMessage(), "\n";
     }
 ?>
 --EXPECT--
-DOMCdataSection::__construct() expects exactly 1 argument, 0 given
+ArgumentCountError: DOMCdataSection::__construct() expects exactly 1 argument, 0 given

ext/dom/tests/DOMCharacterData_data_error_002.phpt

@@ -10,9 +10,9 @@ dom
 $character_data = new DOMCharacterData();
 try {
     print $character_data->data;
-} catch (DOMException $exception) {
-    echo $exception->getMessage() . "\n";
+} catch (Throwable $exception) {
+    echo $exception::class, ': ', $exception->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-Invalid State Error
+DOMException: Invalid State Error

ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt

@@ -15,9 +15,9 @@ $cdata = $document->createCDATASection('test');
 $root->appendChild($cdata);
 try {
     $cdata->deleteData(5, 1);
-} catch (DOMException $e) {
-    echo $e->getMessage();
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-Index Size Error
+DOMException: Index Size Error

ext/dom/tests/DOMCharacterData_length_error_001.phpt

@@ -10,9 +10,9 @@ dom
 $character_data = new DOMCharacterData();
 try {
     print $character_data->length;
-} catch (DOMException $exception) {
-    echo $exception->getMessage() . "\n";
+} catch (Throwable $exception) {
+    echo $exception::class, ': ', $exception->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-Invalid State Error
+DOMException: Invalid State Error