Tweak uncaught exception message display

This implements a reduced variant of #1226 with just the following
change:

-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d
+Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d

The '' wrapper around messages is very weird if the exception
message itself contains ''. Futhermore having the message wrapped
in '' doesn't work for the "and defined" suffix of
TypeExceptions.

41 files changed, 42 insertions, 42 deletions

diff --git a/tests/classes/abstract.phpt b/tests/classes/abstract.phpt
index c827d27108..811aa45a13 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 EngineException: 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..1725d45762 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 EngineException: 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..1657599787 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 EngineException: 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..5118efda99 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 EngineException: 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..ef8553493f 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 EngineException: 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..c3945ed4b3 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 EngineException: 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..1555f5343c 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 EngineException: 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..04b21b5259 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 EngineException: 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..457584df32 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 EngineException: 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..69383675a1 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 EngineException: 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..40a62f2ec4 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 EngineException: 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..272773c439 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 EngineException: 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..89c4f161ea 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 EngineException: 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..e4911f086f 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 EngineException: 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..38b8ceb155 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 EngineException: 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..c86243bcfd 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 EngineException: 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..d6041b0105 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 EngineException: 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..310dc8800d 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 EngineException: Cannot instantiate interface if_a in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/private_001.phpt b/tests/classes/private_001.phpt
index a6b27235b0..11574ccde3 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 EngineException: 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..664c95837f 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 EngineException: 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..ce18af196e 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 EngineException: 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..27f398d839 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 EngineException: 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..7ebd72da3b 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 EngineException: 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..5bb9f05b15 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 EngineException: 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..acd9f825b5 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 EngineException: 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..5bb9f05b15 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 EngineException: 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..a1b3e459d7 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 EngineException: 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..c392d077b5 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 EngineException: 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..d5f4b45791 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 EngineException: 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..fe48ebe67b 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 EngineException: 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..a1c69b9729 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 EngineException: 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..e67c6b2f3d 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 EngineException: 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..4b8efe2bf4 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 EngineException: 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..c43666fbb1 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 EngineException: 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..8cee25a5e6 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 EngineException: 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..3b01351c7a 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 EngineException: 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 EngineException: 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..71859abce3 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 EngineException: 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..3f73220de4 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 EngineException: 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..8d6b74e9f8 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 EngineException: 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..56f8606f36 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 EngineException: 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..658bc049ab 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 EngineException: Access to undeclared static property: C::$p in %s:3
 Stack trace:
 #0 {main}
   thrown in %s on line 3