Merge branch 'pull-request/1284'

* pull-request/1284: Rename interface macros Fix typo in UPGRADING Move definition of Throwable to zend_exceptions.h/c Check for zend_ce_throwable instead Fix some missed tests Add Throwable tests Fix previous exception type check Updated UPGRADING with RFC link Changed AssertionException to AssertionError Update exception error messages Throwable method signatures. Update exception names in tests after formatting changes. Merge exception formatting changes. Make zend_get_exception_base static. Fix a few missed tests. Fix handler double copy. Updated tests to reflect exception class changes. Remodel exceptions based on Throwable interface
author: Anatol Belski <ab@php.net> 2015-06-17 21:55:03 +0200
committer: Anatol Belski <ab@php.net> 2015-06-17 21:55:03 +0200
commit: 269acaa363cab7de8705b060ba9b1e32322fb0f4 (patch)
tree: 66efcef9cde9f20638c82e6db33f1d281e9f3eff /ext
parent: 7db113fad106559a1335fea48d622d12d0e32f55 (diff)
parent: c5eb924e9e43c59b564549e149b59ad9a4bee74a (diff)
download: php-git-269acaa363cab7de8705b060ba9b1e32322fb0f4.tar.gz
162 files changed, 259 insertions, 259 deletions
diff --git a/ext/date/tests/014.phpt b/ext/date/tests/014.phpt
index 02e9907674..5cc31aa93a 100644
--- a/ext/date/tests/014.phpt
+++ b/ext/date/tests/014.phpt
@@ -37,7 +37,7 @@ Warning: timezone_offset_get() expects exactly 2 parameters, 0 given in %s on li
 bool(false)
 int(0)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, instance of DateTime given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, instance of DateTime given in %s:%d
 Stack trace:
 #0 %s(%d): timezone_offset_get(Object(DateTime), Object(DateTimeZone))
 #1 {main}
