10 files changed, 14 insertions, 14 deletions
diff --git a/ext/dom/tests/DOMAttr_construct_error_001.phpt b/ext/dom/tests/DOMAttr_construct_error_001.phpt
index 53780c3321..64e6835f96 100644
--- a/ext/dom/tests/DOMAttr_construct_error_001.phpt
+++ b/ext/dom/tests/DOMAttr_construct_error_001.phpt
@@ -9,7 +9,7 @@ Josh Sweeney <jsweeney@alt-invest.net>
 <?php
 try {
     $attr = new DOMAttr();
-} catch (TypeException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 ?>
diff --git a/ext/dom/tests/DOMCDATASection_construct_error_001.phpt b/ext/dom/tests/DOMCDATASection_construct_error_001.phpt
index 2be1e5204f..fbce3c7527 100644
--- a/ext/dom/tests/DOMCDATASection_construct_error_001.phpt
+++ b/ext/dom/tests/DOMCDATASection_construct_error_001.phpt
@@ -9,7 +9,7 @@ Nic Rosental nicrosental@gmail.com
 <?php
 	try {
 	    $section = new DOMCDataSection();
-	} catch (TypeException $e) {
+	} catch (TypeError $e) {
 	    echo $e->getMessage();
 	}
 ?>
diff --git a/ext/dom/tests/DOMComment_construct_error_001.phpt b/ext/dom/tests/DOMComment_construct_error_001.phpt
index e2f0b19a72..27424c35e4 100644
--- a/ext/dom/tests/DOMComment_construct_error_001.phpt
+++ b/ext/dom/tests/DOMComment_construct_error_001.phpt
@@ -9,7 +9,7 @@ Eric Lee Stewart <ericleestewart@gmail.com>
 <?php
 try {
     $comment = new DOMComment("comment1", "comment2");
-} catch (TypeException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 ?>
diff --git a/ext/dom/tests/DOMDocumentFragment_construct_error_001.phpt b/ext/dom/tests/DOMDocumentFragment_construct_error_001.phpt
index d9376a3251..c84689ad8e 100644
--- a/ext/dom/tests/DOMDocumentFragment_construct_error_001.phpt
+++ b/ext/dom/tests/DOMDocumentFragment_construct_error_001.phpt
@@ -9,7 +9,7 @@ Eric Lee Stewart <ericleestewart@gmail.com>
 <?php
 try {
     $fragment = new DOMDocumentFragment("root");
-} catch (TypeException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 ?>
diff --git a/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt b/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
index c1ec685b2c..af0965c1c9 100644
--- a/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
+++ b/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
@@ -12,7 +12,7 @@ require_once dirname(__FILE__) .'/skipif.inc';
 DOMDocument::saveHTMLFile();
 ?>
 --EXPECTF--
-Fatal error: Uncaught EngineException: Non-static method DOMDocument::saveHTMLFile() cannot be called statically in %s:%d
+Fatal error: Uncaught Error: Non-static method DOMDocument::saveHTMLFile() cannot be called statically in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/dom/tests/DOMDocument_saveHTML_error2.phpt b/ext/dom/tests/DOMDocument_saveHTML_error2.phpt
index 41d190c072..e32e277803 100644
--- a/ext/dom/tests/DOMDocument_saveHTML_error2.phpt
+++ b/ext/dom/tests/DOMDocument_saveHTML_error2.phpt
@@ -12,7 +12,7 @@ require_once dirname(__FILE__) .'/skipif.inc';
 DOMDocument::saveHTML(true);
 ?>
 --EXPECTF--
-Fatal error: Uncaught EngineException: Non-static method DOMDocument::saveHTML() cannot be called statically in %s:%d
+Fatal error: Uncaught Error: Non-static method DOMDocument::saveHTML() cannot be called statically in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/dom/tests/DOMDocument_validate_error2.phpt b/ext/dom/tests/DOMDocument_validate_error2.phpt
index 901d541bf3..08ec083fbb 100644
--- a/ext/dom/tests/DOMDocument_validate_error2.phpt
+++ b/ext/dom/tests/DOMDocument_validate_error2.phpt
@@ -12,7 +12,7 @@ require_once dirname(__FILE__) .'/skipif.inc';
 DOMDocument::validate();
 ?>
 --EXPECTF--
-Fatal error: Uncaught EngineException: Non-static method DOMDocument::validate() cannot be called statically in %s:%d
+Fatal error: Uncaught Error: Non-static method DOMDocument::validate() cannot be called statically in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/dom/tests/dom003.phpt b/ext/dom/tests/dom003.phpt
index 33f9a0ec81..4c9d5a979f 100644
--- a/ext/dom/tests/dom003.phpt
+++ b/ext/dom/tests/dom003.phpt
@@ -28,13 +28,13 @@ $rootNode->appendChild($rootNode);
 object(DOMException)#%d (%d) {
   ["message":protected]=>
   string(23) "Hierarchy Request Error"
-  ["string":"BaseException":private]=>
+  ["string":"Exception":private]=>
   string(0) ""
   ["file":protected]=>
   string(%d) "%sdom003.php"
   ["line":protected]=>
   int(8)
-  ["trace":"BaseException":private]=>
+  ["trace":"Exception":private]=>
   array(1) {
     [0]=>
     array(6) {
@@ -55,7 +55,7 @@ object(DOMException)#%d (%d) {
       }
     }
   }
-  ["previous":"BaseException":private]=>
+  ["previous":"Exception":private]=>
   NULL
   ["code"]=>
   int(3)
diff --git a/ext/dom/tests/dom_set_attr_node.phpt b/ext/dom/tests/dom_set_attr_node.phpt
index 1c4960615c..1916cd524a 100644
--- a/ext/dom/tests/dom_set_attr_node.phpt
+++ b/ext/dom/tests/dom_set_attr_node.phpt
@@ -40,13 +40,13 @@ ob_start();
 object(DOMException)#%d (7) {
   ["message":protected]=>
   string(20) "Wrong Document Error"
-  ["string":"BaseException":private]=>
+  ["string":"Exception":private]=>
   string(0) ""
   ["file":protected]=>
   string(%d) "%sdom_set_attr_node.php"
   ["line":protected]=>
   int(%d)
-  ["trace":"BaseException":private]=>
+  ["trace":"Exception":private]=>
   array(1) {
     [0]=>
     array(6) {
@@ -67,7 +67,7 @@ object(DOMException)#%d (7) {
       }
     }
   }
-  ["previous":"BaseException":private]=>
+  ["previous":"Exception":private]=>
   NULL
   ["code"]=>
   int(4)
diff --git a/ext/dom/tests/regsiter_node_class.phpt b/ext/dom/tests/regsiter_node_class.phpt
index c2f0622438..311433b12c 100644
--- a/ext/dom/tests/regsiter_node_class.phpt
+++ b/ext/dom/tests/regsiter_node_class.phpt
@@ -37,7 +37,7 @@ myAttribute
 HELLO Attribute
 DOMAttr
 
-Fatal error: Uncaught EngineException: Call to undefined method DOMAttr::testit() in %s:25
+Fatal error: Uncaught Error: Call to undefined method DOMAttr::testit() in %s:25
 Stack trace:
 #0 {main}
   thrown in %s on line 25