Updated tests to reflect exception class changes.

50 files changed, 71 insertions, 71 deletions

diff --git a/tests/classes/abstract.phpt b/tests/classes/abstract.phpt
index c827d27108..9dd800e80b 100644
--- a/tests/classes/abstract.phpt
+++ b/tests/classes/abstract.phpt
@@ -27,7 +27,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call to function show()
 
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot call abstract method fail::show()' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Cannot call abstract method fail::show()' in %s:%d
 Stack trace:
 #0 %s(%d): pass->error()
 #1 {main}
diff --git a/tests/classes/abstract_class.phpt b/tests/classes/abstract_class.phpt
index 097cab1324..aa84b3c562 100644
--- a/tests/classes/abstract_class.phpt
+++ b/tests/classes/abstract_class.phpt
@@ -26,7 +26,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call to function show()
 
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot instantiate abstract class fail' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Cannot instantiate abstract class fail' in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/abstract_inherit.phpt b/tests/classes/abstract_inherit.phpt
index baf2a79f60..0b54bcf133 100644
--- a/tests/classes/abstract_inherit.phpt
+++ b/tests/classes/abstract_inherit.phpt
@@ -19,7 +19,7 @@ echo "Done\n"; // Shouldn't be displayed
 ?>
 --EXPECTF--
 
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot instantiate abstract class fail' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Cannot instantiate abstract class fail' in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d 
diff --git a/tests/classes/abstract_user_call.phpt b/tests/classes/abstract_user_call.phpt
index f19bb7c603..d04595335a 100644
--- a/tests/classes/abstract_user_call.phpt
+++ b/tests/classes/abstract_user_call.phpt
@@ -27,7 +27,7 @@ call_user_func(array($o, 'test_base::func'));
 --EXPECTF--
 test::func()
 
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot call abstract method test_base::func()' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Cannot call abstract method test_base::func()' in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/array_access_012.phpt b/tests/classes/array_access_012.phpt
index c37eaf2465..0405495721 100644
--- a/tests/classes/array_access_012.phpt
+++ b/tests/classes/array_access_012.phpt
@@ -33,7 +33,7 @@ $data['element'] = &$test;
 
 Notice: Indirect modification of overloaded element of ArrayAccessImpl has no effect in %sarray_access_012.php on line 24
 
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot assign by reference to overloaded object' in %sarray_access_012.php:24
+Fatal error: Uncaught exception 'Error' with message 'Cannot assign by reference to overloaded object' in %sarray_access_012.php:24
 Stack trace:
 #0 {main}
   thrown in %sarray_access_012.php on line 24
diff --git a/tests/classes/autoload_021.phpt b/tests/classes/autoload_021.phpt
index 5ec4ada9df..844dbd1316 100644
--- a/tests/classes/autoload_021.phpt
+++ b/tests/classes/autoload_021.phpt
@@ -10,7 +10,7 @@ $x = new $a;
 echo "BUG\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Class '../BUG' not found' in %sautoload_021.php:6
+Fatal error: Uncaught exception 'Error' with message 'Class '../BUG' not found' in %sautoload_021.php:6
 Stack trace:
 #0 {main}
   thrown in %sautoload_021.php on line 6