diff --git a/ext/date/tests/DateTimeZone_construct_error.phpt b/ext/date/tests/DateTimeZone_construct_error.phpt
index 6ff900d82f..8c8b14f12c 100644
--- a/ext/date/tests/DateTimeZone_construct_error.phpt
+++ b/ext/date/tests/DateTimeZone_construct_error.phpt
@@ -17,7 +17,7 @@ $timezone = "GMT";
 $extra_arg = 99;
 try {
     new DateTimeZone($timezone, $extra_arg);
-} catch (TypeException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 
diff --git a/ext/date/tests/DateTimeZone_construct_variation1.phpt b/ext/date/tests/DateTimeZone_construct_variation1.phpt
index 96f5372611..d9625eedc0 100644
--- a/ext/date/tests/DateTimeZone_construct_variation1.phpt
+++ b/ext/date/tests/DateTimeZone_construct_variation1.phpt
@@ -97,7 +97,7 @@ foreach($inputs as $variation =>$timezone) {
       echo "\n-- $variation --\n";
       try {
       	var_dump( new DateTimezone($timezone) );
-      } catch (BaseException $e) {
+      } catch (Throwable $e) {
       	  $msg = $e->getMessage();
       	  echo "FAILED: " . $msg . "\n";
       }	
diff --git a/ext/date/tests/DateTime_construct_error.phpt b/ext/date/tests/DateTime_construct_error.phpt
index de42566961..d0a453fd9d 100644
--- a/ext/date/tests/DateTime_construct_error.phpt
+++ b/ext/date/tests/DateTime_construct_error.phpt
@@ -18,7 +18,7 @@ $timezone  = timezone_open("GMT");
 $extra_arg = 99;
 try {
     var_dump( new DateTime($time, $timezone, $extra_arg) );
-} catch (TypeException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 
diff --git a/ext/date/tests/DateTime_construct_variation1.phpt b/ext/date/tests/DateTime_construct_variation1.phpt
index 6f149ae207..8ff7f7e89c 100644
--- a/ext/date/tests/DateTime_construct_variation1.phpt
+++ b/ext/date/tests/DateTime_construct_variation1.phpt
@@ -102,14 +102,14 @@ foreach($inputs as $variation =>$time) {
       
       try {
       	var_dump( new DateTime($time) );
-      } catch (BaseException $e) {
+      } catch (Throwable $e) {
       	  $msg = $e->getMessage();
       	  echo "FAILED: " . $msg . "\n";
       }	
       
       try {
       	var_dump( new DateTime($time, $timezone) );
-      } catch (BaseException$e) {
+      } catch (Throwable $e) {
       	 $msg = $e->getMessage();
       	 echo "FAILED: " . $msg . "\n";
       }	
diff --git a/ext/date/tests/DateTime_construct_variation2.phpt b/ext/date/tests/DateTime_construct_variation2.phpt
index d134d8f6cf..e75e14d8e3 100644
--- a/ext/date/tests/DateTime_construct_variation2.phpt
+++ b/ext/date/tests/DateTime_construct_variation2.phpt
@@ -102,7 +102,7 @@ foreach($inputs as $variation =>$timezone) {
       
       try {
 			var_dump( new DateTime($time, $timezone) );
-      } catch (BaseException $e) {
+      } catch (Throwable $e) {
 			$msg = $e->getMessage();
 			echo "FAILED: " . $msg . "\n";
       }	
diff --git a/ext/date/tests/timezone_offset_get_error.phpt b/ext/date/tests/timezone_offset_get_error.phpt
index 653625dd34..7ce1ade30a 100644
--- a/ext/date/tests/timezone_offset_get_error.phpt
+++ b/ext/date/tests/timezone_offset_get_error.phpt
@@ -26,7 +26,7 @@ echo "*** Testing timezone_offset_get() : error conditions ***\n";
 echo "\n-- Testing timezone_offset_get() function with zero arguments --\n";
 try {
 	var_dump( timezone_offset_get() );
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	var_dump($ex->getMessage());
 	echo "\n";
 }
@@ -34,7 +34,7 @@ try {
 echo "\n-- Testing timezone_offset_get() function with less than expected no. of arguments --\n";
 try {
 	var_dump( timezone_offset_get($tz) );
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	var_dump($ex->getMessage());
 	echo "\n";
 }
@@ -43,7 +43,7 @@ echo "\n-- Testing timezone_offset_get() function with more than expected no. of
 $extra_arg = 99;
 try {
 	var_dump( timezone_offset_get($tz, $date, $extra_arg) );
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	var_dump($ex->getMessage());
 	echo "\n";
 }
@@ -52,21 +52,21 @@ echo "\n-- Testing timezone_offset_get() function with an invalid values for \$o
 $invalid_obj = new stdClass();
 try {
 	var_dump( timezone_offset_get($invalid_obj, $date) );
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	var_dump($ex->getMessage());
 	echo "\n";
 }
 $invalid_obj = 10;
 try {
 	var_dump( timezone_offset_get($invalid_obj, $date) );
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	var_dump($ex->getMessage());
 	echo "\n";
 }
 $invalid_obj = null;
 try {
 	var_dump( timezone_offset_get($invalid_obj, $date) );
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	var_dump($ex->getMessage());
 	echo "\n";
 }
@@ -75,21 +75,21 @@ echo "\n-- Testing timezone_offset_get() function with an invalid values for \$d
 $invalid_obj = new stdClass();
 try {
 	var_dump( timezone_offset_get($tz, $invalid_obj) );
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	var_dump($ex->getMessage());
 	echo "\n";
 }
 $invalid_obj = 10;
 try {
 	var_dump( timezone_offset_get($tz, $invalid_obj) );
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	var_dump($ex->getMessage());
 	echo "\n";
 }
 $invalid_obj = null;
 try {
 	var_dump( timezone_offset_get($tz, $invalid_obj) );
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	var_dump($ex->getMessage());
 	echo "\n";
 }
diff --git a/ext/date/tests/timezone_offset_get_variation1.phpt b/ext/date/tests/timezone_offset_get_variation1.phpt
index d2cfeedaaf..edeeb7fea7 100644
--- a/ext/date/tests/timezone_offset_get_variation1.phpt
+++ b/ext/date/tests/timezone_offset_get_variation1.phpt
@@ -109,7 +109,7 @@ foreach($inputs as $variation =>$object) {
     echo "\n-- $variation --\n";
 	try {
 		var_dump( timezone_offset_get($object, $datetime) );
-	} catch (EngineException $ex) {
+	} catch (Error $ex) {
 		echo $ex->getMessage()."\n";
 	}
 };
diff --git a/ext/date/tests/timezone_offset_get_variation2.phpt b/ext/date/tests/timezone_offset_get_variation2.phpt
index 8191e18ee7..2d007d5e70 100644
--- a/ext/date/tests/timezone_offset_get_variation2.phpt
+++ b/ext/date/tests/timezone_offset_get_variation2.phpt
@@ -109,7 +109,7 @@ foreach($inputs as $variation =>$datetime) {
     echo "\n-- $variation --\n";
     try {
 		var_dump( timezone_offset_get($object, $datetime) );
-	} catch (EngineException $ex) {
+	} catch (Error $ex) {
 		echo $ex->getMessage()."\n";
 	}
 };
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
diff --git a/ext/fileinfo/tests/bug61173.phpt b/ext/fileinfo/tests/bug61173.phpt
index 4b622c65ae..96eb3010e0 100644
--- a/ext/fileinfo/tests/bug61173.phpt
+++ b/ext/fileinfo/tests/bug61173.phpt
@@ -10,7 +10,7 @@ if (!class_exists('finfo'))
 try {
     $finfo = new finfo(1, '', false);
     var_dump($finfo);
-} catch (TypeException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 --EXPECTF--
diff --git a/ext/fileinfo/tests/finfo_open_error.phpt b/ext/fileinfo/tests/finfo_open_error.phpt
index 1f6f935247..511df600c1 100644
--- a/ext/fileinfo/tests/finfo_open_error.phpt
+++ b/ext/fileinfo/tests/finfo_open_error.phpt
@@ -22,7 +22,7 @@ var_dump( finfo_open( 'foobar' ) );
 
 try {
     var_dump( new finfo('foobar') );
-} catch (TypeException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 
diff --git a/ext/intl/tests/badargs.phpt b/ext/intl/tests/badargs.phpt
index 300ac2653e..d6ce48317b 100644
--- a/ext/intl/tests/badargs.phpt
+++ b/ext/intl/tests/badargs.phpt
@@ -18,7 +18,7 @@ foreach($funcs as $func) {
 			$res = $func($arg);
 		} catch (Exception $e) {
 			continue;
-		} catch (EngineException $e) {
+		} catch (Error $e) {
 			continue;
 		}
         if($res != false) {
diff --git a/ext/intl/tests/breakiter___construct.phpt b/ext/intl/tests/breakiter___construct.phpt
index 37303e583b..10089e28a6 100644
--- a/ext/intl/tests/breakiter___construct.phpt
+++ b/ext/intl/tests/breakiter___construct.phpt
@@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING);
 new IntlBreakIterator();
 --EXPECTF--
 
-Fatal error: Uncaught EngineException: Call to private IntlBreakIterator::__construct() from invalid context in %s:%d
+Fatal error: Uncaught Error: Call to private IntlBreakIterator::__construct() from invalid context in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/intl/tests/breakiter___construct_error.phpt b/ext/intl/tests/breakiter___construct_error.phpt
index 7e67fd7403..1e865cc9d9 100644
--- a/ext/intl/tests/breakiter___construct_error.phpt
+++ b/ext/intl/tests/breakiter___construct_error.phpt
@@ -19,17 +19,17 @@ try {
 }
 try {
 	var_dump(new IntlRuleBasedBreakIterator());
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	print_exception($e);
 }
 try {
 	var_dump(new IntlRuleBasedBreakIterator(1,2,3));
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	print_exception($e);
 }
 try {
 	var_dump(new IntlRuleBasedBreakIterator('[\p{Letter}\uFFFD]+;[:number:]+;', array()));
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	print_exception($e);
 }
 try {
diff --git a/ext/intl/tests/calendar_add_error.phpt b/ext/intl/tests/calendar_add_error.phpt
index b9e9cdce63..fc0584c61a 100644
--- a/ext/intl/tests/calendar_add_error.phpt
+++ b/ext/intl/tests/calendar_add_error.phpt
@@ -38,7 +38,7 @@ Warning: intlcal_add() expects exactly 3 parameters, 4 given in %s on line %d
 Warning: intlcal_add(): intlcal_add: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_add() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_add() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_add(1, 2, 3)
 #1 {main}
diff --git a/ext/intl/tests/calendar_before_after_error.phpt b/ext/intl/tests/calendar_before_after_error.phpt
index b5f3c746c1..938c7a5fb7 100644
--- a/ext/intl/tests/calendar_before_after_error.phpt
+++ b/ext/intl/tests/calendar_before_after_error.phpt
@@ -19,45 +19,45 @@ set_error_handler('eh');
 
 try {
 	var_dump($c->after());
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump($c->before());
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 
 try {
 	var_dump($c->after(1));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump($c->before(1));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 
 try{
 	var_dump($c->after($c, 1));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump($c->before($c, 1));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 
 try {
 	var_dump(intlcal_after($c));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump(intlcal_before($c));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 --EXPECT--
diff --git a/ext/intl/tests/calendar_clear_error.phpt b/ext/intl/tests/calendar_clear_error.phpt
index 13c6a5b51f..7e9c52b2a5 100644
--- a/ext/intl/tests/calendar_clear_error.phpt
+++ b/ext/intl/tests/calendar_clear_error.phpt
@@ -28,7 +28,7 @@ bool(false)
 Warning: intlcal_clear(): intlcal_clear: invalid field in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_clear() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_clear() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_clear(1, 2)
 #1 {main}
diff --git a/ext/intl/tests/calendar_equals_error.phpt b/ext/intl/tests/calendar_equals_error.phpt
index 0293bd7bcb..8465541c87 100644
--- a/ext/intl/tests/calendar_equals_error.phpt
+++ b/ext/intl/tests/calendar_equals_error.phpt
@@ -19,29 +19,29 @@ set_error_handler('eh');
 
 try {
 	var_dump($c->equals());
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump($c->equals(new stdclass));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump($c->equals(1, 2));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 
 
 try {
 	var_dump(intlcal_equals($c, array()));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump(intlcal_equals(1, $c));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 
diff --git a/ext/intl/tests/calendar_fieldDifference_error.phpt b/ext/intl/tests/calendar_fieldDifference_error.phpt
index beb81758be..f9d88d447b 100644
--- a/ext/intl/tests/calendar_fieldDifference_error.phpt
+++ b/ext/intl/tests/calendar_fieldDifference_error.phpt
@@ -39,7 +39,7 @@ Warning: intlcal_field_difference() expects exactly 3 parameters, 4 given in %s
 Warning: intlcal_field_difference(): intlcal_field_difference: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_field_difference() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_field_difference() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_field_difference(1, 0, 1)
 #1 {main}
diff --git a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
index 8ba0712e68..9d39666f06 100644
--- a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
+++ b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
@@ -41,7 +41,7 @@ Warning: intlcal_get_day_of_week_type() expects parameter 2 to be integer, strin
 Warning: intlcal_get_day_of_week_type(): intlcal_get_day_of_week_type: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_day_of_week_type() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_day_of_week_type() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_day_of_week_type(1, 1)
 #1 {main}
diff --git a/ext/intl/tests/calendar_getErrorCode_error.phpt b/ext/intl/tests/calendar_getErrorCode_error.phpt
index 23fa9d67c4..97b7d9c0c1 100644
--- a/ext/intl/tests/calendar_getErrorCode_error.phpt
+++ b/ext/intl/tests/calendar_getErrorCode_error.phpt
@@ -23,7 +23,7 @@ Warning: IntlCalendar::getErrorCode() expects exactly 0 parameters, 1 given in %
 Warning: IntlCalendar::getErrorCode(): intlcal_get_error_code: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_error_code() must be an instance of IntlCalendar, null given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_error_code() must be an instance of IntlCalendar, null given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_error_code(NULL)
 #1 {main}
diff --git a/ext/intl/tests/calendar_getErrorMessage_error.phpt b/ext/intl/tests/calendar_getErrorMessage_error.phpt
index 69329e6db4..5250bc064e 100644
--- a/ext/intl/tests/calendar_getErrorMessage_error.phpt
+++ b/ext/intl/tests/calendar_getErrorMessage_error.phpt
@@ -23,7 +23,7 @@ Warning: IntlCalendar::getErrorMessage() expects exactly 0 parameters, 1 given i
 Warning: IntlCalendar::getErrorMessage(): intlcal_get_error_message: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_error_message() must be an instance of IntlCalendar, null given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_error_message() must be an instance of IntlCalendar, null given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_error_message(NULL)
 #1 {main}
diff --git a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
index 13beb5348e..3bae010c4a 100644
--- a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
+++ b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
@@ -29,7 +29,7 @@ Warning: intlcal_get_first_day_of_week() expects exactly 1 parameter, 2 given in
 Warning: intlcal_get_first_day_of_week(): intlcal_get_first_day_of_week: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_first_day_of_week() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_first_day_of_week() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_first_day_of_week(1)
 #1 {main}
diff --git a/ext/intl/tests/calendar_getLocale_error.phpt b/ext/intl/tests/calendar_getLocale_error.phpt
index 8c7a886caa..47c62e3957 100644
--- a/ext/intl/tests/calendar_getLocale_error.phpt
+++ b/ext/intl/tests/calendar_getLocale_error.phpt
@@ -39,7 +39,7 @@ Warning: intlcal_get_locale() expects exactly 2 parameters, 1 given in %s on lin
 Warning: intlcal_get_locale(): intlcal_get_locale: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_locale() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_locale() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_locale(1)
 #1 {main}
diff --git a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
index 6ad098773e..216363bec3 100644
--- a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
+++ b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
@@ -29,7 +29,7 @@ Warning: intlcal_get_minimal_days_in_first_week() expects exactly 1 parameter, 2
 Warning: intlcal_get_minimal_days_in_first_week(): intlcal_get_minimal_days_in_first_week: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_minimal_days_in_first_week(1)
 #1 {main}
diff --git a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
index 403f6f7ebd..cb1ae4ea4b 100644
--- a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
+++ b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
@@ -44,7 +44,7 @@ Warning: intlcal_get_repeated_wall_time_option() expects exactly 1 parameter, 2
 Warning: intlcal_get_repeated_wall_time_option(): intlcal_get_repeated_wall_time_option: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_skipped_wall_time_option() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_skipped_wall_time_option() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_skipped_wall_time_option(1)
 #1 {main}
diff --git a/ext/intl/tests/calendar_getTimeZone_error.phpt b/ext/intl/tests/calendar_getTimeZone_error.phpt
index 1eb8e00f75..15c1a50455 100644
--- a/ext/intl/tests/calendar_getTimeZone_error.phpt
+++ b/ext/intl/tests/calendar_getTimeZone_error.phpt
@@ -29,7 +29,7 @@ Warning: intlcal_get_time_zone() expects exactly 1 parameter, 2 given in %s on l
 Warning: intlcal_get_time_zone(): intlcal_get_time_zone: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_time_zone() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_time_zone() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_time_zone(1)
 #1 {main}
diff --git a/ext/intl/tests/calendar_getTime_error.phpt b/ext/intl/tests/calendar_getTime_error.phpt
index ed2687377f..8c75ca5722 100644
--- a/ext/intl/tests/calendar_getTime_error.phpt
+++ b/ext/intl/tests/calendar_getTime_error.phpt
@@ -28,7 +28,7 @@ Warning: intlcal_get_time() expects exactly 1 parameter, 2 given in %s on line %
 Warning: intlcal_get_time(): intlcal_get_time: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_time() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_time() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_time(1)
 #1 {main}
diff --git a/ext/intl/tests/calendar_getType_error.phpt b/ext/intl/tests/calendar_getType_error.phpt
index e5333cb016..95499a60ac 100644
--- a/ext/intl/tests/calendar_getType_error.phpt
+++ b/ext/intl/tests/calendar_getType_error.phpt
@@ -29,7 +29,7 @@ Warning: intlcal_get_type() expects exactly 1 parameter, 2 given in %s on line %
 Warning: intlcal_get_type(): intlcal_get_type: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_type() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_type() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_type(1)
 #1 {main}
diff --git a/ext/intl/tests/calendar_getWeekendTransition_error.phpt b/ext/intl/tests/calendar_getWeekendTransition_error.phpt
index 210735b2a0..f77a60fc78 100644
--- a/ext/intl/tests/calendar_getWeekendTransition_error.phpt
+++ b/ext/intl/tests/calendar_getWeekendTransition_error.phpt
@@ -41,7 +41,7 @@ Warning: intlcal_get_weekend_transition() expects exactly 2 parameters, 1 given
 Warning: intlcal_get_weekend_transition(): intlcal_get_weekend_transition: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_weekend_transition() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_get_weekend_transition() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_get_weekend_transition(1, 1)
 #1 {main}
diff --git a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
index 0764fe267d..3d881a781d 100644
--- a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
+++ b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
@@ -34,22 +34,22 @@ set_error_handler('eh');
 
 try {
 	var_dump(intlcal_get_least_maximum(1, 1));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump(intlcal_get_maximum(1, 1));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump(intlcal_get_greatest_minimum(1, -1));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump(intlcal_get_minimum(1, -1));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 
diff --git a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
index e117f03a57..b29e8ed0cb 100644
--- a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
+++ b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
@@ -19,65 +19,65 @@ set_error_handler('eh');
 
 try {
 	var_dump(intlcal_get($c));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump(intlcal_get_actual_maximum($c));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump(intlcal_get_actual_minimum($c));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 
 try {
 	var_dump(intlcal_get($c, -1));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump(intlcal_get_actual_maximum($c, -1));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump(intlcal_get_actual_minimum($c, -1));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 
 try {
 	var_dump(intlcal_get($c, "s"));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump(intlcal_get_actual_maximum($c, "s"));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump(intlcal_get_actual_minimum($c, "s"));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 
 try {
 	var_dump(intlcal_get(1));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump(intlcal_get_actual_maximum(1));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump(intlcal_get_actual_minimum(1));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 --EXPECT--
diff --git a/ext/intl/tests/calendar_inDaylightTime_error.phpt b/ext/intl/tests/calendar_inDaylightTime_error.phpt
index 6d7ebcfeca..1de9e2a830 100644
--- a/ext/intl/tests/calendar_inDaylightTime_error.phpt
+++ b/ext/intl/tests/calendar_inDaylightTime_error.phpt
@@ -29,7 +29,7 @@ Warning: intlcal_in_daylight_time() expects exactly 1 parameter, 2 given in %s o
 Warning: intlcal_in_daylight_time(): intlcal_in_daylight_time: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_in_daylight_time() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_in_daylight_time() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_in_daylight_time(1)
 #1 {main}
diff --git a/ext/intl/tests/calendar_isEquivalentTo_error.phpt b/ext/intl/tests/calendar_isEquivalentTo_error.phpt
index 740b07b1fe..ac19e1dd90 100644
--- a/ext/intl/tests/calendar_isEquivalentTo_error.phpt
+++ b/ext/intl/tests/calendar_isEquivalentTo_error.phpt
@@ -19,33 +19,33 @@ set_error_handler('eh');
 
 try {
 	var_dump($c->isEquivalentTo(0));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump($c->isEquivalentTo($c, 1));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump($c->isEquivalentTo(1));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 
 try {
 	var_dump(intlcal_is_equivalent_to($c));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump(intlcal_is_equivalent_to($c, 1));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump(intlcal_is_equivalent_to(1, $c));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 
diff --git a/ext/intl/tests/calendar_isLenient_error.phpt b/ext/intl/tests/calendar_isLenient_error.phpt
index 7a9d9f109c..8cc8e969e7 100644
--- a/ext/intl/tests/calendar_isLenient_error.phpt
+++ b/ext/intl/tests/calendar_isLenient_error.phpt
@@ -29,7 +29,7 @@ Warning: intlcal_is_lenient() expects exactly 1 parameter, 2 given in %s on line
 Warning: intlcal_is_lenient(): intlcal_is_lenient: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_is_lenient() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_is_lenient() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_is_lenient(1)
 #1 {main}
diff --git a/ext/intl/tests/calendar_isSet_error.phpt b/ext/intl/tests/calendar_isSet_error.phpt
index c9497bea09..a8efa34218 100644
--- a/ext/intl/tests/calendar_isSet_error.phpt
+++ b/ext/intl/tests/calendar_isSet_error.phpt
@@ -39,7 +39,7 @@ Warning: intlcal_is_set() expects exactly 2 parameters, 1 given in %s on line %d
 Warning: intlcal_is_set(): intlcal_is_set: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_is_set() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_is_set() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_is_set(1, 2)
 #1 {main}
diff --git a/ext/intl/tests/calendar_isWeekend_error.phpt b/ext/intl/tests/calendar_isWeekend_error.phpt
index 0538fa95ca..8f723cc3c9 100644
--- a/ext/intl/tests/calendar_isWeekend_error.phpt
+++ b/ext/intl/tests/calendar_isWeekend_error.phpt
@@ -35,7 +35,7 @@ Warning: intlcal_is_weekend() expects parameter 2 to be float, string given in %
 Warning: intlcal_is_weekend(): intlcal_is_weekend: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_is_weekend() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_is_weekend() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_is_weekend(1)
 #1 {main}
diff --git a/ext/intl/tests/calendar_roll_error.phpt b/ext/intl/tests/calendar_roll_error.phpt
index a496089026..2b8c303cbb 100644
--- a/ext/intl/tests/calendar_roll_error.phpt
+++ b/ext/intl/tests/calendar_roll_error.phpt
@@ -34,7 +34,7 @@ bool(false)
 Warning: intlcal_roll(): intlcal_set: too many arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_roll() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_roll() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_roll(1, 2, 3)
 #1 {main}
diff --git a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
index 8d24a61d6b..466690dbee 100644
--- a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
+++ b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
@@ -37,7 +37,7 @@ bool(false)
 Warning: intlcal_set_first_day_of_week(): intlcal_set_first_day_of_week: invalid day of week in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_set_first_day_of_week() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_first_day_of_week() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_set_first_day_of_week(1, 2)
 #1 {main}
diff --git a/ext/intl/tests/calendar_setLenient_error.phpt b/ext/intl/tests/calendar_setLenient_error.phpt
index a1516b9c0e..9619dc564c 100644
--- a/ext/intl/tests/calendar_setLenient_error.phpt
+++ b/ext/intl/tests/calendar_setLenient_error.phpt
@@ -41,7 +41,7 @@ Warning: intlcal_set_lenient() expects parameter 2 to be boolean, array given in
 Warning: intlcal_set_lenient(): intlcal_set_lenient: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_set_lenient() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_lenient() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_set_lenient(1, false)
 #1 {main}
diff --git a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
index 406eebd356..ee88f6d630 100644
--- a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
+++ b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
@@ -36,7 +36,7 @@ bool(false)
 Warning: intlcal_set_minimal_days_in_first_week(): intlcal_set_minimal_days_in_first_week: invalid number of days; must be between 1 and 7 in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_set_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_set_minimal_days_in_first_week(1, 2)
 #1 {main}
diff --git a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
index fa26ef3491..27f6215d52 100644
--- a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
+++ b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
@@ -79,7 +79,7 @@ Warning: intlcal_set_repeated_wall_time_option() expects exactly 2 parameters, 1
 Warning: intlcal_set_repeated_wall_time_option(): intlcal_set_repeated_wall_time_option: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_set_repeated_wall_time_option() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_repeated_wall_time_option() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_set_repeated_wall_time_option(1, 1)
 #1 {main}
diff --git a/ext/intl/tests/calendar_setTimeZone_error.phpt b/ext/intl/tests/calendar_setTimeZone_error.phpt
index 6230efad8a..410dc86c60 100644
--- a/ext/intl/tests/calendar_setTimeZone_error.phpt
+++ b/ext/intl/tests/calendar_setTimeZone_error.phpt
@@ -21,23 +21,23 @@ set_error_handler('eh');
 
 try {
 	var_dump($c->setTimeZone($gmt, 2));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try {
 	var_dump($c->setTimeZone());
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 
 try{
 	var_dump(intlcal_set_time_zone($c, 1, 2));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 try{
 	var_dump(intlcal_set_time_zone(1, $gmt));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
 }
 
diff --git a/ext/intl/tests/calendar_setTime_error.phpt b/ext/intl/tests/calendar_setTime_error.phpt
index e086d77470..00bb7eb91d 100644
--- a/ext/intl/tests/calendar_setTime_error.phpt
+++ b/ext/intl/tests/calendar_setTime_error.phpt
@@ -34,7 +34,7 @@ Warning: intlcal_set_time() expects exactly 2 parameters, 3 given in %s on line
 Warning: intlcal_set_time(): intlcal_set_time: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_set_time() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set_time() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_set_time(1)
 #1 {main}
diff --git a/ext/intl/tests/calendar_set_error.phpt b/ext/intl/tests/calendar_set_error.phpt
index ecbc822e55..c232b5640a 100644
--- a/ext/intl/tests/calendar_set_error.phpt
+++ b/ext/intl/tests/calendar_set_error.phpt
@@ -38,7 +38,7 @@ bool(false)
 Warning: intlcal_set(): intlcal_set: invalid field in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_set() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_set() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_set(1, 2, 3)
 #1 {main}
diff --git a/ext/intl/tests/calendar_toDateTime_error.phpt b/ext/intl/tests/calendar_toDateTime_error.phpt
index a4b7bc3807..3d3ada22b9 100644
--- a/ext/intl/tests/calendar_toDateTime_error.phpt
+++ b/ext/intl/tests/calendar_toDateTime_error.phpt
@@ -38,7 +38,7 @@ bool(false)
 Warning: IntlCalendar::toDateTime(): intlcal_to_date_time: DateTimeZone constructor threw exception in %s on line %d
 string(77) "exception: DateTimeZone::__construct(): Unknown or bad timezone (Etc/Unknown)"
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_to_date_time() must be an instance of IntlCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlcal_to_date_time() must be an instance of IntlCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlcal_to_date_time(3)
 #1 {main}
diff --git a/ext/intl/tests/formatter_fail.phpt b/ext/intl/tests/formatter_fail.phpt
index f7761173dd..72335e2022 100644
--- a/ext/intl/tests/formatter_fail.phpt
+++ b/ext/intl/tests/formatter_fail.phpt
@@ -21,7 +21,7 @@ function crt($t, $l, $s) {
 		case $t == "O":
 			try {
 				return new NumberFormatter($l, $s);
-			} catch (BaseException $e) {
+			} catch (Throwable $e) {
 				print_exception($e);
 				return null;
 			}
@@ -45,7 +45,7 @@ $args = array(
 
 try {
 	$fmt = new NumberFormatter();
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	print_exception($e);
 	$fmt = null;
 }
@@ -66,7 +66,7 @@ foreach($args as $arg) {
 
 ?>
 --EXPECTF--
-TypeException: NumberFormatter::__construct() expects at least 2 parameters, 0 given in %s on line %d
+TypeError: NumberFormatter::__construct() expects at least 2 parameters, 0 given in %s on line %d
 'numfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 
 Warning: numfmt_create() expects at least 2 parameters, 0 given in %s on line %d
@@ -80,7 +80,7 @@ IntlException: Constructor failed in %sformatter_fail.php on line %d
 'numfmt_create: number formatter creation failed: U_UNSUPPORTED_ERROR'
 'numfmt_create: number formatter creation failed: U_UNSUPPORTED_ERROR'
 
-TypeException: NumberFormatter::__construct() expects parameter 1 to be string, array given in %s on line %d
+TypeError: NumberFormatter::__construct() expects parameter 1 to be string, array given in %s on line %d
 'numfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 
 Warning: NumberFormatter::create() expects parameter 1 to be string, array given in %s on line %d
diff --git a/ext/intl/tests/gregoriancalendar___construct_error.phpt b/ext/intl/tests/gregoriancalendar___construct_error.phpt
index 7383bdee88..ccc87d9703 100644
--- a/ext/intl/tests/gregoriancalendar___construct_error.phpt
+++ b/ext/intl/tests/gregoriancalendar___construct_error.phpt
@@ -22,7 +22,7 @@ try {
 }
 try {
 	var_dump(new IntlGregorianCalendar(1,2,3,4,NULL,array()));
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	print_exception($e);
 }
 --EXPECTF--
diff --git a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
index 59d74aca1e..dd37788dd1 100644
--- a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
@@ -27,7 +27,7 @@ Warning: intlgregcal_get_gregorian_change() expects exactly 1 parameter, 2 given
 Warning: intlgregcal_get_gregorian_change(): intlgregcal_get_gregorian_change: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlgregcal_get_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlgregcal_get_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlgregcal_get_gregorian_change(1)
 #1 {main}
diff --git a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
index 04b047dd20..6c4803c68c 100644
--- a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
@@ -45,7 +45,7 @@ Warning: intlgregcal_is_leap_year() expects exactly 2 parameters, 1 given in %s
 Warning: intlgregcal_is_leap_year(): intlgregcal_is_leap_year: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlgregcal_is_leap_year() must be an instance of IntlGregorianCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlgregcal_is_leap_year() must be an instance of IntlGregorianCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlgregcal_is_leap_year(1, 2)
 #1 {main}
diff --git a/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt b/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt
index df74807ca8..f45672c178 100644
--- a/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt
@@ -39,7 +39,7 @@ Warning: intlgregcal_set_gregorian_change() expects exactly 2 parameters, 1 give
 Warning: intlgregcal_set_gregorian_change(): intlgregcal_set_gregorian_change: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intlgregcal_set_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intlgregcal_set_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intlgregcal_set_gregorian_change(1, 4)
 #1 {main}
diff --git a/ext/intl/tests/msgfmt_fail.phpt b/ext/intl/tests/msgfmt_fail.phpt
index d7ca83d442..daeaa8f677 100644
--- a/ext/intl/tests/msgfmt_fail.phpt
+++ b/ext/intl/tests/msgfmt_fail.phpt
@@ -22,7 +22,7 @@ function crt($t, $l, $s) {
 		case $t == "O":
 			try {
 				return new MessageFormatter($l, $s);
-			} catch (BaseException $e) {
+			} catch (Throwable $e) {
 				print_exception($e);
 				return null;
 			}
@@ -47,7 +47,7 @@ $args = array(
 
 try {
 	$fmt = new MessageFormatter();
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	print_exception($e);
 	$fmt = null;
 }
@@ -58,7 +58,7 @@ $fmt = MessageFormatter::create();
 err($fmt);
 try {
 	$fmt = new MessageFormatter('en');
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	print_exception($e);
 	$fmt = null;
 }
@@ -79,7 +79,7 @@ foreach($args as $arg) {
 
 ?>
 --EXPECTF--
-TypeException: MessageFormatter::__construct() expects exactly 2 parameters, 0 given in %s on line %d
+TypeError: MessageFormatter::__construct() expects exactly 2 parameters, 0 given in %s on line %d
 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 
 Warning: msgfmt_create() expects exactly 2 parameters, 0 given in %s on line %d
@@ -88,7 +88,7 @@ Warning: msgfmt_create() expects exactly 2 parameters, 0 given in %s on line %d
 Warning: MessageFormatter::create() expects exactly 2 parameters, 0 given in %s on line %d
 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 
-TypeException: MessageFormatter::__construct() expects exactly 2 parameters, 1 given in %s on line %d
+TypeError: MessageFormatter::__construct() expects exactly 2 parameters, 1 given in %s on line %d
 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 
 Warning: msgfmt_create() expects exactly 2 parameters, 1 given in %s on line %d
@@ -107,7 +107,7 @@ IntlException: Constructor failed in %smsgfmt_fail2.php on line %d
 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR'
 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR'
 
-TypeException: MessageFormatter::__construct() expects parameter 1 to be string, array given in %s on line %d
+TypeError: MessageFormatter::__construct() expects parameter 1 to be string, array given in %s on line %d
 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 
 Warning: MessageFormatter::create() expects parameter 1 to be string, array given in %s on line %d
diff --git a/ext/intl/tests/msgfmt_fail2.phpt b/ext/intl/tests/msgfmt_fail2.phpt
index 6e34bfde68..5dcd09ccc8 100644
--- a/ext/intl/tests/msgfmt_fail2.phpt
+++ b/ext/intl/tests/msgfmt_fail2.phpt
@@ -22,7 +22,7 @@ function crt($t, $l, $s) {
 		case $t == "O":
 			try {
 				return new MessageFormatter($l, $s);
-			} catch (BaseException $e) {
+			} catch (Throwable $e) {
 				print_exception($e);
 				return null;
 			}
@@ -47,7 +47,7 @@ $args = array(
 
 try {
 	$fmt = new MessageFormatter();
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	print_exception($e);
 	$fmt = null;
 }
@@ -58,7 +58,7 @@ $fmt = MessageFormatter::create();
 err($fmt);
 try {
 	$fmt = new MessageFormatter('en');
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	print_exception($e);
 	$fmt = null;
 }
@@ -79,7 +79,7 @@ foreach($args as $arg) {
 
 ?>
 --EXPECTF--
-TypeException: MessageFormatter::__construct() expects exactly 2 parameters, 0 given in %s on line %d
+TypeError: MessageFormatter::__construct() expects exactly 2 parameters, 0 given in %s on line %d
 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 
 Warning: msgfmt_create() expects exactly 2 parameters, 0 given in %s on line %d
@@ -88,7 +88,7 @@ Warning: msgfmt_create() expects exactly 2 parameters, 0 given in %s on line %d
 Warning: MessageFormatter::create() expects exactly 2 parameters, 0 given in %s on line %d
 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 
-TypeException: MessageFormatter::__construct() expects exactly 2 parameters, 1 given in %s on line %d
+TypeError: MessageFormatter::__construct() expects exactly 2 parameters, 1 given in %s on line %d
 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 
 Warning: msgfmt_create() expects exactly 2 parameters, 1 given in %s on line %d
@@ -107,7 +107,7 @@ IntlException: Constructor failed in %smsgfmt_fail2.php on line %d
 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR'
 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR'
 
-TypeException: MessageFormatter::__construct() expects parameter 1 to be string, array given in %s on line %d
+TypeError: MessageFormatter::__construct() expects parameter 1 to be string, array given in %s on line %d
 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR'
 
 Warning: MessageFormatter::create() expects parameter 1 to be string, array given in %s on line %d
diff --git a/ext/intl/tests/timezone_getCanonicalID_error.phpt b/ext/intl/tests/timezone_getCanonicalID_error.phpt
index b0a45bceaf..e268e216a8 100644
--- a/ext/intl/tests/timezone_getCanonicalID_error.phpt
+++ b/ext/intl/tests/timezone_getCanonicalID_error.phpt
@@ -29,7 +29,7 @@ bool(false)
 Warning: IntlTimeZone::getCanonicalID(): intltz_get_canonical_id: could not convert time zone id to UTF-16 in %s on line %d
 bool(false)
 
-Fatal error: Uncaught EngineException: Cannot pass parameter 2 by reference in %s:%d
+Fatal error: Uncaught Error: Cannot pass parameter 2 by reference in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/intl/tests/timezone_getDSTSavings_error.phpt b/ext/intl/tests/timezone_getDSTSavings_error.phpt
index 5d9a1a2fc3..26526dc72e 100644
--- a/ext/intl/tests/timezone_getDSTSavings_error.phpt
+++ b/ext/intl/tests/timezone_getDSTSavings_error.phpt
@@ -20,7 +20,7 @@ Warning: IntlTimeZone::getDSTSavings() expects exactly 0 parameters, 1 given in
 Warning: IntlTimeZone::getDSTSavings(): intltz_get_dst_savings: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intltz_get_dst_savings() must be an instance of IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intltz_get_dst_savings() must be an instance of IntlTimeZone, null given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_get_dst_savings(NULL)
 #1 {main}
diff --git a/ext/intl/tests/timezone_getDisplayName_error.phpt b/ext/intl/tests/timezone_getDisplayName_error.phpt
index 89e77b5614..4089c42e3c 100644
--- a/ext/intl/tests/timezone_getDisplayName_error.phpt
+++ b/ext/intl/tests/timezone_getDisplayName_error.phpt
@@ -42,7 +42,7 @@ Warning: IntlTimeZone::getDisplayName() expects at most 3 parameters, 4 given in
 Warning: IntlTimeZone::getDisplayName(): intltz_get_display_name: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intltz_get_display_name() must be an instance of IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intltz_get_display_name() must be an instance of IntlTimeZone, null given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_get_display_name(NULL, 1, false, 'pt_PT')
 #1 {main}
diff --git a/ext/intl/tests/timezone_getErrorCode_error.phpt b/ext/intl/tests/timezone_getErrorCode_error.phpt
index 5d5f4d74a3..a6d704c035 100644
--- a/ext/intl/tests/timezone_getErrorCode_error.phpt
+++ b/ext/intl/tests/timezone_getErrorCode_error.phpt
@@ -20,7 +20,7 @@ Warning: IntlTimeZone::getErrorCode() expects exactly 0 parameters, 1 given in %
 Warning: IntlTimeZone::getErrorCode(): intltz_get_error_code: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intltz_get_error_code() must be an instance of IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intltz_get_error_code() must be an instance of IntlTimeZone, null given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_get_error_code(NULL)
 #1 {main}
diff --git a/ext/intl/tests/timezone_getErrorMessage_error.phpt b/ext/intl/tests/timezone_getErrorMessage_error.phpt
index 9a71ea4aac..2f7cfcfe2a 100644
--- a/ext/intl/tests/timezone_getErrorMessage_error.phpt
+++ b/ext/intl/tests/timezone_getErrorMessage_error.phpt
@@ -20,7 +20,7 @@ Warning: IntlTimeZone::getErrorMessage() expects exactly 0 parameters, 1 given i
 Warning: IntlTimeZone::getErrorMessage(): intltz_get_error_message: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intltz_get_error_message() must be an instance of IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intltz_get_error_message() must be an instance of IntlTimeZone, null given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_get_error_message(NULL)
 #1 {main}
diff --git a/ext/intl/tests/timezone_getID_error.phpt b/ext/intl/tests/timezone_getID_error.phpt
index 36932e1f8d..a08c506cee 100644
--- a/ext/intl/tests/timezone_getID_error.phpt
+++ b/ext/intl/tests/timezone_getID_error.phpt
@@ -20,7 +20,7 @@ Warning: IntlTimeZone::getID() expects exactly 0 parameters, 1 given in %s on li
 Warning: IntlTimeZone::getID(): intltz_get_id: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intltz_get_id() must be an instance of IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intltz_get_id() must be an instance of IntlTimeZone, null given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_get_id(NULL)
 #1 {main}
diff --git a/ext/intl/tests/timezone_getOffset_error.phpt b/ext/intl/tests/timezone_getOffset_error.phpt
index d87c2aab32..632fa5e85a 100644
--- a/ext/intl/tests/timezone_getOffset_error.phpt
+++ b/ext/intl/tests/timezone_getOffset_error.phpt
@@ -30,7 +30,7 @@ Warning: IntlTimeZone::getOffset() expects exactly 4 parameters, 5 given in %s o
 Warning: IntlTimeZone::getOffset(): intltz_get_offset: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intltz_get_offset() must be an instance of IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intltz_get_offset() must be an instance of IntlTimeZone, null given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_get_offset(NULL, %d, false, NULL, NULL)
 #1 {main}
diff --git a/ext/intl/tests/timezone_getRawOffset_error.phpt b/ext/intl/tests/timezone_getRawOffset_error.phpt
index 80f8ce01d2..1015ef4ddc 100644
--- a/ext/intl/tests/timezone_getRawOffset_error.phpt
+++ b/ext/intl/tests/timezone_getRawOffset_error.phpt
@@ -20,7 +20,7 @@ Warning: IntlTimeZone::getRawOffset() expects exactly 0 parameters, 1 given in %
 Warning: IntlTimeZone::getRawOffset(): intltz_get_raw_offset: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intltz_get_raw_offset() must be an instance of IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intltz_get_raw_offset() must be an instance of IntlTimeZone, null given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_get_raw_offset(NULL)
 #1 {main}
diff --git a/ext/intl/tests/timezone_hasSameRules_error.phpt b/ext/intl/tests/timezone_hasSameRules_error.phpt
index d3c25661e3..5fb5bdde7a 100644
--- a/ext/intl/tests/timezone_hasSameRules_error.phpt
+++ b/ext/intl/tests/timezone_hasSameRules_error.phpt
@@ -18,14 +18,14 @@ set_error_handler("error_handler");
 $tz = IntlTimeZone::createTimeZone('Europe/Lisbon');
 try {
 	var_dump($tz->hasSameRules('foo'));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	var_dump($ex->getCode(), $ex->getMessage());
 	echo "\n";
 }
 
 try {
 	var_dump(intltz_has_same_rules(null, $tz));
-} catch (EngineException $ex) {
+} catch (Error $ex) {
 	var_dump($ex->getCode(), $ex->getMessage());
 	echo "\n";
 }
diff --git a/ext/intl/tests/timezone_toDateTimeZone_error.phpt b/ext/intl/tests/timezone_toDateTimeZone_error.phpt
index d0a9e73117..ecc5e2bef8 100644
--- a/ext/intl/tests/timezone_toDateTimeZone_error.phpt
+++ b/ext/intl/tests/timezone_toDateTimeZone_error.phpt
@@ -35,7 +35,7 @@ Warning: intltz_to_date_time_zone() expects exactly 1 parameter, 0 given in %s o
 Warning: intltz_to_date_time_zone(): intltz_to_date_time_zone: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intltz_to_date_time_zone() must be an instance of IntlTimeZone, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intltz_to_date_time_zone() must be an instance of IntlTimeZone, integer given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_to_date_time_zone(1)
 #1 {main}
diff --git a/ext/intl/tests/timezone_useDaylightTime_error.phpt b/ext/intl/tests/timezone_useDaylightTime_error.phpt
index ab63d7a428..d3f9471671 100644
--- a/ext/intl/tests/timezone_useDaylightTime_error.phpt
+++ b/ext/intl/tests/timezone_useDaylightTime_error.phpt
@@ -19,7 +19,7 @@ Warning: IntlTimeZone::useDaylightTime() expects exactly 0 parameters, 1 given i
 Warning: IntlTimeZone::useDaylightTime(): intltz_use_daylight_time: bad arguments in %s on line %d
 bool(false)
 
-Fatal error: Uncaught TypeException: Argument 1 passed to intltz_use_daylight_time() must be an instance of IntlTimeZone, null given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to intltz_use_daylight_time() must be an instance of IntlTimeZone, null given in %s:%d
 Stack trace:
 #0 %s(%d): intltz_use_daylight_time(NULL)
 #1 {main}
diff --git a/ext/intl/tests/transliterator_create_inverse_error.phpt b/ext/intl/tests/transliterator_create_inverse_error.phpt
index bebb3c44c6..ca3de096da 100644
--- a/ext/intl/tests/transliterator_create_inverse_error.phpt
+++ b/ext/intl/tests/transliterator_create_inverse_error.phpt
@@ -18,7 +18,7 @@ Warning: Transliterator::createInverse() expects exactly 0 parameters, 1 given i
 
 Warning: Transliterator::createInverse(): transliterator_create_inverse: bad arguments in %s on line %d
 
-Fatal error: Uncaught TypeException: Argument 1 passed to transliterator_create_inverse() must be an instance of Transliterator, string given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to transliterator_create_inverse() must be an instance of Transliterator, string given in %s:%d
 Stack trace:
 #0 %s(%d): transliterator_create_inverse('jj')
 #1 {main}
diff --git a/ext/intl/tests/transliterator_get_error_code_error.phpt b/ext/intl/tests/transliterator_get_error_code_error.phpt
index f2a0c7dabc..d65fea9904 100644
--- a/ext/intl/tests/transliterator_get_error_code_error.phpt
+++ b/ext/intl/tests/transliterator_get_error_code_error.phpt
@@ -21,7 +21,7 @@ Warning: Transliterator::getErrorCode() expects exactly 0 parameters, 1 given in
 Warning: Transliterator::getErrorCode(): transliterator_get_error_code: unable to parse input params in %s on line %d
 
 
-Fatal error: Uncaught TypeException: Argument 1 passed to transliterator_get_error_code() must be an instance of Transliterator, array given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to transliterator_get_error_code() must be an instance of Transliterator, array given in %s:%d
 Stack trace:
 #0 %s(%d): transliterator_get_error_code(Array)
 #1 {main}
diff --git a/ext/intl/tests/transliterator_get_error_message_error.phpt b/ext/intl/tests/transliterator_get_error_message_error.phpt
index 8f8f0be9f9..a6129ea271 100644
--- a/ext/intl/tests/transliterator_get_error_message_error.phpt
+++ b/ext/intl/tests/transliterator_get_error_message_error.phpt
@@ -21,7 +21,7 @@ Warning: Transliterator::getErrorMessage() expects exactly 0 parameters, 1 given
 Warning: Transliterator::getErrorMessage(): transliterator_get_error_message: unable to parse input params in %s on line %d
 
 
-Fatal error: Uncaught TypeException: Argument 1 passed to transliterator_get_error_message() must be an instance of Transliterator, array given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to transliterator_get_error_message() must be an instance of Transliterator, array given in %s:%d
 Stack trace:
 #0 %s(%d): transliterator_get_error_message(Array)
 #1 {main}
diff --git a/ext/mysqli/tests/bug33491.phpt b/ext/mysqli/tests/bug33491.phpt
index ff9518f220..6500241760 100644
--- a/ext/mysqli/tests/bug33491.phpt
+++ b/ext/mysqli/tests/bug33491.phpt
@@ -26,7 +26,7 @@ $DB->query_single('SELECT DATE()');
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught EngineException: Call to a member function fetch_row() on boolean in %sbug33491.php:%d
+Fatal error: Uncaught Error: Call to a member function fetch_row() on boolean in %sbug33491.php:%d
 Stack trace:
 #0 %s(%d): DB->query_single('SELECT DATE()')
 #1 {main}
diff --git a/ext/mysqli/tests/bug38003.phpt b/ext/mysqli/tests/bug38003.phpt
index 7158cec30a..a5f1a23bb5 100644
--- a/ext/mysqli/tests/bug38003.phpt
+++ b/ext/mysqli/tests/bug38003.phpt
@@ -17,7 +17,7 @@ $DB = new DB();
 echo "Done\n";
 ?>
 --EXPECTF--	
-Fatal error: Uncaught EngineException: Call to private DB::__construct() from invalid context in %s:%d
+Fatal error: Uncaught Error: Call to private DB::__construct() from invalid context in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_driver_unclonable.phpt b/ext/mysqli/tests/mysqli_driver_unclonable.phpt
index 316e351dc4..e761d06532 100644
--- a/ext/mysqli/tests/mysqli_driver_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_driver_unclonable.phpt
@@ -10,7 +10,7 @@ Trying to clone mysqli_driver object
 	print "done!";
 ?>
 --EXPECTF--
-Fatal error: Uncaught EngineException: Trying to clone an uncloneable object of class mysqli_driver in %s:%d
+Fatal error: Uncaught Error: Trying to clone an uncloneable object of class mysqli_driver in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
 \ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_fetch_object.phpt b/ext/mysqli/tests/mysqli_fetch_object.phpt
index 25457346d7..11dd0a5a4f 100644
--- a/ext/mysqli/tests/mysqli_fetch_object.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object.phpt
@@ -101,7 +101,7 @@ require_once('skipifconnectfailure.inc');
 	try {
 		if (false !== ($obj = @mysqli_fetch_object($res, 'mysqli_fetch_object_construct', 'a')))
 			printf("[011] Should have failed\n");
-	} catch (EngineException $e) {
+	} catch (Error $e) {
 		handle_catchable_fatal($e->getCode(), $e->getMessage(), $e->getFile(), $e->getLine());
 	}
 
diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
index 52941ad6b1..3a047a50fc 100644
--- a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
@@ -62,7 +62,7 @@ Exception: Class mysqli_fetch_object_test does not have a constructor hence you
 
 Fatal error with PHP (but no exception!):
 
-Fatal error: Uncaught EngineException: Call to undefined method mysqli_fetch_object_test::mysqli_fetch_object_test() in %s:%d
+Fatal error: Uncaught Error: Call to undefined method mysqli_fetch_object_test::mysqli_fetch_object_test() in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
index b5ebd110a4..2b3f76c993 100644
--- a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
@@ -34,7 +34,7 @@ require_once('skipifconnectfailure.inc');
 	try {
 		if (!is_null($tmp = @$res->fetch_object($link, $link)))
 			printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-	} catch (EngineException $e) {
+	} catch (Error $e) {
 		handle_catchable_fatal($e->getCode(), $e->getMessage(), $e->getFile(), $e->getLine());
 	}
 
@@ -42,7 +42,7 @@ require_once('skipifconnectfailure.inc');
 	try {
 		if (!is_null($tmp = @$res->fetch_object($link, $link, $link)))
 			printf("[006] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-	} catch (EngineException $e) {
+	} catch (Error $e) {
 		handle_catchable_fatal($e->getCode(), $e->getMessage(), $e->getFile(), $e->getLine());
 	}
 
@@ -84,7 +84,7 @@ require_once('skipifconnectfailure.inc');
 			printf("[009] Object seems wrong. [%d] %s\n", $mysqli->errno, $mysqli->error);
 			var_dump($obj);
 		}
-	} catch (EngineException $e) {
+	} catch (Error $e) {
 		handle_catchable_fatal($e->getCode(), $e->getMessage(), $e->getFile(), $e->getLine());
 		mysqli_fetch_object($res);
 	}
diff --git a/ext/mysqli/tests/mysqli_result_unclonable.phpt b/ext/mysqli/tests/mysqli_result_unclonable.phpt
index d409ba3bbf..6164197a6c 100644
--- a/ext/mysqli/tests/mysqli_result_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_result_unclonable.phpt
@@ -21,7 +21,7 @@ require_once('skipifconnectfailure.inc');
 	print "done!";
 ?>
 --EXPECTF--
-Fatal error: Uncaught EngineException: Trying to clone an uncloneable object of class mysqli_result in %s:%d
+Fatal error: Uncaught Error: Trying to clone an uncloneable object of class mysqli_result in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
 \ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
index b2d7dead7a..6576c15d90 100644
--- a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
@@ -22,7 +22,7 @@ require_once('skipifconnectfailure.inc');
 	print "done!";
 ?>
 --EXPECTF--
-Fatal error: Uncaught EngineException: Trying to clone an uncloneable object of class mysqli_stmt in %s:%d
+Fatal error: Uncaught Error: Trying to clone an uncloneable object of class mysqli_stmt in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
 \ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_unclonable.phpt b/ext/mysqli/tests/mysqli_unclonable.phpt
index 2ce91584aa..f4471bf831 100644
--- a/ext/mysqli/tests/mysqli_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_unclonable.phpt
@@ -20,7 +20,7 @@ require_once('skipifconnectfailure.inc');
 	print "done!";
 ?>
 --EXPECTF--
-Fatal error: Uncaught EngineException: Trying to clone an uncloneable object of class mysqli in %s:%d
+Fatal error: Uncaught Error: Trying to clone an uncloneable object of class mysqli in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
 \ No newline at end of file
diff --git a/ext/opcache/tests/optimize_func_calls.phpt b/ext/opcache/tests/optimize_func_calls.phpt
index 3f795f5fc6..eee21b557c 100644
--- a/ext/opcache/tests/optimize_func_calls.phpt
+++ b/ext/opcache/tests/optimize_func_calls.phpt
@@ -127,7 +127,7 @@ Array
 string(7) "changed"
 string(7) "changed"
 
-Fatal error: Uncaught EngineException: Cannot pass parameter 1 by reference in %soptimize_func_calls.php:%d
+Fatal error: Uncaught Error: Cannot pass parameter 1 by reference in %soptimize_func_calls.php:%d
 Stack trace:
 #0 {main}
   thrown in %soptimize_func_calls.php on line %d
diff --git a/ext/pdo/tests/bug47769.phpt b/ext/pdo/tests/bug47769.phpt
index 12a5e00d11..b0b38325d1 100644
--- a/ext/pdo/tests/bug47769.phpt
+++ b/ext/pdo/tests/bug47769.phpt
@@ -34,7 +34,7 @@ this is a protected method.
 this is a private method.
 foo
 
-Fatal error: Uncaught EngineException: Call to protected method test::isProtected() from context '' in %s:%d
+Fatal error: Uncaught Error: Call to protected method test::isProtected() from context '' in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/pdo/tests/pdo_025.phpt b/ext/pdo/tests/pdo_025.phpt
index 5083b84708..de6f0ad841 100644
--- a/ext/pdo/tests/pdo_025.phpt
+++ b/ext/pdo/tests/pdo_025.phpt
@@ -110,7 +110,7 @@ object(Test)#%d (3) {
 }
 ===FAIL===
 
-Fatal error: Uncaught EngineException: Cannot access protected property Fail::$id in %spdo_025.php:%d
+Fatal error: Uncaught Error: Cannot access protected property Fail::$id in %spdo_025.php:%d
 Stack trace:
 #0 {main}
   thrown in %spdo_025.php on line %d
diff --git a/ext/pdo/tests/pdo_037.phpt b/ext/pdo/tests/pdo_037.phpt
index 3d9bc59dd0..fb4c5e1e83 100644
--- a/ext/pdo/tests/pdo_037.phpt
+++ b/ext/pdo/tests/pdo_037.phpt
@@ -16,7 +16,7 @@ var_dump($obj->foo());
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught EngineException: Call to undefined method MyStatement::foo() in %s:%d
+Fatal error: Uncaught Error: Call to undefined method MyStatement::foo() in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/pdo_mysql/tests/bug_37445.phpt b/ext/pdo_mysql/tests/bug_37445.phpt
index 241c3f84e8..c9400717b4 100644
--- a/ext/pdo_mysql/tests/bug_37445.phpt
+++ b/ext/pdo_mysql/tests/bug_37445.phpt
@@ -17,7 +17,7 @@ $stmt = $db->prepare("SELECT 1");
 $stmt->bindParam(':a', 'b');
 ?>
 --EXPECTF--
-Fatal error: Uncaught EngineException: Cannot pass parameter 2 by reference in %sbug_37445.php:%d
+Fatal error: Uncaught Error: Cannot pass parameter 2 by reference in %sbug_37445.php:%d
 Stack trace:
 #0 {main}
   thrown in %sbug_37445.php on line %d
diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
index f0048ff305..219678c671 100644
--- a/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
@@ -31,7 +31,7 @@ MySQLPDOTest::skip();
 	    try {
 			if (NULL !== ($db = @new PDO()))
 				printf("[001] Too few parameters\n");
-		} catch (TypeException $ex) {
+		} catch (TypeError $ex) {
 		}
 
 		print tryandcatch(2, '$db = new PDO(chr(0));');
diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
index 9a64f59fe2..62051d7ae2 100644
--- a/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
@@ -70,7 +70,7 @@ MySQLPDOTest::skip();
 		try {
 			if (NULL !== ($db = @new PDO($dsn, $user, $pass, 'wrong type')))
 				printf("[001] Expecting NULL got %s/%s\n", gettype($db), $db);
-		} catch (TypeException $e) {
+		} catch (TypeError $e) {
 		}
 
 		if (!is_object($db = new PDO($dsn, $user, $pass, array())))
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
index b31ad352b4..fb336ba627 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
@@ -152,7 +152,7 @@ array(1) {
   }
 }
 
-Fatal error: Uncaught EngineException: Cannot instantiate abstract class mystatement6 in %s:%d
+Fatal error: Uncaught Error: Cannot instantiate abstract class mystatement6 in %s:%d
 Stack trace:
 #0 %s(%d): PDO->query('SELECT id, labe...')
 #1 {main}
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt
index 2076723344..140359afc1 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt
@@ -93,7 +93,7 @@ array(1) {
 
 Warning: PDO::prepare(): SQLSTATE[42S22]: Column not found: 1054 Unknown column 'unknown_column' in 'field list' in %s on line %d
 
-Fatal error: Uncaught EngineException: Call to a member function execute() on boolean in %s:%d
+Fatal error: Uncaught Error: Call to a member function execute() on boolean in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt
index 66ee0eedc9..ad710dcc15 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt
@@ -36,7 +36,7 @@ Warning: PDO::prepare(): SQLSTATE[HY093]: Invalid parameter number: mixed named
 
 Warning: PDO::prepare(): SQLSTATE[HY093]: Invalid parameter number in %s on line %d
 
-Fatal error: Uncaught EngineException: Call to a member function execute() on boolean in %s:%d
+Fatal error: Uncaught Error: Call to a member function execute() on boolean in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
index 06a6a418f9..0e27b0119c 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
@@ -56,7 +56,7 @@ Testing native PS...
 
 Warning: PDO::prepare(): SQLSTATE[42S02]: Base table or view not found: 1146 Table '%s.ihopeitdoesnotexist' doesn't exist in %s on line %d
 
-Fatal error: Uncaught EngineException: Call to a member function execute() on boolean in %s:%d
+Fatal error: Uncaught Error: Call to a member function execute() on boolean in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
index 1caa875a32..db92e40a93 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
@@ -99,7 +99,7 @@ Native Prepared Statements...
 
 Warning: PDO::query(): SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near '%SSELECT label FROM test ORDER BY id ASC LIMIT 1' at line %d in %s on line %d
 
-Fatal error: Uncaught EngineException: Call to a member function errorInfo() on boolean in %s:%d
+Fatal error: Uncaught Error: Call to a member function errorInfo() on boolean in %s:%d
 Stack trace:
 #0 %s(%d): mysql_stmt_multiquery_wrong_usage(Object(PDO))
 #1 {main}
diff --git a/ext/phar/tests/badparameters.phpt b/ext/phar/tests/badparameters.phpt
index 97faab427c..a1a9fb78a0 100644
--- a/ext/phar/tests/badparameters.phpt
+++ b/ext/phar/tests/badparameters.phpt
@@ -18,7 +18,7 @@ Phar::loadPhar(array());
 Phar::canCompress('hi');
 try {
 	$a = new Phar(array());
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	print_exception($e);
 }
 try {
diff --git a/ext/phar/tests/bug60261.phpt b/ext/phar/tests/bug60261.phpt
index 2dd03b9517..84d4203e10 100644
--- a/ext/phar/tests/bug60261.phpt
+++ b/ext/phar/tests/bug60261.phpt
@@ -8,7 +8,7 @@ Bug #60261 (phar dos null pointer)
 try {
     $nx = new Phar();
 	$nx->getLinkTarget();
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage(), "\n";
 }
 
diff --git a/ext/phar/tests/cache_list/frontcontroller29.phpt b/ext/phar/tests/cache_list/frontcontroller29.phpt
index 39c27fcdd7..c86cdfe4ac 100644
--- a/ext/phar/tests/cache_list/frontcontroller29.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller29.phpt
@@ -14,7 +14,7 @@ files/frontcontroller8.phar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECTF--
-Fatal error: Uncaught EngineException: Call to undefined function oopsie_daisy() in phar://%sfatalerror.phps:1
+Fatal error: Uncaught Error: Call to undefined function oopsie_daisy() in phar://%sfatalerror.phps:1
 Stack trace:
 #0 [internal function]: unknown()
 #1 %s(%d): Phar::webPhar('whatever', 'index.php', '404.php', Array)
diff --git a/ext/phar/tests/frontcontroller29.phpt b/ext/phar/tests/frontcontroller29.phpt
index 5369a60845..710a58f91b 100644
--- a/ext/phar/tests/frontcontroller29.phpt
+++ b/ext/phar/tests/frontcontroller29.phpt
@@ -13,7 +13,7 @@ files/frontcontroller8.phar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECTF--
-Fatal error: Uncaught EngineException: Call to undefined function oopsie_daisy() in phar://%sfatalerror.phps:1
+Fatal error: Uncaught Error: Call to undefined function oopsie_daisy() in phar://%sfatalerror.phps:1
 Stack trace:
 #0 [internal function]: unknown()
 #1 %s(%d): Phar::webPhar('whatever', 'index.php', '404.php', Array)
diff --git a/ext/phar/tests/pharfileinfo_construct.phpt b/ext/phar/tests/pharfileinfo_construct.phpt
index abd0fac2e6..1f4f6177b0 100644
--- a/ext/phar/tests/pharfileinfo_construct.phpt
+++ b/ext/phar/tests/pharfileinfo_construct.phpt
@@ -19,7 +19,7 @@ unlink($fname);
 
 try {
 $a = new PharFileInfo(array());
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 echo $e->getMessage() . "\n";
 }
 
diff --git a/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt b/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt
index 0d1ef20ad7..900ce21d45 100644
--- a/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt
@@ -12,7 +12,7 @@ if (!extension_loaded('reflection)) print 'skip';
 $rc = new ReflectionClass("stdClass");
 $rc2 = clone($rc);
 --EXPECTF--
-Fatal error: Uncaught EngineException: Trying to clone an uncloneable object of class ReflectionClass in %s:%d
+Fatal error: Uncaught Error: Trying to clone an uncloneable object of class ReflectionClass in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/reflection/tests/ReflectionClass_getName_error1.phpt b/ext/reflection/tests/ReflectionClass_getName_error1.phpt
index e475688b6d..dcdfcdf98f 100644
--- a/ext/reflection/tests/ReflectionClass_getName_error1.phpt
+++ b/ext/reflection/tests/ReflectionClass_getName_error1.phpt
@@ -5,7 +5,7 @@ ReflectionClass::getName - forbid static invocation
 ReflectionClass::getName();
 ?>
 --EXPECTF--
-Fatal error: Uncaught EngineException: Non-static method ReflectionClass::getName() cannot be called statically in %s:2
+Fatal error: Uncaught Error: Non-static method ReflectionClass::getName() cannot be called statically in %s:2
 Stack trace:
 #0 {main}
   thrown in %s on line 2
diff --git a/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt b/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt
index e261855088..361708a315 100644
--- a/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt
@@ -68,7 +68,7 @@ Internal class - XMLWriter
 bool(false)
 bool(false)
 
-Fatal error: Uncaught EngineException: Trying to clone an uncloneable object of class XMLWriter in %s:%d
+Fatal error: Uncaught Error: Trying to clone an uncloneable object of class XMLWriter in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt b/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt
index 47dba9b6ec..42dc647a02 100644
--- a/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt
@@ -86,7 +86,7 @@ NULL
 
 Test static invocation:
 
-Fatal error: Uncaught EngineException: Non-static method ReflectionClass::isIterateable() cannot be called statically in %s:43
+Fatal error: Uncaught Error: Non-static method ReflectionClass::isIterateable() cannot be called statically in %s:43
 Stack trace:
 #0 {main}
   thrown in %s on line 43
 \ No newline at end of file
diff --git a/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt b/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt
index ada3c6db48..2754b4c8e3 100644
--- a/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt
@@ -17,7 +17,7 @@ var_dump($a);
 ?>
 --EXPECTF--
 
-Fatal error: Uncaught TypeException: Argument 1 passed to ReflectionClass::newInstanceArgs() must be of the type array, string given in %s:8
+Fatal error: Uncaught TypeError: Argument 1 passed to ReflectionClass::newInstanceArgs() must be of the type array, string given in %s:8
 Stack trace:
 #0 %s(%d): ReflectionClass->newInstanceArgs('x')
 #1 {main}
diff --git a/ext/reflection/tests/ReflectionExtension_constructor_error.phpt b/ext/reflection/tests/ReflectionExtension_constructor_error.phpt
index 235c2ad768..94071de5ab 100644
--- a/ext/reflection/tests/ReflectionExtension_constructor_error.phpt
+++ b/ext/reflection/tests/ReflectionExtension_constructor_error.phpt
@@ -7,19 +7,19 @@ Leon Luijkx <leon@phpgg.nl>
 <?php
 try {
 	$obj = new ReflectionExtension();
-} catch (TypeException $re) {
+} catch (TypeError $re) {
 	echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 
 try {
 	$obj = new ReflectionExtension('foo', 'bar');
-} catch (TypeException $re) {
+} catch (TypeError $re) {
 	echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 
 try {
 	$obj = new ReflectionExtension([]);
-} catch (TypeException $re) {
+} catch (TypeError $re) {
 	echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 
diff --git a/ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt b/ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt
index 0728d505c3..3fea08c43f 100644
--- a/ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt
+++ b/ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt
@@ -17,6 +17,6 @@ array(4) {
   [2]=>
   %s(9) "Directory"
   [3]=>
-  %s(18) "AssertionException"
+  %s(14) "AssertionError"
 }
 ==DONE==
diff --git a/ext/reflection/tests/ReflectionFunction_construct.001.phpt b/ext/reflection/tests/ReflectionFunction_construct.001.phpt
index 52db7c654d..0e2e8a3681 100644
--- a/ext/reflection/tests/ReflectionFunction_construct.001.phpt
+++ b/ext/reflection/tests/ReflectionFunction_construct.001.phpt
@@ -9,7 +9,7 @@ Steve Seear <stevseea@php.net>
 try {
 	$a = new ReflectionFunction(array(1, 2, 3));
 	echo "exception not thrown.".PHP_EOL;
-} catch (TypeException $re) {
+} catch (TypeError $re) {
 	echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 try {
@@ -19,17 +19,17 @@ try {
 }
 try {
 	$a = new ReflectionFunction();
-} catch (TypeException $re) {
+} catch (TypeError $re) {
 	echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 try {
 	$a = new ReflectionFunction(1, 2);
-} catch (TypeException $re) {
+} catch (TypeError $re) {
 	echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 try {
 	$a = new ReflectionFunction([]);
-} catch (TypeException $re) {
+} catch (TypeError $re) {
 	echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 
diff --git a/ext/reflection/tests/ReflectionMethod_006.phpt b/ext/reflection/tests/ReflectionMethod_006.phpt
index b22a2acc6d..627dc96f32 100644
--- a/ext/reflection/tests/ReflectionMethod_006.phpt
+++ b/ext/reflection/tests/ReflectionMethod_006.phpt
@@ -8,12 +8,12 @@ Steve Seear <stevseea@php.net>
 
 try {
 	new ReflectionMethod();
-} catch (TypeException $re) {
+} catch (TypeError $re) {
 	echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 try {
 	new ReflectionMethod('a', 'b', 'c');
-} catch (TypeException $re) {
+} catch (TypeError $re) {
 	echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 
diff --git a/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt b/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt
index 3c521efc64..98125cba65 100644
--- a/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt
+++ b/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt
@@ -16,13 +16,13 @@ class TestClass
 try {
 	echo "Too few arguments:\n";
 	$methodInfo = new ReflectionMethod();
-} catch (TypeException $re) {
+} catch (TypeError $re) {
 	echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 try {
 	echo "\nToo many arguments:\n";
 	$methodInfo = new ReflectionMethod("TestClass", "foo", true);
-} catch (TypeException $re) {
+} catch (TypeError $re) {
 	echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 
@@ -45,7 +45,7 @@ try {
 try{
 	//invalid 2nd param
 	$methodInfo = new ReflectionMethod("TestClass", []);
-} catch (TypeException $re) {
+} catch (TypeError $re) {
 	echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 
diff --git a/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt b/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt
index 0405df67e1..8bedbea0cb 100644
--- a/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt
+++ b/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt
@@ -18,7 +18,7 @@ $testClassInstance = new TestClass();
 
 try {
     var_dump($foo->invokeArgs($testClassInstance, true));
-} catch (EngineException $e) {
+} catch (Error $e) {
     var_dump($e->getMessage());
 }
 
diff --git a/ext/reflection/tests/ReflectionObject_getName_error1.phpt b/ext/reflection/tests/ReflectionObject_getName_error1.phpt
index 32132f52e8..0d88c84398 100644
--- a/ext/reflection/tests/ReflectionObject_getName_error1.phpt
+++ b/ext/reflection/tests/ReflectionObject_getName_error1.phpt
@@ -5,7 +5,7 @@ ReflectionObject::getName - forbid static invocation
 ReflectionObject::getName();
 ?> 
 --EXPECTF--
-Fatal error: Uncaught EngineException: Non-static method ReflectionClass::getName() cannot be called statically in %s:2
+Fatal error: Uncaught Error: Non-static method ReflectionClass::getName() cannot be called statically in %s:2
 Stack trace:
 #0 {main}
   thrown in %s on line 2
diff --git a/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt
index a884162fd2..6c154558e9 100644
--- a/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt
+++ b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt
@@ -25,7 +25,7 @@ class C {
 try {
 	new ReflectionParameter(array ('A', 'b'));
 }
-catch(TypeException $e) {
+catch(TypeError $e) {
 	printf( "Ok - %s\n", $e->getMessage());
 }
 
diff --git a/ext/reflection/tests/ReflectionProperty_error.phpt b/ext/reflection/tests/ReflectionProperty_error.phpt
index ef051b5380..c8a2f11ee1 100644
--- a/ext/reflection/tests/ReflectionProperty_error.phpt
+++ b/ext/reflection/tests/ReflectionProperty_error.phpt
@@ -9,18 +9,18 @@ class C {
 
 try {
 	new ReflectionProperty();
-} catch (TypeException $re) {
+} catch (TypeError $re) {
 	echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 try {
 	new ReflectionProperty('C::p');
-} catch (TypeException $re) {
+} catch (TypeError $re) {
 	echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 
 try {
 	new ReflectionProperty('C', 'p', 'x');
-} catch (TypeException $re) {
+} catch (TypeError $re) {
 	echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 
diff --git a/ext/reflection/tests/bug64007.phpt b/ext/reflection/tests/bug64007.phpt
index 91b7fa6885..a25beb6360 100644
--- a/ext/reflection/tests/bug64007.phpt
+++ b/ext/reflection/tests/bug64007.phpt
@@ -16,7 +16,7 @@ var_dump($generator);
 --EXPECTF--
 string(%d) "Class Generator is an internal class marked as final that cannot be instantiated without invoking its constructor"
 
-Fatal error: Uncaught EngineException: The "Generator" class is reserved for internal use and cannot be manually instantiated in %sbug64007.php:%d
+Fatal error: Uncaught Error: The "Generator" class is reserved for internal use and cannot be manually instantiated in %sbug64007.php:%d
 Stack trace:
 #0 %s(%d): ReflectionClass->newInstance()
 #1 {main}
diff --git a/ext/session/tests/bug60634_error_1.phpt b/ext/session/tests/bug60634_error_1.phpt
index 90983c6f85..d0733f5a5a 100644
--- a/ext/session/tests/bug60634_error_1.phpt
+++ b/ext/session/tests/bug60634_error_1.phpt
@@ -45,7 +45,7 @@ echo "um, hi\n";
 --EXPECTF--
 write: goodbye cruel world
 
-Fatal error: Uncaught EngineException: Call to undefined function undefined_function() in %s:%d
+Fatal error: Uncaught Error: Call to undefined function undefined_function() in %s:%d
 Stack trace:
 #0 [internal function]: write(%s, '')
 #1 %s(%d): session_write_close()
diff --git a/ext/session/tests/bug60634_error_3.phpt b/ext/session/tests/bug60634_error_3.phpt
index d756644f76..b7840b04f9 100644
--- a/ext/session/tests/bug60634_error_3.phpt
+++ b/ext/session/tests/bug60634_error_3.phpt
@@ -43,7 +43,7 @@ session_start();
 --EXPECTF--
 write: goodbye cruel world
 
-Fatal error: Uncaught EngineException: Call to undefined function undefined_function() in %s:%d
+Fatal error: Uncaught Error: Call to undefined function undefined_function() in %s:%d
 Stack trace:
 #0 [internal function]: write(%s, '')
 #1 {main}
diff --git a/ext/session/tests/bug60634_error_5.phpt b/ext/session/tests/bug60634_error_5.phpt
index 018cf17538..18f1266a00 100644
--- a/ext/session/tests/bug60634_error_5.phpt
+++ b/ext/session/tests/bug60634_error_5.phpt
@@ -44,7 +44,7 @@ echo "um, hi\n";
 --EXPECTF--
 close: goodbye cruel world
 
-Fatal error: Uncaught EngineException: Call to undefined function undefined_function() in %s:%d
+Fatal error: Uncaught Error: Call to undefined function undefined_function() in %s:%d
 Stack trace:
 #0 [internal function]: close()
 #1 %s(%d): session_write_close()
diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath_3.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath_3.phpt
index e2997f19d1..8ed2143285 100644
--- a/ext/simplexml/tests/SimpleXMLElement_xpath_3.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_xpath_3.phpt
@@ -15,7 +15,7 @@ Notice: Undefined variable: x in %s on line %d
 
 Warning: simplexml_load_string() expects parameter 3 to be integer, float given in %s on line %d
 
-Fatal error: Uncaught EngineException: Call to a member function xpath() on null in %s:%d
+Fatal error: Uncaught Error: Call to a member function xpath() on null in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/simplexml/tests/bug37565.phpt b/ext/simplexml/tests/bug37565.phpt
index cf5a3d8849..7d9675e3fd 100644
--- a/ext/simplexml/tests/bug37565.phpt
+++ b/ext/simplexml/tests/bug37565.phpt
@@ -17,13 +17,13 @@ class Setting extends ReflectionObject
 
 try {
 	Reflection::export(simplexml_load_string('<test/>', 'Setting'));
-} catch (EngineException $e) {
+} catch (Error $e) {
 	my_error_handler($e->getCode(), $e->getMessage(), $e->getFile(), $e->getLine());
 }
 
 try {
 	Reflection::export(simplexml_load_file('data:,<test/>', 'Setting'));
-} catch (EngineException $e) {
+} catch (Error $e) {
 	my_error_handler($e->getCode(), $e->getMessage(), $e->getFile(), $e->getLine());
 }
 
diff --git a/ext/snmp/tests/snmp-object-error.phpt b/ext/snmp/tests/snmp-object-error.phpt
index e2574872f4..2b81629d7e 100644
--- a/ext/snmp/tests/snmp-object-error.phpt
+++ b/ext/snmp/tests/snmp-object-error.phpt
@@ -16,17 +16,17 @@ snmp_set_valueretrieval(SNMP_VALUE_PLAIN);
 
 try {
 	var_dump(new SNMP(SNMP::VERSION_1, $hostname));
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	print $e->getMessage() . "\n";
 }
 try {
 	var_dump(new SNMP(SNMP::VERSION_1, $hostname, $community, ''));
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	print $e->getMessage() . "\n";
 }
 try {
 	var_dump(new SNMP(SNMP::VERSION_1, $hostname, $community, $timeout, ''));
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	print $e->getMessage() . "\n";
 }
 try {
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 120274b272..05c7b857f3 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -1496,10 +1496,10 @@ static void _soap_server_exception(soapServicePtr service, sdlFunctionPtr functi
 	ZVAL_OBJ(&exception_object, EG(exception));
 	if (instanceof_function(Z_OBJCE(exception_object), soap_fault_class_entry)) {
 		soap_server_fault_ex(function, &exception_object, NULL);
-	} else if (instanceof_function(Z_OBJCE(exception_object), zend_get_engine_exception())) {
+	} else if (instanceof_function(Z_OBJCE(exception_object), zend_get_error())) {
 		if (service->send_errors) {
 			zval rv;
-			zend_string *msg = zval_get_string(zend_read_property(zend_exception_get_base(), &exception_object, "message", sizeof("message")-1, 0, &rv));
+			zend_string *msg = zval_get_string(zend_read_property(zend_get_error(), &exception_object, "message", sizeof("message")-1, 0, &rv));
 			add_soap_fault_ex(&exception_object, this_ptr, "Server", msg->val, NULL, NULL);
 			zend_string_release(msg);
 		} else {
@@ -2596,13 +2596,13 @@ static int do_request(zval *this_ptr, xmlDoc *request, char *location, char *act
 			add_soap_fault(this_ptr, "Client", "SoapClient::__doRequest() failed", NULL, NULL);
 			ret = FALSE;
 		} else if (Z_TYPE_P(response) != IS_STRING) {
-			if (EG(exception) && instanceof_function(EG(exception)->ce, zend_get_engine_exception())) {
+			if (EG(exception) && instanceof_function(EG(exception)->ce, zend_get_error())) {
 				zval rv;
 				zend_string *msg;
 				zval exception_object;
 
 				ZVAL_OBJ(&exception_object, EG(exception));
-				msg = zval_get_string(zend_read_property(zend_exception_get_base(), &exception_object, "message", sizeof("message")-1, 0, &rv));
+				msg = zval_get_string(zend_read_property(zend_get_error(), &exception_object, "message", sizeof("message")-1, 0, &rv));
 				/* change class */
 				EG(exception)->ce = soap_fault_class_entry;
 				set_soap_fault(&exception_object, NULL, "Client", msg->val, NULL, NULL, NULL);
diff --git a/ext/spl/tests/CallbackFilterIteratorTest-002.phpt b/ext/spl/tests/CallbackFilterIteratorTest-002.phpt
index 1f71d3032a..216a40bd6a 100644
--- a/ext/spl/tests/CallbackFilterIteratorTest-002.phpt
+++ b/ext/spl/tests/CallbackFilterIteratorTest-002.phpt
@@ -10,25 +10,25 @@ set_error_handler(function($errno, $errstr){
 
 try {
 	new CallbackFilterIterator();
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage() . "\n";
 }
 
 try {
 	new CallbackFilterIterator(null);
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage() . "\n";
 }
 
 try {
 	new CallbackFilterIterator(new ArrayIterator(array()), null);
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage() . "\n";
 }
 
 try {
 	new CallbackFilterIterator(new ArrayIterator(array()), array());
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage() . "\n";
 }
 
diff --git a/ext/spl/tests/SplFixedArray__construct_param_array.phpt b/ext/spl/tests/SplFixedArray__construct_param_array.phpt
index e1515c4039..b15579edca 100644
--- a/ext/spl/tests/SplFixedArray__construct_param_array.phpt
+++ b/ext/spl/tests/SplFixedArray__construct_param_array.phpt
@@ -7,7 +7,7 @@ PHPNW Test Fest 2009 - Jordan Hatch
 
 try {
 	$array = new SplFixedArray( array("string", 1) );
-} catch (TypeException $iae) {
+} catch (TypeError $iae) {
 	echo "Ok - ".$iae->getMessage().PHP_EOL;
 }
 
diff --git a/ext/spl/tests/SplFixedArray__construct_param_string.phpt b/ext/spl/tests/SplFixedArray__construct_param_string.phpt
index 66c7fe6a59..d30fc691c6 100644
--- a/ext/spl/tests/SplFixedArray__construct_param_string.phpt
+++ b/ext/spl/tests/SplFixedArray__construct_param_string.phpt
@@ -6,7 +6,7 @@ PHPNW Test Fest 2009 - Jordan Hatch
 <?php
 try {
 	$array = new SplFixedArray( "string" );
-} catch (TypeException $iae) {
+} catch (TypeError $iae) {
 	echo "Ok - ".$iae->getMessage().PHP_EOL;
 }
 
diff --git a/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
index 20f4e7970c..4739d8c55d 100644
--- a/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
+++ b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt
@@ -6,7 +6,7 @@ Philip Norton philipnorton42@gmail.com
 <?php
 try {
 	$array = new SplFixedArray(new SplFixedArray(3));
-} catch (TypeException $iae) {
+} catch (TypeError $iae) {
 	echo "Ok - ".$iae->getMessage().PHP_EOL;
 }
 
diff --git a/ext/spl/tests/SplTempFileObject_constructor_error.phpt b/ext/spl/tests/SplTempFileObject_constructor_error.phpt
index 8eb306689d..fe47366987 100644
--- a/ext/spl/tests/SplTempFileObject_constructor_error.phpt
+++ b/ext/spl/tests/SplTempFileObject_constructor_error.phpt
@@ -4,7 +4,7 @@ SPL SplTempFileObject constructor sets correct defaults when pass 0 arguments
 <?php
 try {
     new SplTempFileObject('invalid');
-} catch (TypeException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 ?>
diff --git a/ext/spl/tests/arrayObject___construct_error1.phpt b/ext/spl/tests/arrayObject___construct_error1.phpt
index cff0dd048d..f0e1107d51 100644
--- a/ext/spl/tests/arrayObject___construct_error1.phpt
+++ b/ext/spl/tests/arrayObject___construct_error1.phpt
@@ -7,14 +7,14 @@ $a = new stdClass;
 $a->p = 1;
 try {
   var_dump(new ArrayObject($a, 0, "Exception"));
-} catch (TypeException $e) {
+} catch (TypeError $e) {
   echo $e->getMessage() . "(" . $e->getLine() .  ")\n";
 }
 
 echo "Non-existent class:\n";
 try {
   var_dump(new ArrayObject(new stdClass, 0, "nonExistentClassName"));
-} catch (TypeException $e) {
+} catch (TypeError $e) {
   echo $e->getMessage() . "(" . $e->getLine() .  ")\n";
 }
 ?>
diff --git a/ext/spl/tests/arrayObject___construct_error2.phpt b/ext/spl/tests/arrayObject___construct_error2.phpt
index d075516725..35ba83d09f 100644
--- a/ext/spl/tests/arrayObject___construct_error2.phpt
+++ b/ext/spl/tests/arrayObject___construct_error2.phpt
@@ -13,7 +13,7 @@ Class C implements Iterator {
 
 try {
   var_dump(new ArrayObject(new stdClass, 0, "C", "extra"));
-} catch (TypeException $e) {
+} catch (TypeError $e) {
   echo $e->getMessage() . "(" . $e->getLine() .  ")\n";
 }
 ?>
diff --git a/ext/spl/tests/arrayObject_setFlags_basic2.phpt b/ext/spl/tests/arrayObject_setFlags_basic2.phpt
index e1d816e158..6eece74cbb 100644
--- a/ext/spl/tests/arrayObject_setFlags_basic2.phpt
+++ b/ext/spl/tests/arrayObject_setFlags_basic2.phpt
@@ -26,7 +26,7 @@ string(6) "secret"
 string(6) "public"
 string(6) "secret"
 
-Fatal error: Uncaught EngineException: Cannot access private property C::$x in %s:19
+Fatal error: Uncaught Error: Cannot access private property C::$x in %s:19
 Stack trace:
 #0 {main}
   thrown in %s on line 19
diff --git a/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt b/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt
index b4c3756cb5..89efdb6a9f 100644
--- a/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt
+++ b/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt
@@ -28,7 +28,7 @@ try {
   foreach($ao as $key=>$value) {
     echo "  $key=>$value\n";
   }
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	var_dump($e->getMessage());
 }
 
@@ -37,7 +37,7 @@ try {
   foreach($ao as $key=>$value) {
     echo "  $key=>$value\n";
   }
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	var_dump($e->getMessage());
 }
 
diff --git a/ext/spl/tests/bug48023.phpt b/ext/spl/tests/bug48023.phpt
index 1af4190d0a..9cb8dd2c1f 100644
--- a/ext/spl/tests/bug48023.phpt
+++ b/ext/spl/tests/bug48023.phpt
@@ -9,7 +9,7 @@ new Foo;
 ?>
 ===DONE===
 --EXPECTF--
-Fatal error: Uncaught EngineException: Class 'Foo' not found in %s:%d
+Fatal error: Uncaught Error: Class 'Foo' not found in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/spl/tests/bug49972.phpt b/ext/spl/tests/bug49972.phpt
index cc0aff3bed..836d399ed9 100644
--- a/ext/spl/tests/bug49972.phpt
+++ b/ext/spl/tests/bug49972.phpt
@@ -8,7 +8,7 @@ $iterator->undefined();
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught EngineException: Call to undefined method AppendIterator::undefined() in %s:%d
+Fatal error: Uncaught Error: Call to undefined method AppendIterator::undefined() in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/spl/tests/bug54292.phpt b/ext/spl/tests/bug54292.phpt
index 44d12ee242..288f49a4ec 100644
--- a/ext/spl/tests/bug54292.phpt
+++ b/ext/spl/tests/bug54292.phpt
@@ -5,7 +5,7 @@ Bug #54292 (Wrong parameter causes crash in SplFileObject::__construct())
 
 try {
 	new SplFileObject('foo', array());
-} catch (TypeException $e) {
+} catch (TypeError $e) {
 	var_dump($e->getMessage());
 }
 
diff --git a/ext/spl/tests/bug69737.phpt b/ext/spl/tests/bug69737.phpt
index fd8bba6508..02815c296a 100644
--- a/ext/spl/tests/bug69737.phpt
+++ b/ext/spl/tests/bug69737.phpt
@@ -13,7 +13,7 @@ $h->insert(6);
 ?>
 ===DONE===
 --EXPECTF--
-Fatal error: Uncaught EngineException: Call to undefined method SplMinHeap::notexist() in %s%ebug69737.php:%d
+Fatal error: Uncaught Error: Call to undefined method SplMinHeap::notexist() in %s%ebug69737.php:%d
 Stack trace:
 #0 [internal function]: SplMinHeap1->compare(1, 6)
 #1 %s%ebug69737.php(%d): SplHeap->insert(6)
diff --git a/ext/spl/tests/fixedarray_005.phpt b/ext/spl/tests/fixedarray_005.phpt
index 83727a23b9..cc64fd01b0 100644
--- a/ext/spl/tests/fixedarray_005.phpt
+++ b/ext/spl/tests/fixedarray_005.phpt
@@ -5,19 +5,19 @@ SPL: FixedArray: Invalid arguments
 
 try {
 	$a = new SplFixedArray(new stdClass);
-} catch (TypeException $iae) {
+} catch (TypeError $iae) {
 	echo "Ok - ".$iae->getMessage().PHP_EOL;
 }
 
 try {
 	$a = new SplFixedArray('FOO');
-} catch (TypeException $iae) {
+} catch (TypeError $iae) {
 	echo "Ok - ".$iae->getMessage().PHP_EOL;
 }
 
 try {
 	$a = new SplFixedArray('');
-} catch (TypeException $iae) {
+} catch (TypeError $iae) {
 	echo "Ok - ".$iae->getMessage().PHP_EOL;
 }
 
diff --git a/ext/spl/tests/fixedarray_009.phpt b/ext/spl/tests/fixedarray_009.phpt
index f255ed299a..fe38883621 100644
--- a/ext/spl/tests/fixedarray_009.phpt
+++ b/ext/spl/tests/fixedarray_009.phpt
@@ -5,7 +5,7 @@ SPL: FixedArray: Trying to instantiate passing string to construtor parameter
 
 try {
 	$a = new SplFixedArray('FOO');
-} catch (TypeException $iae) {
+} catch (TypeError $iae) {
 	echo "Ok - ".$iae->getMessage().PHP_EOL;
 }
 ?>
diff --git a/ext/spl/tests/fixedarray_015.phpt b/ext/spl/tests/fixedarray_015.phpt
index d189d41da3..b6f119ab1f 100644
--- a/ext/spl/tests/fixedarray_015.phpt
+++ b/ext/spl/tests/fixedarray_015.phpt
@@ -5,7 +5,7 @@ SPL: FixedArray: accessing uninitialized array
 
 try {
 	$a = new SplFixedArray('');
-} catch (TypeException $iae) {
+} catch (TypeError $iae) {
 	echo "Ok - ".$iae->getMessage().PHP_EOL;
 }
 
diff --git a/ext/spl/tests/iterator_035.phpt b/ext/spl/tests/iterator_035.phpt
index bedb7684d5..307337431a 100644
--- a/ext/spl/tests/iterator_035.phpt
+++ b/ext/spl/tests/iterator_035.phpt
@@ -14,7 +14,7 @@ echo "Done\n";
 --EXPECTF--	
 Notice: Indirect modification of overloaded element of ArrayIterator has no effect in %s on line %d
 
-Fatal error: Uncaught EngineException: Cannot assign by reference to overloaded object in %s:%d
+Fatal error: Uncaught Error: Cannot assign by reference to overloaded object in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/spl/tests/iterator_042.phpt b/ext/spl/tests/iterator_042.phpt
index d654ede97a..a344d60e33 100644
--- a/ext/spl/tests/iterator_042.phpt
+++ b/ext/spl/tests/iterator_042.phpt
@@ -15,7 +15,7 @@ $it = new AppendIterator;
 
 try {
 	$it->append(array());
-} catch (EngineException $e) {
+} catch (Error $e) {
 	test_error_handler($e->getCode(), $e->getMessage(), $e->getFile(), $e->getLine());
 }
 $it->append(new ArrayIterator(array(1)));
diff --git a/ext/spl/tests/iterator_056.phpt b/ext/spl/tests/iterator_056.phpt
index ee98263638..b5213732c3 100644
--- a/ext/spl/tests/iterator_056.phpt
+++ b/ext/spl/tests/iterator_056.phpt
@@ -21,36 +21,36 @@ class myNoRewindIterator extends NoRewindIterator  {}
 
 try {
 	$it = new myFilterIterator();	
-} catch (TypeException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 
 try {
 	$it = new myCachingIterator();	
-} catch (TypeException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 
 try {
 	$it = new myRecursiveCachingIterator();	
-} catch (TypeException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 
 try {
 	$it = new myParentIterator();	
-} catch (TypeException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 
 try {
 	$it = new myLimitIterator();
-} catch (TypeException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 try {
 	$it = new myNoRewindIterator();
-} catch (TypeException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 
diff --git a/ext/spl/tests/iterator_count.phpt b/ext/spl/tests/iterator_count.phpt
index b70afc18c3..c0dad0f422 100644
--- a/ext/spl/tests/iterator_count.phpt
+++ b/ext/spl/tests/iterator_count.phpt
@@ -23,7 +23,7 @@ Warning: iterator_count() expects exactly 1 parameter, 0 given in %s
 
 Warning: iterator_count() expects exactly 1 parameter, 2 given in %s
 
-Fatal error: Uncaught TypeException: Argument 1 passed to iterator_count() must implement interface Traversable, string given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to iterator_count() must implement interface Traversable, string given in %s:%d
 Stack trace:
 #0 %s(%d): iterator_count('1')
 #1 {main}
diff --git a/ext/spl/tests/iterator_to_array.phpt b/ext/spl/tests/iterator_to_array.phpt
index 925ee372d4..f36b99db23 100644
--- a/ext/spl/tests/iterator_to_array.phpt
+++ b/ext/spl/tests/iterator_to_array.phpt
@@ -22,7 +22,7 @@ Warning: iterator_to_array() expects at least 1 parameter, 0 given in %s
 
 Warning: iterator_to_array() expects at most 2 parameters, 3 given in %s
 
-Fatal error: Uncaught TypeException: Argument 1 passed to iterator_to_array() must implement interface Traversable, string given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to iterator_to_array() must implement interface Traversable, string given in %s:%d
 Stack trace:
 #0 %s(%d): iterator_to_array('test', 'test')
 #1 {main}
diff --git a/ext/spl/tests/recursive_tree_iterator_003.phpt b/ext/spl/tests/recursive_tree_iterator_003.phpt
index 4cc7000a19..721b67ac02 100644
--- a/ext/spl/tests/recursive_tree_iterator_003.phpt
+++ b/ext/spl/tests/recursive_tree_iterator_003.phpt
@@ -4,7 +4,7 @@ SPL: RecursiveTreeIterator(non-traversable)
 <?php
 try {
 	new RecursiveTreeIterator(new ArrayIterator(array()));
-} catch (TypeException $e) {
+} catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 ?>
diff --git a/ext/spl/tests/spl_004.phpt b/ext/spl/tests/spl_004.phpt
index c321bab296..ac44b9d684 100644
--- a/ext/spl/tests/spl_004.phpt
+++ b/ext/spl/tests/spl_004.phpt
@@ -44,7 +44,7 @@ var_dump(iterator_apply($it, 'test'));
 echo "===ERRORS===\n";
 try {
 	var_dump(iterator_apply($it, 'test', 1));
-} catch (EngineException $e) {
+} catch (Error $e) {
 	my_error_handler($e->getCode(), $e->getMessage(), $e->getFile(), $e->getLine());
 }
 var_dump(iterator_apply($it, 'non_existing_function'));
diff --git a/ext/spl/tests/spl_iterator_iterator_constructor.phpt b/ext/spl/tests/spl_iterator_iterator_constructor.phpt
index ec103f5c9c..4c3fae25a2 100644
--- a/ext/spl/tests/spl_iterator_iterator_constructor.phpt
+++ b/ext/spl/tests/spl_iterator_iterator_constructor.phpt
@@ -15,7 +15,7 @@ try {
     $test = new IteratorIterator($arrayIterator, 1, 1);
     $test = new IteratorIterator($arrayIterator, 1, 1, 1);
     $test = new IteratorIterator($arrayIterator, 1, 1, 1, 1);
-} catch (TypeException $e){
+} catch (TypeError $e){
   echo $e->getMessage() . "\n";
 }
 
diff --git a/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt b/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt
index 6fbcec9dff..debc85e622 100644
--- a/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt
+++ b/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt
@@ -13,7 +13,7 @@ function p ($i) {
 }
 ?>
 --EXPECTF--
-Fatal error: Uncaught EngineException: An iterator cannot be used with foreach by reference in %s:%d
+Fatal error: Uncaught Error: An iterator cannot be used with foreach by reference in %s:%d
 Stack trace:
 #0 %s(%d): p(Object(IteratorIterator))
 #1 {main}
diff --git a/ext/sqlite3/tests/sqlite3_02_open.phpt b/ext/sqlite3/tests/sqlite3_02_open.phpt
index 985033b33e..b9b49530b3 100644
--- a/ext/sqlite3/tests/sqlite3_02_open.phpt
+++ b/ext/sqlite3/tests/sqlite3_02_open.phpt
@@ -10,7 +10,7 @@ Felix De Vliegher
 
 try {
   $db = new SQLite3();
-} catch (TypeException $e) {
+} catch (TypeError $e) {
   var_dump($e->getMessage());
 }
 
diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index 236c2c18e9..7054278d70 100644
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -37,7 +37,7 @@ ZEND_END_MODULE_GLOBALS(assert)
 
 ZEND_DECLARE_MODULE_GLOBALS(assert)
 
-static zend_class_entry *assertion_exception_ce;
+static zend_class_entry *assertion_error_ce;
 
 #ifdef ZTS
 #define ASSERTG(v) ZEND_TSRMG(assert_globals_id, zend_assert_globals *, v)
@@ -113,8 +113,8 @@ PHP_MINIT_FUNCTION(assert) /* {{{ */
 	REGISTER_LONG_CONSTANT("ASSERT_QUIET_EVAL", ASSERT_QUIET_EVAL, CONST_CS|CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("ASSERT_EXCEPTION", ASSERT_EXCEPTION, CONST_CS|CONST_PERSISTENT);
 
-	INIT_CLASS_ENTRY(ce, "AssertionException", NULL);
-	assertion_exception_ce = zend_register_internal_class_ex(&ce, zend_exception_get_default());
+	INIT_CLASS_ENTRY(ce, "AssertionError", NULL);
+	assertion_error_ce = zend_register_internal_class_ex(&ce, zend_get_error());
 
 	return SUCCESS;
 }
@@ -244,14 +244,14 @@ PHP_FUNCTION(assert)
 
 	if (ASSERTG(exception)) {
 		if (!description) {
-			zend_throw_exception(assertion_exception_ce, NULL, E_ERROR);
+			zend_throw_exception(assertion_error_ce, NULL, E_ERROR);
 		} else if (Z_TYPE_P(description) == IS_OBJECT &&
-			instanceof_function(Z_OBJCE_P(description), assertion_exception_ce)) {
+			instanceof_function(Z_OBJCE_P(description), assertion_error_ce)) {
 			Z_ADDREF_P(description);
 			zend_throw_exception_object(description);
 		} else {
 			zend_string *str = zval_get_string(description);
-			zend_throw_exception(assertion_exception_ce, str->val, E_ERROR);
+			zend_throw_exception(assertion_error_ce, str->val, E_ERROR);
 			zend_string_release(str);
 		}
 	} else if (ASSERTG(warning)) {
diff --git a/ext/standard/tests/array/arsort_object1.phpt b/ext/standard/tests/array/arsort_object1.phpt
index 75be19b52e..f73696392e 100644
--- a/ext/standard/tests/array/arsort_object1.phpt
+++ b/ext/standard/tests/array/arsort_object1.phpt
@@ -87,7 +87,7 @@ echo "Done\n";
 --EXPECTF--
 *** Testing arsort() : object functionality ***
 
-Fatal error: Uncaught EngineException: Class 'for_integer_asort' not found in %sarsort_object1.php:%d
+Fatal error: Uncaught Error: Class 'for_integer_asort' not found in %sarsort_object1.php:%d
 Stack trace:
 #0 {main}
   thrown in %sarsort_object1.php on line %d
 \ No newline at end of file
diff --git a/ext/standard/tests/array/arsort_object2.phpt b/ext/standard/tests/array/arsort_object2.phpt
index 077e2ced16..f5ed333623 100644
--- a/ext/standard/tests/array/arsort_object2.phpt
+++ b/ext/standard/tests/array/arsort_object2.phpt
@@ -91,7 +91,7 @@ echo "Done\n";
 --EXPECTF--
 *** Testing arsort() : object functionality ***
 
-Fatal error: Uncaught EngineException: Class 'for_integer_asort' not found in %sarsort_object2.php:%d
+Fatal error: Uncaught Error: Class 'for_integer_asort' not found in %sarsort_object2.php:%d
 Stack trace:
 #0 {main}
   thrown in %sarsort_object2.php on line %d
 \ No newline at end of file
diff --git a/ext/standard/tests/file/bug38450_3.phpt b/ext/standard/tests/file/bug38450_3.phpt
index 0193d44d9f..f2c4643ef3 100644
--- a/ext/standard/tests/file/bug38450_3.phpt
+++ b/ext/standard/tests/file/bug38450_3.phpt
@@ -104,7 +104,7 @@ echo "Done\n";
 --EXPECTF--	
 Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %sbug38450_3.php on line %d
 
-Fatal error: Uncaught TypeException: Argument 1 passed to VariableStream::__construct() must be of the type array, none given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to VariableStream::__construct() must be of the type array, none given in %s:%d
 Stack trace:
 #0 [internal function]: VariableStream->__construct()
 #1 %s(%d): fopen('var://myvar', 'r+')
diff --git a/ext/standard/tests/general_functions/010.phpt b/ext/standard/tests/general_functions/010.phpt
index a4802b0808..51132c6a15 100644
--- a/ext/standard/tests/general_functions/010.phpt
+++ b/ext/standard/tests/general_functions/010.phpt
@@ -13,7 +13,7 @@ class test {
 
 try {
 	var_dump(register_shutdown_function(array("test","__call")));
-} catch (EngineException $e) {
+} catch (Error $e) {
 	echo "\nException: " . $e->getMessage() . "\n";
 }
 
diff --git a/ext/standard/tests/general_functions/bug47857.phpt b/ext/standard/tests/general_functions/bug47857.phpt
index a2b0dac5e4..8bf04a39aa 100644
--- a/ext/standard/tests/general_functions/bug47857.phpt
+++ b/ext/standard/tests/general_functions/bug47857.phpt
@@ -19,7 +19,7 @@ Deprecated: Non-static method foo::bar() should not be called statically in %sbu
 ok
 bool(false)
 
-Fatal error: Uncaught EngineException: Non-static method BaseException::getMessage() cannot be called statically in %sbug47857.php:%d
+Fatal error: Uncaught Error: Non-static method Exception::getMessage() cannot be called statically in %sbug47857.php:%d
 Stack trace:
 #0 {main}
   thrown in %sbug47857.php on line %d
diff --git a/ext/standard/tests/serialize/bug69152.phpt b/ext/standard/tests/serialize/bug69152.phpt
index 83d7ebfb52..b766c0afbd 100644
--- a/ext/standard/tests/serialize/bug69152.phpt
+++ b/ext/standard/tests/serialize/bug69152.phpt
@@ -2,7 +2,7 @@
 Bug #69152: Type Confusion Infoleak Vulnerability in unserialize()
 --FILE--
 <?php
-$x = unserialize('O:9:"exception":1:{s:20:"'."\0".'BaseException'."\0".'trace";s:4:"ryat";}');
+$x = unserialize('O:9:"exception":1:{s:16:"'."\0".'Exception'."\0".'trace";s:4:"ryat";}');
 echo $x;
 $x =  unserialize('O:4:"test":1:{s:27:"__PHP_Incomplete_Class_Name";R:1;}');
 $x->test();
diff --git a/ext/tidy/tests/035.phpt b/ext/tidy/tests/035.phpt
index 8292755811..1fe0d5c9f1 100644
--- a/ext/tidy/tests/035.phpt
+++ b/ext/tidy/tests/035.phpt
@@ -9,7 +9,7 @@ tidyNode::__construct()
 new tidyNode;
 ?>
 --EXPECTF--
-Fatal error: Uncaught EngineException: Call to private tidyNode::__construct() from invalid context in %s:%d
+Fatal error: Uncaught Error: Call to private tidyNode::__construct() from invalid context in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/ext/tokenizer/tests/parse_errors.phpt b/ext/tokenizer/tests/parse_errors.phpt
index 3ee2cb081b..bfa6e07ac4 100644
--- a/ext/tokenizer/tests/parse_errors.phpt
+++ b/ext/tokenizer/tests/parse_errors.phpt
@@ -8,7 +8,7 @@ Parse errors during token_get_all()
 function test_parse_error($code) {
     try {
         var_dump(token_get_all($code));
-    } catch (ParseException $e) {
+    } catch (ParseError $e) {
         echo $e->getMessage(), "\n";
     }
 }
diff --git a/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_000.phpt b/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_000.phpt
index 03b991b1a5..b9da91502a 100644
--- a/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_000.phpt
+++ b/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_000.phpt
@@ -7,7 +7,7 @@ Parse errors during token_get_all() with TOKEN_PARSE flag
 
 try {
     token_get_all('<?php invalid code;', TOKEN_PARSE);
-} catch (ParseException $e) {
+} catch (ParseError $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
diff --git a/ext/xmlreader/tests/bug51936.phpt b/ext/xmlreader/tests/bug51936.phpt
index 8748c1ff32..821cef41b8 100644
--- a/ext/xmlreader/tests/bug51936.phpt
+++ b/ext/xmlreader/tests/bug51936.phpt
@@ -19,7 +19,7 @@ Done
 --EXPECTF--
 Test
 
-Fatal error: Uncaught EngineException: Trying to clone an uncloneable object of class XMLReader in %s:%d
+Fatal error: Uncaught Error: Trying to clone an uncloneable object of class XMLReader in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
author	Anatol Belski <ab@php.net>	2015-06-17 21:55:03 +0200
committer	Anatol Belski <ab@php.net>	2015-06-17 21:55:03 +0200
commit	269acaa363cab7de8705b060ba9b1e32322fb0f4 (patch)
tree	66efcef9cde9f20638c82e6db33f1d281e9f3eff /ext
parent	7db113fad106559a1335fea48d622d12d0e32f55 (diff)
parent	c5eb924e9e43c59b564549e149b59ad9a4bee74a (diff)
download	php-git-269acaa363cab7de8705b060ba9b1e32322fb0f4.tar.gz