summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/classes/abstract.phpt6
-rw-r--r--tests/classes/abstract_class.phpt5
-rw-r--r--tests/classes/abstract_inherit.phpt5
-rw-r--r--tests/classes/abstract_user_call.phpt5
-rw-r--r--tests/classes/array_access_012.phpt5
-rw-r--r--tests/classes/autoload_021.phpt5
-rw-r--r--tests/classes/bug27504.phpt5
-rw-r--r--tests/classes/class_abstract.phpt5
-rw-r--r--tests/classes/constants_basic_001.phpt5
-rw-r--r--tests/classes/ctor_visibility.phpt7
-rw-r--r--tests/classes/destructor_visibility_001.phpt5
-rw-r--r--tests/classes/factory_and_singleton_003.phpt5
-rw-r--r--tests/classes/factory_and_singleton_004.phpt5
-rw-r--r--tests/classes/factory_and_singleton_005.phpt5
-rw-r--r--tests/classes/factory_and_singleton_006.phpt5
-rw-r--r--tests/classes/factory_and_singleton_007.phpt5
-rw-r--r--tests/classes/factory_and_singleton_008.phpt5
-rw-r--r--tests/classes/interface_instantiate.phpt5
-rw-r--r--tests/classes/private_001.phpt5
-rw-r--r--tests/classes/private_002.phpt6
-rw-r--r--tests/classes/private_003.phpt6
-rw-r--r--tests/classes/private_003b.phpt6
-rw-r--r--tests/classes/private_004.phpt6
-rw-r--r--tests/classes/private_004b.phpt6
-rw-r--r--tests/classes/private_005.phpt6
-rw-r--r--tests/classes/private_005b.phpt6
-rw-r--r--tests/classes/private_redeclare.phpt6
-rw-r--r--tests/classes/property_recreate_private.phpt5
-rw-r--r--tests/classes/property_recreate_protected.phpt5
-rw-r--r--tests/classes/protected_001.phpt5
-rw-r--r--tests/classes/protected_001b.phpt5
-rw-r--r--tests/classes/protected_002.phpt6
-rw-r--r--tests/classes/static_properties_003_error1.phpt5
-rw-r--r--tests/classes/static_properties_003_error2.phpt5
-rw-r--r--tests/classes/static_properties_003_error3.phpt5
-rw-r--r--tests/classes/static_properties_003_error4.phpt9
-rw-r--r--tests/classes/static_properties_undeclared_assign.phpt5
-rw-r--r--tests/classes/static_properties_undeclared_assignInc.phpt5
-rw-r--r--tests/classes/static_properties_undeclared_assignRef.phpt5
-rw-r--r--tests/classes/static_properties_undeclared_inc.phpt5
-rw-r--r--tests/classes/static_properties_undeclared_read.phpt5
-rw-r--r--tests/lang/041.phpt5
-rw-r--r--tests/lang/042.phpt5
-rw-r--r--tests/lang/043.phpt5
-rw-r--r--tests/lang/044.phpt5
-rw-r--r--tests/lang/foreachLoopIterator.002.phpt5
46 files changed, 200 insertions, 46 deletions
diff --git a/tests/classes/abstract.phpt b/tests/classes/abstract.phpt
index fbebf4da73..c827d27108 100644
--- a/tests/classes/abstract.phpt
+++ b/tests/classes/abstract.phpt
@@ -27,4 +27,8 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call to function show()
-Fatal error: Cannot call abstract method fail::show() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot call abstract method fail::show()' in %s:%d
+Stack trace:
+#0 %s(%d): pass->error()
+#1 {main}
+ thrown in %s on line %d
diff --git a/tests/classes/abstract_class.phpt b/tests/classes/abstract_class.phpt
index 571a9b9581..097cab1324 100644
--- a/tests/classes/abstract_class.phpt
+++ b/tests/classes/abstract_class.phpt
@@ -26,4 +26,7 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call to function show()
-Fatal error: Cannot instantiate abstract class fail in %s on line %d
+Fatal error: Uncaught exception 'EngineException' 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 362ccb0b76..baf2a79f60 100644
--- a/tests/classes/abstract_inherit.phpt
+++ b/tests/classes/abstract_inherit.phpt
@@ -19,4 +19,7 @@ echo "Done\n"; // Shouldn't be displayed
?>
--EXPECTF--
-Fatal error: Cannot instantiate abstract class fail in %s on line %d
+Fatal error: Uncaught exception 'EngineException' 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 0e1ddbe796..f19bb7c603 100644
--- a/tests/classes/abstract_user_call.phpt
+++ b/tests/classes/abstract_user_call.phpt
@@ -27,4 +27,7 @@ call_user_func(array($o, 'test_base::func'));
--EXPECTF--
test::func()
-Fatal error: Cannot call abstract method test_base::func() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' 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 8f85f296eb..c37eaf2465 100644
--- a/tests/classes/array_access_012.phpt
+++ b/tests/classes/array_access_012.phpt
@@ -33,4 +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: Cannot assign by reference to overloaded object 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
+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 13562b4000..5ec4ada9df 100644
--- a/tests/classes/autoload_021.phpt
+++ b/tests/classes/autoload_021.phpt
@@ -10,4 +10,7 @@ $x = new $a;
echo "BUG\n";
?>
--EXPECTF--
-Fatal error: Class '../BUG' not found in %sautoload_021.php on line 6
+Fatal error: Uncaught exception 'EngineException' 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 5f2c5a03ce..14ab661dae 100644
--- a/tests/classes/bug27504.phpt
+++ b/tests/classes/bug27504.phpt
@@ -22,4 +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: Call to private method foo::bar() from context '' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' 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 880f84930f..3de53c35dd 100644
--- a/tests/classes/class_abstract.phpt
+++ b/tests/classes/class_abstract.phpt
@@ -25,4 +25,7 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
base
-Fatal error: Cannot instantiate abstract class base in %s on line %d
+Fatal error: Uncaught exception 'EngineException' 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 74b0fcdf48..a9fbcbb48e 100644
--- a/tests/classes/constants_basic_001.phpt
+++ b/tests/classes/constants_basic_001.phpt
@@ -86,4 +86,7 @@ string(6) "hello2"
Expecting fatal error:
-Fatal error: Undefined class constant 'c19' in %s on line 53
+Fatal error: Uncaught exception 'EngineException' 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 8d3b1c5c50..5014b0fbe2 100644
--- a/tests/classes/ctor_visibility.phpt
+++ b/tests/classes/ctor_visibility.phpt
@@ -66,4 +66,9 @@ Test::__construct()
TestPriv::__construct()
DerivedPriv::__construct()
-Fatal error: Cannot call private TestPriv::__construct() in %sctor_visibility.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot call private TestPriv::__construct()' in %sctor_visibility.php:%d
+Stack trace:
+#0 %s(%d): DerivedPriv->__construct()
+#1 %s(%d): DerivedPriv::f()
+#2 {main}
+ thrown in %sctor_visibility.php on line %d
diff --git a/tests/classes/destructor_visibility_001.phpt b/tests/classes/destructor_visibility_001.phpt
index 7674c512f6..0b3a3aa7d0 100644
--- a/tests/classes/destructor_visibility_001.phpt
+++ b/tests/classes/destructor_visibility_001.phpt
@@ -21,4 +21,7 @@ unset($obj);
?>
===DONE===
--EXPECTF--
-Fatal error: Call to private Derived::__destruct() from context '' in %sdestructor_visibility_001.php on line %d
+Fatal error: Uncaught exception 'EngineException' 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 3d50a810a6..5dcb67a0c2 100644
--- a/tests/classes/factory_and_singleton_003.phpt
+++ b/tests/classes/factory_and_singleton_003.phpt
@@ -15,4 +15,7 @@ $obj = new test;
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Call to protected test::__construct() from invalid context in %s on line %d
+Fatal error: Uncaught exception 'EngineException' 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 14edcb1fc8..c3787c05fc 100644
--- a/tests/classes/factory_and_singleton_004.phpt
+++ b/tests/classes/factory_and_singleton_004.phpt
@@ -15,4 +15,7 @@ $obj = new test;
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Call to private test::__construct() from invalid context in %s on line %d
+Fatal error: Uncaught exception 'EngineException' 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 2cd7e5cc99..c9c9e34ebb 100644
--- a/tests/classes/factory_and_singleton_005.phpt
+++ b/tests/classes/factory_and_singleton_005.phpt
@@ -16,4 +16,7 @@ $obj = NULL;
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Call to protected test::__destruct() from context '' in %sfactory_and_singleton_005.php on line %d
+Fatal error: Uncaught exception 'EngineException' 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 81cf714888..8773ec6cd4 100644
--- a/tests/classes/factory_and_singleton_006.phpt
+++ b/tests/classes/factory_and_singleton_006.phpt
@@ -16,5 +16,8 @@ $obj = NULL;
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Call to private test::__destruct() from context '' in %sfactory_and_singleton_006.php on line %d
+Fatal error: Uncaught exception 'EngineException' 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 4788dbf087..5dd4051257 100644
--- a/tests/classes/factory_and_singleton_007.phpt
+++ b/tests/classes/factory_and_singleton_007.phpt
@@ -17,4 +17,7 @@ $obj = NULL;
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Call to protected test::__clone() from context '' %sfactory_and_singleton_007.php on line %d
+Fatal error: Uncaught exception 'EngineException' 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 750b9db340..90c3ada4bb 100644
--- a/tests/classes/factory_and_singleton_008.phpt
+++ b/tests/classes/factory_and_singleton_008.phpt
@@ -17,4 +17,7 @@ $obj = NULL;
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Call to private test::__clone() from context '' %sfactory_and_singleton_008.php on line %d
+Fatal error: Uncaught exception 'EngineException' 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 61c4e6b95b..a89f173aa4 100644
--- a/tests/classes/interface_instantiate.phpt
+++ b/tests/classes/interface_instantiate.phpt
@@ -13,4 +13,7 @@ $t = new if_a();
?>
--EXPECTF--
-Fatal error: Cannot instantiate interface if_a in %s on line %d
+Fatal error: Uncaught exception 'EngineException' 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/private_001.phpt b/tests/classes/private_001.phpt
index 310b9c6434..a6b27235b0 100644
--- a/tests/classes/private_001.phpt
+++ b/tests/classes/private_001.phpt
@@ -23,4 +23,7 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call show()
-Fatal error: Call to private method pass::show() from context '' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' 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 258fd3a17d..7cb41e7e7f 100644
--- a/tests/classes/private_002.phpt
+++ b/tests/classes/private_002.phpt
@@ -32,4 +32,8 @@ echo "Done\n"; // shouldn't be displayed
Call pass::show()
Call fail::show()
-Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
+Stack trace:
+#0 %s(%d): fail::show()
+#1 {main}
+ thrown in %s on line %d
diff --git a/tests/classes/private_003.phpt b/tests/classes/private_003.phpt
index 716efbc8c7..c8209457bd 100644
--- a/tests/classes/private_003.phpt
+++ b/tests/classes/private_003.phpt
@@ -33,4 +33,8 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call show()
-Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
+Stack trace:
+#0 %s(%d): fail::not_ok()
+#1 {main}
+ thrown in %s on line %d
diff --git a/tests/classes/private_003b.phpt b/tests/classes/private_003b.phpt
index 780b2e6b4c..a4f7701ada 100644
--- a/tests/classes/private_003b.phpt
+++ b/tests/classes/private_003b.phpt
@@ -34,4 +34,8 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call show()
-Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
+Stack trace:
+#0 %s(%d): fail->not_ok()
+#1 {main}
+ thrown in %s on line %d
diff --git a/tests/classes/private_004.phpt b/tests/classes/private_004.phpt
index 027434ab87..379cc27a59 100644
--- a/tests/classes/private_004.phpt
+++ b/tests/classes/private_004.phpt
@@ -29,4 +29,8 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call show()
-Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
+Stack trace:
+#0 %s(%d): fail::do_show()
+#1 {main}
+ thrown in %s on line %d
diff --git a/tests/classes/private_004b.phpt b/tests/classes/private_004b.phpt
index 2d1850b519..91433aadc1 100644
--- a/tests/classes/private_004b.phpt
+++ b/tests/classes/private_004b.phpt
@@ -32,4 +32,8 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call show()
-Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
+Stack trace:
+#0 %s(%d): fail->do_show()
+#1 {main}
+ thrown in %s on line %d
diff --git a/tests/classes/private_005.phpt b/tests/classes/private_005.phpt
index 49b2bee3ba..32c05fe358 100644
--- a/tests/classes/private_005.phpt
+++ b/tests/classes/private_005.phpt
@@ -29,4 +29,8 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call show()
-Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
+Stack trace:
+#0 %s(%d): fail::do_show()
+#1 {main}
+ thrown in %s on line %d
diff --git a/tests/classes/private_005b.phpt b/tests/classes/private_005b.phpt
index 2d1850b519..91433aadc1 100644
--- a/tests/classes/private_005b.phpt
+++ b/tests/classes/private_005b.phpt
@@ -32,4 +32,8 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call show()
-Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to private method pass::show() from context 'fail'' in %s:%d
+Stack trace:
+#0 %s(%d): fail->do_show()
+#1 {main}
+ thrown in %s on line %d
diff --git a/tests/classes/private_redeclare.phpt b/tests/classes/private_redeclare.phpt
index e3061f1136..067cd7d9d2 100644
--- a/tests/classes/private_redeclare.phpt
+++ b/tests/classes/private_redeclare.phpt
@@ -35,4 +35,8 @@ test
derived
base
-Fatal error: Call to private method base::show() from context 'derived' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to private method base::show() from context 'derived'' in %s:%d
+Stack trace:
+#0 %s(%d): derived->test()
+#1 {main}
+ thrown in %s on line %d
diff --git a/tests/classes/property_recreate_private.phpt b/tests/classes/property_recreate_private.phpt
index 410395e0e0..fe7c7d249f 100644
--- a/tests/classes/property_recreate_private.phpt
+++ b/tests/classes/property_recreate_private.phpt
@@ -78,4 +78,7 @@ object(C)#%d (1) {
Unset a private property, and attempt to recreate at global scope (expecting failure):
-Fatal error: Cannot access private property C::$p in %s on line 46
+Fatal error: Uncaught exception 'EngineException' 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 f8444c3a2f..01d156bff2 100644
--- a/tests/classes/property_recreate_protected.phpt
+++ b/tests/classes/property_recreate_protected.phpt
@@ -50,4 +50,7 @@ object(D)#%d (1) {
Unset a protected property, and attempt to recreate it outside of scope (expected failure):
-Fatal error: Cannot access protected property %s::$p in %s on line 32
+Fatal error: Uncaught exception 'EngineException' 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 19872c6f16..dce77ac666 100644
--- a/tests/classes/protected_001.phpt
+++ b/tests/classes/protected_001.phpt
@@ -23,4 +23,7 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call fail()
-Fatal error: Call to protected method pass::fail() from context '' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' 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 4d24a926ea..c9139c711d 100644
--- a/tests/classes/protected_001b.phpt
+++ b/tests/classes/protected_001b.phpt
@@ -24,4 +24,7 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call fail()
-Fatal error: Call to protected method pass::fail() from context '' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' 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 f26ef9c495..837cc552ae 100644
--- a/tests/classes/protected_002.phpt
+++ b/tests/classes/protected_002.phpt
@@ -32,4 +32,8 @@ echo "Done\n"; // shouldn't be displayed
Call pass::show()
Call fail::show()
-Fatal error: Call to protected method pass::show() from context 'fail' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to protected method pass::show() from context 'fail'' in %s:%d
+Stack trace:
+#0 %s(%d): fail::show()
+#1 {main}
+ thrown in %s on line %d
diff --git a/tests/classes/static_properties_003_error1.phpt b/tests/classes/static_properties_003_error1.phpt
index 7a5e3d931a..b7673f70d5 100644
--- a/tests/classes/static_properties_003_error1.phpt
+++ b/tests/classes/static_properties_003_error1.phpt
@@ -15,4 +15,7 @@ unset($c->y);
--> Access non-visible static prop like instance prop:
-Fatal error: Cannot access protected property C::$y in %s on line 8
+Fatal error: Uncaught exception 'EngineException' 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 589cc6909e..3183e2f73a 100644
--- a/tests/classes/static_properties_003_error2.phpt
+++ b/tests/classes/static_properties_003_error2.phpt
@@ -15,4 +15,7 @@ echo $c->y;
--> Access non-visible static prop like instance prop:
-Fatal error: Cannot access protected property C::$y in %s on line 8
+Fatal error: Uncaught exception 'EngineException' 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 3e01e0e42b..f0368a3763 100644
--- a/tests/classes/static_properties_003_error3.phpt
+++ b/tests/classes/static_properties_003_error3.phpt
@@ -15,4 +15,7 @@ $c->y = 1;
--> Access non-visible static prop like instance prop:
-Fatal error: Cannot access protected property C::$y in %s on line 8
+Fatal error: Uncaught exception 'EngineException' 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 fd69a9ffb8..a6fa9d4044 100644
--- a/tests/classes/static_properties_003_error4.phpt
+++ b/tests/classes/static_properties_003_error4.phpt
@@ -15,4 +15,11 @@ $c->y =& $ref;
--> Access non-visible static prop like instance prop:
-Fatal error: Cannot access protected property C::$y in %s on line 8
+Fatal error: Uncaught exception 'EngineException' 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
+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 aed65797b4..d2918fa509 100644
--- a/tests/classes/static_properties_undeclared_assign.phpt
+++ b/tests/classes/static_properties_undeclared_assign.phpt
@@ -6,4 +6,7 @@ Class C {}
C::$p = 1;
?>
--EXPECTF--
-Fatal error: Access to undeclared static property: C::$p in %s on line 3
+Fatal error: Uncaught exception 'EngineException' 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 9680bf5f15..bd015a0483 100644
--- a/tests/classes/static_properties_undeclared_assignInc.phpt
+++ b/tests/classes/static_properties_undeclared_assignInc.phpt
@@ -6,4 +6,7 @@ Class C {}
C::$p += 1;
?>
--EXPECTF--
-Fatal error: Access to undeclared static property: C::$p in %s on line 3
+Fatal error: Uncaught exception 'EngineException' 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 9f677f6c58..4b01191616 100644
--- a/tests/classes/static_properties_undeclared_assignRef.phpt
+++ b/tests/classes/static_properties_undeclared_assignRef.phpt
@@ -7,4 +7,7 @@ $a = 'foo';
C::$p =& $a;
?>
--EXPECTF--
-Fatal error: Access to undeclared static property: C::$p in %s on line 4
+Fatal error: Uncaught exception 'EngineException' 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 a9b28d6cdd..2b5359063f 100644
--- a/tests/classes/static_properties_undeclared_inc.phpt
+++ b/tests/classes/static_properties_undeclared_inc.phpt
@@ -6,4 +6,7 @@ Class C {}
C::$p++;
?>
--EXPECTF--
-Fatal error: Access to undeclared static property: C::$p in %s on line 3
+Fatal error: Uncaught exception 'EngineException' 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 ae518d8ee1..13dc6ed748 100644
--- a/tests/classes/static_properties_undeclared_read.phpt
+++ b/tests/classes/static_properties_undeclared_read.phpt
@@ -6,4 +6,7 @@ Class C {}
echo C::$p;
?>
--EXPECTF--
-Fatal error: Access to undeclared static property: C::$p in %s on line 3
+Fatal error: Uncaught exception 'EngineException' 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/lang/041.phpt b/tests/lang/041.phpt
index 6972412d5b..72ab0e4a62 100644
--- a/tests/lang/041.phpt
+++ b/tests/lang/041.phpt
@@ -17,4 +17,7 @@ echo $wrongClassname::$b."\n";
--EXPECTF--
foo
-Fatal error: Class 'B' not found in %s041.php on line %d
+Fatal error: Uncaught exception 'EngineException' 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 217aab83e3..ad6e081222 100644
--- a/tests/lang/042.phpt
+++ b/tests/lang/042.phpt
@@ -16,4 +16,7 @@ echo $wrongClassname::B."\n";
--EXPECTF--
foo
-Fatal error: Class 'B' not found in %s042.php on line %d
+Fatal error: Uncaught exception 'EngineException' 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 7ca2d74b69..8425d9f3d3 100644
--- a/tests/lang/043.phpt
+++ b/tests/lang/043.phpt
@@ -16,4 +16,7 @@ echo $wrongClassname::foo()."\n";
--EXPECTF--
foo
-Fatal error: Class 'B' not found in %s043.php on line %d
+Fatal error: Uncaught exception 'EngineException' 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 a0de889a7a..bc5900a301 100644
--- a/tests/lang/044.phpt
+++ b/tests/lang/044.phpt
@@ -18,4 +18,7 @@ echo $wrongClassname::$methodname()."\n";
--EXPECTF--
foo
-Fatal error: Class 'B' not found in %s044.php on line %d
+Fatal error: Uncaught exception 'EngineException' 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/foreachLoopIterator.002.phpt b/tests/lang/foreachLoopIterator.002.phpt
index fda3fdfb2b..713aaaa8f8 100644
--- a/tests/lang/foreachLoopIterator.002.phpt
+++ b/tests/lang/foreachLoopIterator.002.phpt
@@ -21,4 +21,7 @@ foreach ($f as $k=>&$v) {
--EXPECTF--
-----( Try to iterate with &$value: )-----
-Fatal error: An iterator cannot be used with foreach by reference in %s on line 13
+Fatal error: Uncaught exception 'EngineException' with message 'An iterator cannot be used with foreach by reference' in %s:13
+Stack trace:
+#0 {main}
+ thrown in %s on line 13