diff --git a/tests/classes/bug27504.phpt b/tests/classes/bug27504.phpt
index 14ab661dae..a32b65d9c5 100644
--- a/tests/classes/bug27504.phpt
+++ b/tests/classes/bug27504.phpt
@@ -22,7 +22,7 @@ Called function foo:bar(1)
 
 Warning: call_user_func_array() expects parameter 1 to be a valid callback, cannot access private method foo::bar() in %s on line %d
 
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to private method foo::bar() from context ''' in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/class_abstract.phpt b/tests/classes/class_abstract.phpt
index 3de53c35dd..ca1a1dd5ce 100644
--- a/tests/classes/class_abstract.phpt
+++ b/tests/classes/class_abstract.phpt
@@ -25,7 +25,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 base
 
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot instantiate abstract class base' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Cannot instantiate abstract class base' in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/constants_basic_001.phpt b/tests/classes/constants_basic_001.phpt
index a9fbcbb48e..ae2310ed7c 100644
--- a/tests/classes/constants_basic_001.phpt
+++ b/tests/classes/constants_basic_001.phpt
@@ -86,7 +86,7 @@ string(6) "hello2"
 
 Expecting fatal error:
 
-Fatal error: Uncaught exception 'EngineException' with message 'Undefined class constant 'c19'' in %s:53
+Fatal error: Uncaught exception 'Error' with message 'Undefined class constant 'c19'' in %s:53
 Stack trace:
 #0 {main}
   thrown in %s on line 53
diff --git a/tests/classes/ctor_visibility.phpt b/tests/classes/ctor_visibility.phpt
index 5014b0fbe2..dd218d1c5a 100644
--- a/tests/classes/ctor_visibility.phpt
+++ b/tests/classes/ctor_visibility.phpt
@@ -66,7 +66,7 @@ Test::__construct()
 TestPriv::__construct()
 DerivedPriv::__construct()
 
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot call private TestPriv::__construct()' in %sctor_visibility.php:%d
+Fatal error: Uncaught exception 'Error' with message 'Cannot call private TestPriv::__construct()' in %sctor_visibility.php:%d
 Stack trace:
 #0 %s(%d): DerivedPriv->__construct()
 #1 %s(%d): DerivedPriv::f()
diff --git a/tests/classes/destructor_visibility_001.phpt b/tests/classes/destructor_visibility_001.phpt
index 0b3a3aa7d0..4bcb4000c6 100644
--- a/tests/classes/destructor_visibility_001.phpt
+++ b/tests/classes/destructor_visibility_001.phpt
@@ -21,7 +21,7 @@ unset($obj);
 ?>
 ===DONE===
 --EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private Derived::__destruct() from context ''' in %sdestructor_visibility_001.php:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to private Derived::__destruct() from context ''' in %sdestructor_visibility_001.php:%d
 Stack trace:
 #0 {main}
   thrown in %sdestructor_visibility_001.php on line %d
diff --git a/tests/classes/factory_and_singleton_003.phpt b/tests/classes/factory_and_singleton_003.phpt
index 5dcb67a0c2..1ad37994dd 100644
--- a/tests/classes/factory_and_singleton_003.phpt
+++ b/tests/classes/factory_and_singleton_003.phpt
@@ -15,7 +15,7 @@ $obj = new test;
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Call to protected test::__construct() from invalid context' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to protected test::__construct() from invalid context' in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/factory_and_singleton_004.phpt b/tests/classes/factory_and_singleton_004.phpt
index c3787c05fc..9f473baf5b 100644
--- a/tests/classes/factory_and_singleton_004.phpt
+++ b/tests/classes/factory_and_singleton_004.phpt
@@ -15,7 +15,7 @@ $obj = new test;
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private test::__construct() from invalid context' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to private test::__construct() from invalid context' in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/factory_and_singleton_005.phpt b/tests/classes/factory_and_singleton_005.phpt
index c9c9e34ebb..b8b1b69d76 100644
--- a/tests/classes/factory_and_singleton_005.phpt
+++ b/tests/classes/factory_and_singleton_005.phpt
@@ -16,7 +16,7 @@ $obj = NULL;
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Call to protected test::__destruct() from context ''' in %sfactory_and_singleton_005.php:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to protected test::__destruct() from context ''' in %sfactory_and_singleton_005.php:%d
 Stack trace:
 #0 {main}
   thrown in %sfactory_and_singleton_005.php on line %d
diff --git a/tests/classes/factory_and_singleton_006.phpt b/tests/classes/factory_and_singleton_006.phpt
index 8773ec6cd4..1176917155 100644
--- a/tests/classes/factory_and_singleton_006.phpt
+++ b/tests/classes/factory_and_singleton_006.phpt
@@ -16,7 +16,7 @@ $obj = NULL;
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private test::__destruct() from context ''' in %sfactory_and_singleton_006.php:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to private test::__destruct() from context ''' in %sfactory_and_singleton_006.php:%d
 Stack trace:
 #0 {main}
   thrown in %sfactory_and_singleton_006.php on line %d
diff --git a/tests/classes/factory_and_singleton_007.phpt b/tests/classes/factory_and_singleton_007.phpt
index 5dd4051257..04b402a487 100644
--- a/tests/classes/factory_and_singleton_007.phpt
+++ b/tests/classes/factory_and_singleton_007.phpt
@@ -17,7 +17,7 @@ $obj = NULL;
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Call to protected test::__clone() from context ''' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to protected test::__clone() from context ''' in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/factory_and_singleton_008.phpt b/tests/classes/factory_and_singleton_008.phpt
index 90c3ada4bb..624d6fbaa9 100644
--- a/tests/classes/factory_and_singleton_008.phpt
+++ b/tests/classes/factory_and_singleton_008.phpt
@@ -17,7 +17,7 @@ $obj = NULL;
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private test::__clone() from context ''' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to private test::__clone() from context ''' in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/interface_instantiate.phpt b/tests/classes/interface_instantiate.phpt
index a89f173aa4..bc3a0236f2 100644
--- a/tests/classes/interface_instantiate.phpt
+++ b/tests/classes/interface_instantiate.phpt
@@ -13,7 +13,7 @@ $t = new if_a();
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot instantiate interface if_a' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Cannot instantiate interface if_a' in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/interfaces_001.phpt b/tests/classes/interfaces_001.phpt
index 41e1f6776d..68f85512e7 100644
--- a/tests/classes/interfaces_001.phpt
+++ b/tests/classes/interfaces_001.phpt
@@ -5,11 +5,11 @@ ZE2 interfaces
 --FILE--
 <?php
 
-interface Throwable {
+interface ThrowableInterface {
 	public function getMessage();
 }
 
-class Exception_foo implements Throwable {
+class Exception_foo implements ThrowableInterface {
 	public $foo = "foo";
 
 	public function getMessage() {
diff --git a/tests/classes/interfaces_002.phpt b/tests/classes/interfaces_002.phpt
index d26b5349bf..803598be6d 100644
--- a/tests/classes/interfaces_002.phpt
+++ b/tests/classes/interfaces_002.phpt
@@ -5,12 +5,12 @@ ZE2 interface with an unimplemented method
 --FILE--
 <?php
 
-interface Throwable {
+interface ThrowableInterface {
 	public function getMessage();
 	public function getErrno();
 }
 
-class Exception_foo implements Throwable {
+class Exception_foo implements ThrowableInterface {
 	public $foo = "foo";
 
 	public function getMessage() {
@@ -26,4 +26,4 @@ echo "Message: " . $foo->getMessage() . "\n";
 ===DONE===
 --EXPECTF--
 
-Fatal error: Class Exception_foo contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (Throwable::getErrno) in %s on line %d
+Fatal error: Class Exception_foo contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (ThrowableInterface::getErrno) in %s on line %d
diff --git a/tests/classes/private_001.phpt b/tests/classes/private_001.phpt
index a6b27235b0..2bedd6aced 100644
--- a/tests/classes/private_001.phpt
+++ b/tests/classes/private_001.phpt
@@ -23,7 +23,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call show()
 
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method pass::show() from context ''' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to private method pass::show() from context ''' in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/private_002.phpt b/tests/classes/private_002.phpt
index 7cb41e7e7f..333c406cc1 100644
--- a/tests/classes/private_002.phpt
+++ b/tests/classes/private_002.phpt
@@ -32,7 +32,7 @@ echo "Done\n"; // shouldn't be displayed
 Call pass::show()
 Call fail::show()
 
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
 Stack trace:
 #0 %s(%d): fail::show()
 #1 {main}
diff --git a/tests/classes/private_003.phpt b/tests/classes/private_003.phpt
index c8209457bd..d7d42ce1d3 100644
--- a/tests/classes/private_003.phpt
+++ b/tests/classes/private_003.phpt
@@ -33,7 +33,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call show()
 
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
 Stack trace:
 #0 %s(%d): fail::not_ok()
 #1 {main}
diff --git a/tests/classes/private_003b.phpt b/tests/classes/private_003b.phpt
index a4f7701ada..2b77d84c46 100644
--- a/tests/classes/private_003b.phpt
+++ b/tests/classes/private_003b.phpt
@@ -34,7 +34,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call show()
 
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
 Stack trace:
 #0 %s(%d): fail->not_ok()
 #1 {main}
diff --git a/tests/classes/private_004.phpt b/tests/classes/private_004.phpt
index 379cc27a59..326c23da4f 100644
--- a/tests/classes/private_004.phpt
+++ b/tests/classes/private_004.phpt
@@ -29,7 +29,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call show()
 
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
 Stack trace:
 #0 %s(%d): fail::do_show()
 #1 {main}
diff --git a/tests/classes/private_004b.phpt b/tests/classes/private_004b.phpt
index 91433aadc1..85ac9433e4 100644
--- a/tests/classes/private_004b.phpt
+++ b/tests/classes/private_004b.phpt
@@ -32,7 +32,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call show()
 
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
 Stack trace:
 #0 %s(%d): fail->do_show()
 #1 {main}
diff --git a/tests/classes/private_005.phpt b/tests/classes/private_005.phpt
index 32c05fe358..41314d25af 100644
--- a/tests/classes/private_005.phpt
+++ b/tests/classes/private_005.phpt
@@ -29,7 +29,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call show()
 
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
 Stack trace:
 #0 %s(%d): fail::do_show()
 #1 {main}
diff --git a/tests/classes/private_005b.phpt b/tests/classes/private_005b.phpt
index 91433aadc1..85ac9433e4 100644
--- a/tests/classes/private_005b.phpt
+++ b/tests/classes/private_005b.phpt
@@ -32,7 +32,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call show()
 
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
 Stack trace:
 #0 %s(%d): fail->do_show()
 #1 {main}
diff --git a/tests/classes/private_redeclare.phpt b/tests/classes/private_redeclare.phpt
index 067cd7d9d2..75200b19e4 100644
--- a/tests/classes/private_redeclare.phpt
+++ b/tests/classes/private_redeclare.phpt
@@ -35,7 +35,7 @@ test
 derived
 base
 
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method base::show() from context 'derived'' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to private method base::show() from context 'derived'' in %s:%d
 Stack trace:
 #0 %s(%d): derived->test()
 #1 {main}
diff --git a/tests/classes/property_recreate_private.phpt b/tests/classes/property_recreate_private.phpt
index fe7c7d249f..019e406d0b 100644
--- a/tests/classes/property_recreate_private.phpt
+++ b/tests/classes/property_recreate_private.phpt
@@ -78,7 +78,7 @@ object(C)#%d (1) {
 
 Unset a private property, and attempt to recreate at global scope (expecting failure):
 
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot access private property C::$p' in %s:46
+Fatal error: Uncaught exception 'Error' with message 'Cannot access private property C::$p' in %s:46
 Stack trace:
 #0 {main}
   thrown in %s on line 46
diff --git a/tests/classes/property_recreate_protected.phpt b/tests/classes/property_recreate_protected.phpt
index 01d156bff2..b3efedee79 100644
--- a/tests/classes/property_recreate_protected.phpt
+++ b/tests/classes/property_recreate_protected.phpt
@@ -50,7 +50,7 @@ object(D)#%d (1) {
 
 Unset a protected property, and attempt to recreate it outside of scope (expected failure):
 
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot access protected property %s::$p' in %s:32
+Fatal error: Uncaught exception 'Error' with message 'Cannot access protected property %s::$p' in %s:32
 Stack trace:
 #0 {main}
   thrown in %s on line 32
diff --git a/tests/classes/protected_001.phpt b/tests/classes/protected_001.phpt
index dce77ac666..8104e28a84 100644
--- a/tests/classes/protected_001.phpt
+++ b/tests/classes/protected_001.phpt
@@ -23,7 +23,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call fail()
 
-Fatal error: Uncaught exception 'EngineException' with message 'Call to protected method pass::fail() from context ''' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to protected method pass::fail() from context ''' in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/protected_001b.phpt b/tests/classes/protected_001b.phpt
index c9139c711d..62ce61fef5 100644
--- a/tests/classes/protected_001b.phpt
+++ b/tests/classes/protected_001b.phpt
@@ -24,7 +24,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call fail()
 
-Fatal error: Uncaught exception 'EngineException' with message 'Call to protected method pass::fail() from context ''' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to protected method pass::fail() from context ''' in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/protected_002.phpt b/tests/classes/protected_002.phpt
index 837cc552ae..c71d3bc214 100644
--- a/tests/classes/protected_002.phpt
+++ b/tests/classes/protected_002.phpt
@@ -32,7 +32,7 @@ echo "Done\n"; // shouldn't be displayed
 Call pass::show()
 Call fail::show()
 
-Fatal error: Uncaught exception 'EngineException' with message 'Call to protected method pass::show() from context 'fail'' in %s:%d
+Fatal error: Uncaught exception 'Error' with message 'Call to protected method pass::show() from context 'fail'' in %s:%d
 Stack trace:
 #0 %s(%d): fail::show()
 #1 {main}
diff --git a/tests/classes/static_properties_003_error1.phpt b/tests/classes/static_properties_003_error1.phpt
index b7673f70d5..4db201a52a 100644
--- a/tests/classes/static_properties_003_error1.phpt
+++ b/tests/classes/static_properties_003_error1.phpt
@@ -15,7 +15,7 @@ unset($c->y);
 
 --> Access non-visible static prop like instance prop:
 
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot access protected property C::$y' in %s:8
+Fatal error: Uncaught exception 'Error' with message 'Cannot access protected property C::$y' in %s:8
 Stack trace:
 #0 {main}
   thrown in %s on line 8
diff --git a/tests/classes/static_properties_003_error2.phpt b/tests/classes/static_properties_003_error2.phpt
index 3183e2f73a..abc57073e7 100644
--- a/tests/classes/static_properties_003_error2.phpt
+++ b/tests/classes/static_properties_003_error2.phpt
@@ -15,7 +15,7 @@ echo $c->y;
 
 --> Access non-visible static prop like instance prop:
 
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot access protected property C::$y' in %s:8
+Fatal error: Uncaught exception 'Error' with message 'Cannot access protected property C::$y' in %s:8
 Stack trace:
 #0 {main}
   thrown in %s on line 8
diff --git a/tests/classes/static_properties_003_error3.phpt b/tests/classes/static_properties_003_error3.phpt
index f0368a3763..8fad30ff29 100644
--- a/tests/classes/static_properties_003_error3.phpt
+++ b/tests/classes/static_properties_003_error3.phpt
@@ -15,7 +15,7 @@ $c->y = 1;
 
 --> Access non-visible static prop like instance prop:
 
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot access protected property C::$y' in %s:8
+Fatal error: Uncaught exception 'Error' with message 'Cannot access protected property C::$y' in %s:8
 Stack trace:
 #0 {main}
   thrown in %s on line 8
diff --git a/tests/classes/static_properties_003_error4.phpt b/tests/classes/static_properties_003_error4.phpt
index a6fa9d4044..22bf444c36 100644
--- a/tests/classes/static_properties_003_error4.phpt
+++ b/tests/classes/static_properties_003_error4.phpt
@@ -15,11 +15,11 @@ $c->y =& $ref;
 
 --> Access non-visible static prop like instance prop:
 
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot access protected property C::$y' in %s:8
+Fatal error: Uncaught exception 'Error' with message 'Cannot access protected property C::$y' in %s:8
 Stack trace:
 #0 {main}
 
-Next exception 'EngineException' with message 'Cannot access protected property C::$y' in %s:8
+Next exception 'Error' with message 'Cannot access protected property C::$y' in %s:8
 Stack trace:
 #0 {main}
   thrown in %s on line 8
diff --git a/tests/classes/static_properties_undeclared_assign.phpt b/tests/classes/static_properties_undeclared_assign.phpt
index d2918fa509..2c515f1b78 100644
--- a/tests/classes/static_properties_undeclared_assign.phpt
+++ b/tests/classes/static_properties_undeclared_assign.phpt
@@ -6,7 +6,7 @@ Class C {}
 C::$p = 1;
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Access to undeclared static property: C::$p' in %s:3
+Fatal error: Uncaught exception 'Error' with message 'Access to undeclared static property: C::$p' in %s:3
 Stack trace:
 #0 {main}
   thrown in %s on line 3
diff --git a/tests/classes/static_properties_undeclared_assignInc.phpt b/tests/classes/static_properties_undeclared_assignInc.phpt
index bd015a0483..a53b9c52d2 100644
--- a/tests/classes/static_properties_undeclared_assignInc.phpt
+++ b/tests/classes/static_properties_undeclared_assignInc.phpt
@@ -6,7 +6,7 @@ Class C {}
 C::$p += 1;
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Access to undeclared static property: C::$p' in %s:3
+Fatal error: Uncaught exception 'Error' with message 'Access to undeclared static property: C::$p' in %s:3
 Stack trace:
 #0 {main}
   thrown in %s on line 3
diff --git a/tests/classes/static_properties_undeclared_assignRef.phpt b/tests/classes/static_properties_undeclared_assignRef.phpt
index 4b01191616..20eda3d934 100644
--- a/tests/classes/static_properties_undeclared_assignRef.phpt
+++ b/tests/classes/static_properties_undeclared_assignRef.phpt
@@ -7,7 +7,7 @@ $a = 'foo';
 C::$p =& $a;
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Access to undeclared static property: C::$p' in %s:4
+Fatal error: Uncaught exception 'Error' with message 'Access to undeclared static property: C::$p' in %s:4
 Stack trace:
 #0 {main}
   thrown in %s on line 4
diff --git a/tests/classes/static_properties_undeclared_inc.phpt b/tests/classes/static_properties_undeclared_inc.phpt
index 2b5359063f..273674a307 100644
--- a/tests/classes/static_properties_undeclared_inc.phpt
+++ b/tests/classes/static_properties_undeclared_inc.phpt
@@ -6,7 +6,7 @@ Class C {}
 C::$p++;
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Access to undeclared static property: C::$p' in %s:3
+Fatal error: Uncaught exception 'Error' with message 'Access to undeclared static property: C::$p' in %s:3
 Stack trace:
 #0 {main}
   thrown in %s on line 3
diff --git a/tests/classes/static_properties_undeclared_read.phpt b/tests/classes/static_properties_undeclared_read.phpt
index 13dc6ed748..e6ac05a90d 100644
--- a/tests/classes/static_properties_undeclared_read.phpt
+++ b/tests/classes/static_properties_undeclared_read.phpt
@@ -6,7 +6,7 @@ Class C {}
 echo C::$p;
 ?>
 --EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Access to undeclared static property: C::$p' in %s:3
+Fatal error: Uncaught exception 'Error' with message 'Access to undeclared static property: C::$p' in %s:3
 Stack trace:
 #0 {main}
   thrown in %s on line 3
diff --git a/tests/classes/type_hinting_004.phpt b/tests/classes/type_hinting_004.phpt
index d533699b8b..c5f8d3984b 100644
--- a/tests/classes/type_hinting_004.phpt
+++ b/tests/classes/type_hinting_004.phpt
@@ -18,32 +18,32 @@ Ensure type hints are enforced for functions invoked as callbacks.
   }
   try {
     call_user_func('f1', 1);
-  } catch (EngineException $ex) {
+  } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
   try {
     call_user_func('f1', new A);
-  } catch (EngineException $ex) {
+  } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
   try {
     call_user_func('f2', 1);
-  } catch (EngineException $ex) {
+  } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
   try {
     call_user_func('f2');
-  } catch (EngineException $ex) {
+  } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
   try {
     call_user_func('f2', new A);
-  } catch (EngineException $ex) {
+  } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
   try {
     call_user_func('f2', null);
-  } catch (EngineException $ex) {
+  } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
   
@@ -67,32 +67,32 @@ Ensure type hints are enforced for functions invoked as callbacks.
 
   try {
     call_user_func(array('C', 'f1'), 1);
-  } catch (EngineException $ex) {
+  } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
   try {
     call_user_func(array('C', 'f1'), new A);
-  } catch (EngineException $ex) {
+  } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
   try {
     call_user_func(array('C', 'f2'), 1);
-  } catch (EngineException $ex) {
+  } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
   try {
     call_user_func(array('C', 'f2'));
-  } catch (EngineException $ex) {
+  } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
   try {
     call_user_func(array('C', 'f2'), new A);
-  } catch (EngineException $ex) {
+  } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
   try {
     call_user_func(array('C', 'f2'), null);
-  } catch (EngineException $ex) {
+  } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
   
@@ -117,32 +117,32 @@ Ensure type hints are enforced for functions invoked as callbacks.
 
   try {
     call_user_func(array($d, 'f1'), 1);
-  } catch (EngineException $ex) {
+  } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
   try {
     call_user_func(array($d, 'f1'), new A);
-  } catch (EngineException $ex) {
+  } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
   try {
     call_user_func(array($d, 'f2'), 1);
-  } catch (EngineException $ex) {
+  } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
   try {
     call_user_func(array($d, 'f2'));
-  } catch (EngineException $ex) {
+  } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
   try {
     call_user_func(array($d, 'f2'), new A);
-  } catch (EngineException $ex) {
+  } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
   try {
     call_user_func(array($d, 'f2'), null);
-  } catch (EngineException $ex) {
+  } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
   
diff --git a/tests/lang/041.phpt b/tests/lang/041.phpt
index 72ab0e4a62..eef75bdb3f 100644
--- a/tests/lang/041.phpt
+++ b/tests/lang/041.phpt
@@ -17,7 +17,7 @@ echo $wrongClassname::$b."\n";
 --EXPECTF--
 foo
 
-Fatal error: Uncaught exception 'EngineException' with message 'Class 'B' not found' in %s041.php:%d
+Fatal error: Uncaught exception 'Error' with message 'Class 'B' not found' in %s041.php:%d
 Stack trace:
 #0 {main}
   thrown in %s041.php on line %d
diff --git a/tests/lang/042.phpt b/tests/lang/042.phpt
index ad6e081222..6e6ae419b2 100644
--- a/tests/lang/042.phpt
+++ b/tests/lang/042.phpt
@@ -16,7 +16,7 @@ echo $wrongClassname::B."\n";
 --EXPECTF--
 foo
 
-Fatal error: Uncaught exception 'EngineException' with message 'Class 'B' not found' in %s042.php:%d
+Fatal error: Uncaught exception 'Error' with message 'Class 'B' not found' in %s042.php:%d
 Stack trace:
 #0 {main}
   thrown in %s042.php on line %d
diff --git a/tests/lang/043.phpt b/tests/lang/043.phpt
index 8425d9f3d3..444cc23be6 100644
--- a/tests/lang/043.phpt
+++ b/tests/lang/043.phpt
@@ -16,7 +16,7 @@ echo $wrongClassname::foo()."\n";
 --EXPECTF--
 foo
 
-Fatal error: Uncaught exception 'EngineException' with message 'Class 'B' not found' in %s043.php:%d
+Fatal error: Uncaught exception 'Error' with message 'Class 'B' not found' in %s043.php:%d
 Stack trace:
 #0 {main}
   thrown in %s043.php on line %d
diff --git a/tests/lang/044.phpt b/tests/lang/044.phpt
index bc5900a301..87255061ba 100644
--- a/tests/lang/044.phpt
+++ b/tests/lang/044.phpt
@@ -18,7 +18,7 @@ echo $wrongClassname::$methodname()."\n";
 --EXPECTF--
 foo
 
-Fatal error: Uncaught exception 'EngineException' with message 'Class 'B' not found' in %s044.php:%d
+Fatal error: Uncaught exception 'Error' with message 'Class 'B' not found' in %s044.php:%d
 Stack trace:
 #0 {main}
   thrown in %s044.php on line %d
diff --git a/tests/lang/catchable_error_002.phpt b/tests/lang/catchable_error_002.phpt
index bc585f7b10..10312533c1 100644
--- a/tests/lang/catchable_error_002.phpt
+++ b/tests/lang/catchable_error_002.phpt
@@ -19,7 +19,7 @@ Catchable fatal error [2]
 
 	try {
 		blah (new StdClass);
-	} catch (engineException $ex) {
+	} catch (Error $ex) {
 	    echo $ex->getMessage(), "\n";
 	}
 	echo "ALIVE!\n";
diff --git a/tests/lang/foreachLoopIterator.002.phpt b/tests/lang/foreachLoopIterator.002.phpt
index 713aaaa8f8..113d7c1ac2 100644
--- a/tests/lang/foreachLoopIterator.002.phpt
+++ b/tests/lang/foreachLoopIterator.002.phpt
@@ -21,7 +21,7 @@ foreach ($f as $k=>&$v) {
 --EXPECTF--
 -----( Try to iterate with &$value: )-----
 
-Fatal error: Uncaught exception 'EngineException' with message 'An iterator cannot be used with foreach by reference' in %s:13
+Fatal error: Uncaught exception 'Error' with message 'An iterator cannot be used with foreach by reference' in %s:13
 Stack trace:
 #0 {main}
   thrown in %s on line 13