Display EngineExceptions like ordinary exceptions

TypeException stays as-is for now because it uses messages that are incompatible with the way exception messages are displayed. closure_038.phpt and a few others now show that we're generating too many exceptions for compound operations on undefined properties -- this needs to be fixed in a followup.
author: Nikita Popov <nikic@php.net> 2015-05-15 21:04:07 +0200
committer: Nikita Popov <nikic@php.net> 2015-05-15 23:40:32 +0200
commit: c9f27ee4227268bc74fc54e0e06102317e614804 (patch)
tree: 35680688ecebfd7bc1321f21a6919133dffa666f
parent: 34e6fbbfed6bd63e7f71ca61ff73ca67d0c12b7b (diff)
download: php-git-c9f27ee4227268bc74fc54e0e06102317e614804.tar.gz
239 files changed, 1060 insertions, 239 deletions
diff --git a/Zend/tests/028.phpt b/Zend/tests/028.phpt
index 2c58a87b32..810c091a87 100644
--- a/Zend/tests/028.phpt
+++ b/Zend/tests/028.phpt
@@ -20,4 +20,7 @@ bool(true)
 
 Notice: Undefined offset: 2 in %s on line %d
 
-Fatal error: Function name must be a string in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Function name must be a string' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/037.phpt b/Zend/tests/037.phpt
index d7057b4844..bda491d7e6 100644
--- a/Zend/tests/037.phpt
+++ b/Zend/tests/037.phpt
@@ -16,4 +16,7 @@ var_dump($x::$x);
 --EXPECTF--
 int(1)
 
-Fatal error: Access to undeclared static property: Closure::$x in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Access to undeclared static property: Closure::$x' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/access_modifiers_010.phpt b/Zend/tests/access_modifiers_010.phpt
index 637ea36ce9..5fd65e5bef 100644
--- a/Zend/tests/access_modifiers_010.phpt
+++ b/Zend/tests/access_modifiers_010.phpt
@@ -28,4 +28,9 @@ new c;
 
 ?>
 --EXPECTF--
-Fatal error: Call to private method d::test2() from context 'a' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to private method d::test2() from context 'a'' in %s:%d
+Stack trace:
+#0 %s(%d): a->test()
+#1 %s(%d): c->__construct()
+#2 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/add_002.phpt b/Zend/tests/add_002.phpt
index ca3b3eb6af..a242f7543e 100644
--- a/Zend/tests/add_002.phpt
+++ b/Zend/tests/add_002.phpt
@@ -26,4 +26,7 @@ Exception: Unsupported operand types
 
 Notice: Object of class stdClass could not be converted to int in %s on line %d
 
-Fatal error: Unsupported operand types in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Unsupported operand types' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/add_003.phpt b/Zend/tests/add_003.phpt
index f0c9314b2d..4023e24c2a 100644
--- a/Zend/tests/add_003.phpt
+++ b/Zend/tests/add_003.phpt
@@ -26,4 +26,7 @@ Exception: Unsupported operand types
 
 Notice: Object of class stdClass could not be converted to int in %s on line %d
 
-Fatal error: Unsupported operand types in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Unsupported operand types' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/add_004.phpt b/Zend/tests/add_004.phpt
index 5629ed2ea4..b0a10f82f3 100644
--- a/Zend/tests/add_004.phpt
+++ b/Zend/tests/add_004.phpt
@@ -19,4 +19,7 @@ echo "Done\n";
 --EXPECTF--	
 Exception: Unsupported operand types
 
-Fatal error: Unsupported operand types in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Unsupported operand types' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/add_007.phpt b/Zend/tests/add_007.phpt
index b7d44a8683..455f664dfa 100644
--- a/Zend/tests/add_007.phpt
+++ b/Zend/tests/add_007.phpt
@@ -21,4 +21,7 @@ echo "Done\n";
 --EXPECTF--	
 Exception: Unsupported operand types
 
-Fatal error: Unsupported operand types in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Unsupported operand types' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/bug24773.phpt b/Zend/tests/bug24773.phpt
index e8c2aa8395..ea08f84c26 100644
--- a/Zend/tests/bug24773.phpt
+++ b/Zend/tests/bug24773.phpt
@@ -6,4 +6,7 @@ Bug #24773 (unset() of integers treated as arrays causes a crash)
 	unset($array["lvl1"]["lvl2"]["b"]);
 ?>
 --EXPECTF--
-Fatal error: Cannot use string offset as an array in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot use string offset as an array' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/bug29015.phpt b/Zend/tests/bug29015.phpt
index 6c18ab8a09..f5a4e0ac41 100644
--- a/Zend/tests/bug29015.phpt
+++ b/Zend/tests/bug29015.phpt
@@ -8,4 +8,7 @@ $a->$x = "string('')";
 var_dump($a);
 ?>
 --EXPECTF--
-Fatal error: Cannot access empty property in %sbug29015.php on line 4
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot access empty property' in %sbug29015.php:4
+Stack trace:
+#0 {main}
+  thrown in %sbug29015.php on line 4
diff --git a/Zend/tests/bug29674.phpt b/Zend/tests/bug29674.phpt
index 30c23faa0e..f94c2290b4 100644
--- a/Zend/tests/bug29674.phpt
+++ b/Zend/tests/bug29674.phpt
@@ -38,4 +38,8 @@ NULL
 ===CHILD===
 string(4) "Base"
 
-Fatal error: Cannot access private property ChildClass::$private_child in %sbug29674.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot access private property ChildClass::$private_child' in %sbug29674.php:%d
+Stack trace:
+#0 %s(%d): BaseClass->printVars()
+#1 {main}
+  thrown in %sbug29674.php on line %d
diff --git a/Zend/tests/bug31102.phpt b/Zend/tests/bug31102.phpt
index b7911bea51..0dbfd5a34f 100644
--- a/Zend/tests/bug31102.phpt
+++ b/Zend/tests/bug31102.phpt
@@ -45,4 +45,8 @@ __autoload(Test2,2)
 Caught: __autoload
 __autoload(Test3,3)
 
-Fatal error: Class 'Test3' not found in %sbug31102.php(%d) : eval()'d code on line 1
+Fatal error: Uncaught exception 'EngineException' with message 'Class 'Test3' not found' in %sbug31102.php(%d) : eval()'d code:1
+Stack trace:
+#0 %s(%d): eval()
+#1 {main}
+  thrown in %sbug31102.php(%d) : eval()'d code on line 1
diff --git a/Zend/tests/bug32660.phpt b/Zend/tests/bug32660.phpt
index 3a307189a4..d99e2f8e14 100644
--- a/Zend/tests/bug32660.phpt
+++ b/Zend/tests/bug32660.phpt
@@ -36,4 +36,7 @@ A Object
 
 Notice: Indirect modification of overloaded property A::$whatever has no effect in %sbug32660.php on line 23
 
-Fatal error: Cannot assign by reference to overloaded object in %sbug32660.php on line 23
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot assign by reference to overloaded object' in %sbug32660.php:23
+Stack trace:
+#0 {main}
+  thrown in %sbug32660.php on line 23
diff --git a/Zend/tests/bug33318.phpt b/Zend/tests/bug33318.phpt
index dc1afbb153..4abb90866f 100644
--- a/Zend/tests/bug33318.phpt
+++ b/Zend/tests/bug33318.phpt
@@ -5,4 +5,7 @@ Bug #33318 (throw 1; results in Invalid opcode 108/1/8)
 throw 1;
 ?>
 --EXPECTF--
-Fatal error: Can only throw objects in %sbug33318.php on line 2
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Can only throw objects' in %sbug33318.php:2
+Stack trace:
+#0 {main}
+  thrown in %sbug33318.php on line 2
+\ No newline at end of file
diff --git a/Zend/tests/bug34064.phpt b/Zend/tests/bug34064.phpt
index 84208a54f8..91ee3e6f81 100644
--- a/Zend/tests/bug34064.phpt
+++ b/Zend/tests/bug34064.phpt
@@ -31,5 +31,9 @@ array(1) {
   string(2) "ok"
 }
 
-Fatal error: Cannot use [] for reading in %sbug34064.php on line 18
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot use [] for reading' in %sbug34064.php:18
+Stack trace:
+#0 %s(%d): XmlTest->run()
+#1 {main}
+  thrown in %sbug34064.php on line 18
 
diff --git a/Zend/tests/bug36071.phpt b/Zend/tests/bug36071.phpt
index e5146091e1..918cea83b2 100644
--- a/Zend/tests/bug36071.phpt
+++ b/Zend/tests/bug36071.phpt
@@ -8,4 +8,7 @@ $a = clone 0;
 $a[0]->b = 0;
 ?>
 --EXPECTF--
-Fatal error: __clone method called on non-object in %sbug36071.php on line 2
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message '__clone method called on non-object' in %sbug36071.php:2
+Stack trace:
+#0 {main}
+  thrown in %sbug36071.php on line 2
+\ No newline at end of file
diff --git a/Zend/tests/bug36268.phpt b/Zend/tests/bug36268.phpt
index 5276d50d48..ad652ce015 100644
--- a/Zend/tests/bug36268.phpt
+++ b/Zend/tests/bug36268.phpt
@@ -11,4 +11,7 @@ $x = new Foo();
 bar();
 ?>
 --EXPECTF--
-Fatal error: Call to undefined function bar() in %sbug36268.php on line 8
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function bar()' in %sbug36268.php:8
+Stack trace:
+#0 {main}
+  thrown in %sbug36268.php on line 8
diff --git a/Zend/tests/bug37632.phpt b/Zend/tests/bug37632.phpt
index fb72f89345..974471ffd3 100644
--- a/Zend/tests/bug37632.phpt
+++ b/Zend/tests/bug37632.phpt
@@ -132,4 +132,8 @@ B2::doTest
 C2::test
 B4::doTest
 
-Fatal error: Call to protected C4::__construct() from context 'B4' in %sbug37632.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to protected C4::__construct() from context 'B4'' in %sbug37632.php:%d
+Stack trace:
+#0 %s(%d): B4::doTest()
+#1 {main}
+  thrown in %sbug37632.php on line %d
diff --git a/Zend/tests/bug40621.phpt b/Zend/tests/bug40621.phpt
index b15a43171b..3180c8c921 100644
--- a/Zend/tests/bug40621.phpt
+++ b/Zend/tests/bug40621.phpt
@@ -17,4 +17,8 @@ echo "Done\n";
 --EXPECTF--	
 Deprecated: Non-static method Foo::get() should not be called statically in %s on line %d
 
-Fatal error: Non-static method Foo::__construct() cannot be called statically in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Non-static method Foo::__construct() cannot be called statically' in %s:%d
+Stack trace:
+#0 %s(%d): Foo::get()
+#1 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/bug41633_2.phpt b/Zend/tests/bug41633_2.phpt
index 3deb4516ac..d64092c691 100644
--- a/Zend/tests/bug41633_2.phpt
+++ b/Zend/tests/bug41633_2.phpt
@@ -8,4 +8,7 @@ class Foo {
 echo Foo::A."\n";
 ?>
 --EXPECTF--
-Fatal error: Undefined class constant 'self::B' in %sbug41633_2.php on line 5
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined class constant 'self::B'' in %sbug41633_2.php:5
+Stack trace:
+#0 {main}
+  thrown in %sbug41633_2.php on line 5
diff --git a/Zend/tests/bug41633_3.phpt b/Zend/tests/bug41633_3.phpt
index 7b9452db85..bf0e95db81 100644
--- a/Zend/tests/bug41633_3.phpt
+++ b/Zend/tests/bug41633_3.phpt
@@ -9,4 +9,7 @@ class Foo {
 echo Foo::A;
 ?>
 --EXPECTF--
-Fatal error: Cannot declare self-referencing constant 'Foo::B' in %sbug41633_3.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot declare self-referencing constant 'Foo::B'' in %sbug41633_3.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sbug41633_3.php on line %d
diff --git a/Zend/tests/bug41813.phpt b/Zend/tests/bug41813.phpt
index c330b14fe8..5c52051692 100644
--- a/Zend/tests/bug41813.phpt
+++ b/Zend/tests/bug41813.phpt
@@ -9,4 +9,7 @@ $foo[0]->bar = "xyz";
 echo "Done\n";
 ?>
 --EXPECTF--	
-Fatal error: Cannot use string offset as an array in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot use string offset as an array' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/bug41919.phpt b/Zend/tests/bug41919.phpt
index 0ac3276b07..4b872b4867 100644
--- a/Zend/tests/bug41919.phpt
+++ b/Zend/tests/bug41919.phpt
@@ -8,4 +8,7 @@ $foo[3]->bar[1] = "bang";
 echo "ok\n";
 ?>
 --EXPECTF--
-Fatal error: Cannot use string offset as an object in %sbug41919.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot use string offset as an object' in %sbug41919.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sbug41919.php on line %d
diff --git a/Zend/tests/bug42817.phpt b/Zend/tests/bug42817.phpt
index b1beca4d0a..46d01170a7 100644
--- a/Zend/tests/bug42817.phpt
+++ b/Zend/tests/bug42817.phpt
@@ -6,4 +6,7 @@ $a = clone(null);
 array_push($a->b, $c);
 ?>
 --EXPECTF--
-Fatal error: __clone method called on non-object in %sbug42817.php on line 2
+Fatal error: Uncaught exception 'EngineException' with message '__clone method called on non-object' in %sbug42817.php:2
+Stack trace:
+#0 {main}
+  thrown in %sbug42817.php on line 2
diff --git a/Zend/tests/bug42818.phpt b/Zend/tests/bug42818.phpt
index 09ad693b44..ea83ced5fc 100644
--- a/Zend/tests/bug42818.phpt
+++ b/Zend/tests/bug42818.phpt
@@ -5,5 +5,8 @@ Bug #42818 ($foo = clone(array()); leaks memory)
 $foo = clone(array());
 ?>
 --EXPECTF--
-Fatal error: __clone method called on non-object in %sbug42818.php on line 2
+Fatal error: Uncaught exception 'EngineException' with message '__clone method called on non-object' in %sbug42818.php:2
+Stack trace:
+#0 {main}
+  thrown in %sbug42818.php on line 2
 
diff --git a/Zend/tests/bug42819.phpt b/Zend/tests/bug42819.phpt
index e526603699..e6bdba715b 100644
--- a/Zend/tests/bug42819.phpt
+++ b/Zend/tests/bug42819.phpt
@@ -299,4 +299,8 @@ Array
     [1] => 1
 )
 
-Fatal error: Undefined constant 'foo\foo\unknown' in %sbug42819.php on line %d
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'foo\foo\unknown'' in %sbug42819.php:%d
+Stack trace:
+#0 %s(%d): foo\oops()
+#1 {main}
+  thrown in %sbug42819.php on line %d
+\ No newline at end of file
diff --git a/Zend/tests/bug42937.phpt b/Zend/tests/bug42937.phpt
index 537c567927..53e6fe7f49 100644
--- a/Zend/tests/bug42937.phpt
+++ b/Zend/tests/bug42937.phpt
@@ -39,4 +39,8 @@ test3
 test4
 test5
 
-Fatal error: Call to undefined method C::test6() in %sbug42937.php on line 21
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method C::test6()' in %sbug42937.php:21
+Stack trace:
+#0 %s(%d): B->test()
+#1 {main}
+  thrown in %sbug42937.php on line 21
diff --git a/Zend/tests/bug43344_10.phpt b/Zend/tests/bug43344_10.phpt
index e9f918cd61..67508d0d69 100644
--- a/Zend/tests/bug43344_10.phpt
+++ b/Zend/tests/bug43344_10.phpt
@@ -5,4 +5,7 @@ Bug #43344.10 (Wrong error message for undefined namespace constant)
 echo namespace\bar."\n";
 ?>
 --EXPECTF--
-Fatal error: Undefined constant 'bar' in %sbug43344_10.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'bar'' in %sbug43344_10.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sbug43344_10.php on line %d
diff --git a/Zend/tests/bug43344_11.phpt b/Zend/tests/bug43344_11.phpt
index b55cdccdea..d7c51e6361 100644
--- a/Zend/tests/bug43344_11.phpt
+++ b/Zend/tests/bug43344_11.phpt
@@ -8,4 +8,8 @@ function f($a=namespace\bar) {
 echo f()."\n";
 ?>
 --EXPECTF--
-Fatal error: Undefined constant 'bar' in %sbug43344_11.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'bar'' in %sbug43344_11.php:%d
+Stack trace:
+#0 %s(%d): f()
+#1 {main}
+  thrown in %sbug43344_11.php on line %d
diff --git a/Zend/tests/bug43344_12.phpt b/Zend/tests/bug43344_12.phpt
index 4d1e154f31..1d14d4b40b 100644
--- a/Zend/tests/bug43344_12.phpt
+++ b/Zend/tests/bug43344_12.phpt
@@ -8,4 +8,8 @@ function f($a=array(namespace\bar)) {
 echo f()."\n";
 ?>
 --EXPECTF--
-Fatal error: Undefined constant 'bar' in %sbug43344_12.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'bar'' in %sbug43344_12.php:%d
+Stack trace:
+#0 %s(%d): f()
+#1 {main}
+  thrown in %sbug43344_12.php on line %d
diff --git a/Zend/tests/bug43344_13.phpt b/Zend/tests/bug43344_13.phpt
index c6aaf92fb3..83d79864d1 100644
--- a/Zend/tests/bug43344_13.phpt
+++ b/Zend/tests/bug43344_13.phpt
@@ -9,4 +9,8 @@ function f($a=array(namespace\bar=>0)) {
 echo f()."\n";
 ?>
 --EXPECTF--
-Fatal error: Undefined constant 'bar' in %sbug43344_13.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'bar'' in %sbug43344_13.php:%d
+Stack trace:
+#0 %s(%d): f()
+#1 {main}
+  thrown in %sbug43344_13.php on line %d
diff --git a/Zend/tests/bug43344_2.phpt b/Zend/tests/bug43344_2.phpt
index 57766afa94..094672f3d1 100644
--- a/Zend/tests/bug43344_2.phpt
+++ b/Zend/tests/bug43344_2.phpt
@@ -6,4 +6,7 @@ namespace Foo;
 echo Foo::bar."\n";
 ?>
 --EXPECTF--
-Fatal error: Class 'Foo\Foo' not found in %sbug43344_2.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Class 'Foo\Foo' not found' in %sbug43344_2.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sbug43344_2.php on line %d
diff --git a/Zend/tests/bug43344_6.phpt b/Zend/tests/bug43344_6.phpt
index 38e1961aad..ef9eb58867 100644
--- a/Zend/tests/bug43344_6.phpt
+++ b/Zend/tests/bug43344_6.phpt
@@ -6,4 +6,7 @@ namespace Foo;
 echo namespace\bar."\n";
 ?>
 --EXPECTF--
-Fatal error: Undefined constant 'Foo\bar' in %sbug43344_6.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'Foo\bar'' in %sbug43344_6.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sbug43344_6.php on line %d
diff --git a/Zend/tests/bug43344_7.phpt b/Zend/tests/bug43344_7.phpt
index 94e00d9e1f..661e93aea8 100644
--- a/Zend/tests/bug43344_7.phpt
+++ b/Zend/tests/bug43344_7.phpt
@@ -9,4 +9,8 @@ function f($a=namespace\bar) {
 echo f()."\n";
 ?>
 --EXPECTF--
-Fatal error: Undefined constant 'Foo\bar' in %sbug43344_7.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'Foo\bar'' in %sbug43344_7.php:%d
+Stack trace:
+#0 %s(%d): Foo\f()
+#1 {main}
+  thrown in %sbug43344_7.php on line %d
diff --git a/Zend/tests/bug43344_8.phpt b/Zend/tests/bug43344_8.phpt
index eb694f7118..14aeb7d8af 100644
--- a/Zend/tests/bug43344_8.phpt
+++ b/Zend/tests/bug43344_8.phpt
@@ -9,4 +9,8 @@ function f($a=array(namespace\bar)) {
 echo f()."\n";
 ?>
 --EXPECTF--
-Fatal error: Undefined constant 'Foo\bar' in %sbug43344_8.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'Foo\bar'' in %sbug43344_8.php:%d
+Stack trace:
+#0 %s(%d): Foo\f()
+#1 {main}
+  thrown in %sbug43344_8.php on line %d
diff --git a/Zend/tests/bug43344_9.phpt b/Zend/tests/bug43344_9.phpt
index 31604e7a94..0642dc545a 100644
--- a/Zend/tests/bug43344_9.phpt
+++ b/Zend/tests/bug43344_9.phpt
@@ -10,4 +10,8 @@ function f($a=array(namespace\bar=>0)) {
 echo f()."\n";
 ?>
 --EXPECTF--
-Fatal error: Undefined constant 'Foo\bar' in %sbug43344_9.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'Foo\bar'' in %sbug43344_9.php:%d
+Stack trace:
+#0 %s(%d): Foo\f()
+#1 {main}
+  thrown in %sbug43344_9.php on line %d
diff --git a/Zend/tests/bug44141.phpt b/Zend/tests/bug44141.phpt
index 1a9ee892b6..aa0ae7ed4b 100644
--- a/Zend/tests/bug44141.phpt
+++ b/Zend/tests/bug44141.phpt
@@ -22,4 +22,8 @@ class Y extends X
 $y = Y::cheat(5);
 echo $y->x, PHP_EOL;
 --EXPECTF--
-Fatal error: Call to private X::__construct() from context 'Y' in %sbug44141.php on line 15
+Fatal error: Uncaught exception 'EngineException' with message 'Call to private X::__construct() from context 'Y'' in %sbug44141.php:15
+Stack trace:
+#0 %s(%d): Y::cheat(5)
+#1 {main}
+  thrown in %sbug44141.php on line 15
diff --git a/Zend/tests/bug46304.phpt b/Zend/tests/bug46304.phpt
index 0a6e3bffcb..43f28775e5 100644
--- a/Zend/tests/bug46304.phpt
+++ b/Zend/tests/bug46304.phpt
@@ -62,4 +62,7 @@ value6
 value6
 value6
 
-Fatal error: Undefined constant 'NS1\ns2\coNSt1' in %sbug46304.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'NS1\ns2\coNSt1'' in %sbug46304.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sbug46304.php on line %d
diff --git a/Zend/tests/bug46381.phpt b/Zend/tests/bug46381.phpt
index 92c020b167..c6484a00f5 100644
--- a/Zend/tests/bug46381.phpt
+++ b/Zend/tests/bug46381.phpt
@@ -14,4 +14,8 @@ $test->method();
 echo "Done\n";
 ?>
 --EXPECTF--	
-Fatal error: Non-static method ArrayIterator::current() cannot be called statically in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Non-static method ArrayIterator::current() cannot be called statically' in %s:%d
+Stack trace:
+#0 %s(%d): test->method()
+#1 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/bug47054.phpt b/Zend/tests/bug47054.phpt
index 6e5f4f68ab..378cae9ba5 100644
--- a/Zend/tests/bug47054.phpt
+++ b/Zend/tests/bug47054.phpt
@@ -36,4 +36,8 @@ Warning: get_called_class() called from outside a class in %s on line %d
 
 Deprecated: Non-static method D::m() should not be called statically in %s on line %d
 
-Fatal error: Using $this when not in object context in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Using $this when not in object context' in %s:%d
+Stack trace:
+#0 %s(%d): D::m()
+#1 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/bug47699.phpt b/Zend/tests/bug47699.phpt
index 23ea5a494d..6e96c5bb31 100644
--- a/Zend/tests/bug47699.phpt
+++ b/Zend/tests/bug47699.phpt
@@ -15,4 +15,7 @@ new X();
 ?>
 --EXPECTF--
 BB
-Fatal error: Class 'X' not found in %sbug47699.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Class 'X' not found' in %sbug47699.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sbug47699.php on line %d
diff --git a/Zend/tests/bug47704.phpt b/Zend/tests/bug47704.phpt
index 151754a4f9..db51d9eb20 100644
--- a/Zend/tests/bug47704.phpt
+++ b/Zend/tests/bug47704.phpt
@@ -6,4 +6,7 @@ $s = "abd";
 $s[0]->a += 1;
 ?>
 --EXPECTF--
-Fatal error: Cannot use string offset as an object in %sbug47704.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot use string offset as an object' in %sbug47704.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sbug47704.php on line %d
diff --git a/Zend/tests/bug48215_2.phpt b/Zend/tests/bug48215_2.phpt
index da6b7a84b6..aac5bfd5e2 100644
--- a/Zend/tests/bug48215_2.phpt
+++ b/Zend/tests/bug48215_2.phpt
@@ -16,4 +16,8 @@ $c = new c();
 ?>
 ===DONE===
 --EXPECTF--
-Fatal error: Call to undefined method b::b() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method b::b()' in %s:%d
+Stack trace:
+#0 %s(%d): c->__construct()
+#1 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/bug49866.phpt b/Zend/tests/bug49866.phpt
index 7fbc0d8028..047a162953 100644
--- a/Zend/tests/bug49866.phpt
+++ b/Zend/tests/bug49866.phpt
@@ -7,4 +7,7 @@ $b = &$a[1];
 $b = "f";
 echo $a;
 --EXPECTF--
-Fatal error: Cannot create references to/from string offsets nor overloaded objects in %sbug49866.php on line 3
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot create references to/from string offsets nor overloaded objects' in %sbug49866.php:3
+Stack trace:
+#0 {main}
+  thrown in %sbug49866.php on line 3
diff --git a/Zend/tests/bug50146.phpt b/Zend/tests/bug50146.phpt
index 2ad1ff6e5a..f6cdb796dd 100644
--- a/Zend/tests/bug50146.phpt
+++ b/Zend/tests/bug50146.phpt
@@ -17,4 +17,7 @@ var_dump(isset($obj->a));
 bool(false)
 bool(false)
 
-Fatal error: Closure object cannot have properties in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Closure object cannot have properties' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/bug52484.phpt b/Zend/tests/bug52484.phpt
index ccdf858f65..bf9d494aaa 100644
--- a/Zend/tests/bug52484.phpt
+++ b/Zend/tests/bug52484.phpt
@@ -16,4 +16,8 @@ unset($a->$prop);
 
 ?>
 --EXPECTF--
-Fatal error: Cannot access empty property in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot access empty property' in %s:%d
+Stack trace:
+#0 %s(%d): A->__unset('')
+#1 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/bug52484_2.phpt b/Zend/tests/bug52484_2.phpt
index 1639c81029..3ffb2af3e9 100644
--- a/Zend/tests/bug52484_2.phpt
+++ b/Zend/tests/bug52484_2.phpt
@@ -16,4 +16,8 @@ $a->$prop = 2;
 
 ?>
 --EXPECTF--
-Fatal error: Cannot access empty property in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot access empty property' in %s:%d
+Stack trace:
+#0 %s(%d): A->__set('', 2)
+#1 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/bug52484_3.phpt b/Zend/tests/bug52484_3.phpt
index 20dde3d3c5..877b45d9e3 100644
--- a/Zend/tests/bug52484_3.phpt
+++ b/Zend/tests/bug52484_3.phpt
@@ -16,4 +16,8 @@ var_dump($a->$prop);
 
 ?>
 --EXPECTF--
-Fatal error: Cannot access empty property in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot access empty property' in %s:%d
+Stack trace:
+#0 %s(%d): A->__get('')
+#1 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/bug61025.phpt b/Zend/tests/bug61025.phpt
index 0709c28fbc..69f64d61e8 100644
--- a/Zend/tests/bug61025.phpt
+++ b/Zend/tests/bug61025.phpt
@@ -24,4 +24,7 @@ Warning: The magic method __invoke() must have public visibility and cannot be s
 
 Warning: The magic method __invoke() must have public visibility and cannot be static in %sbug61025.php on line %d
 Bar
-Fatal error: Call to private method Bar::__invoke() from context '' in %sbug61025.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to private method Bar::__invoke() from context ''' in %sbug61025.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sbug61025.php on line %d
diff --git a/Zend/tests/bug63111.phpt b/Zend/tests/bug63111.phpt
index be6c0c31f5..92b3a5e93a 100644
--- a/Zend/tests/bug63111.phpt
+++ b/Zend/tests/bug63111.phpt
@@ -31,5 +31,8 @@ bool(true)
 bool(true)
 ok
 
-Fatal error: Cannot call abstract method Foo::bar() in %sbug63111.php on line 20
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot call abstract method Foo::bar()' in %sbug63111.php:20
+Stack trace:
+#0 {main}
+  thrown in %sbug63111.php on line 20
 
diff --git a/Zend/tests/bug63173.phpt b/Zend/tests/bug63173.phpt
index 36ebf203d2..34d3d6e7d7 100644
--- a/Zend/tests/bug63173.phpt
+++ b/Zend/tests/bug63173.phpt
@@ -9,4 +9,7 @@ $callback();
 
 ?>
 --EXPECTF--
-Fatal error: Array callback has to contain indices 0 and 1 in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Array callback has to contain indices 0 and 1' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/bug64720.phpt b/Zend/tests/bug64720.phpt
index 6c33165bb5..fd71d6bdd6 100644
--- a/Zend/tests/bug64720.phpt
+++ b/Zend/tests/bug64720.phpt
@@ -45,4 +45,8 @@ $bar = new Bar();
 $bar->test();
 ?>
 --EXPECTF--
-Fatal error: Access to undeclared static property: Stat::$requests in %sbug64720.php on line 12
+Fatal error: Uncaught exception 'EngineException' with message 'Access to undeclared static property: Stat::$requests' in %sbug64720.php:12
+Stack trace:
+#0 [internal function]: Stat->__destruct()
+#1 {main}
+  thrown in %sbug64720.php on line 12
diff --git a/Zend/tests/bug65784.phpt b/Zend/tests/bug65784.phpt
index 29f086b5e3..2f80e93b35 100644
--- a/Zend/tests/bug65784.phpt
+++ b/Zend/tests/bug65784.phpt
@@ -57,4 +57,8 @@ $bar = foo3();
 string(9) "not catch"
 NULL
 
-Fatal error: Class 'NotExists' not found in %sbug65784.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Class 'NotExists' not found' in %sbug65784.php:%d
+Stack trace:
+#0 %s(%d): foo3()
+#1 {main}
+  thrown in %sbug65784.php on line %d
diff --git a/Zend/tests/bug65911.phpt b/Zend/tests/bug65911.phpt
index b9f37b7bd6..470d45f1f5 100644
--- a/Zend/tests/bug65911.phpt
+++ b/Zend/tests/bug65911.phpt
@@ -17,4 +17,8 @@ $obj = new B();
 $obj->go();
 ?>
 --EXPECTF--
-Fatal error: Access to undeclared static property: A::$this in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Access to undeclared static property: A::$this' in %s:%d
+Stack trace:
+#0 %s(%d): B->go()
+#1 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/bug68652.phpt b/Zend/tests/bug68652.phpt
index be65513faa..e96a263aaa 100644
--- a/Zend/tests/bug68652.phpt
+++ b/Zend/tests/bug68652.phpt
@@ -36,5 +36,10 @@ class Bar {
 $foo = new Foo();
 ?>
 --EXPECTF--
-Fatal error: Access to undeclared static property: Bar::$instance in %sbug68652.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Access to undeclared static property: Bar::$instance' in %sbug68652.php:%d
+Stack trace:
+#0 %s(%d): Bar::getInstance()
+#1 [internal function]: Foo->__destruct()
+#2 {main}
+  thrown in %sbug68652.php on line %d
 
diff --git a/Zend/tests/call_static_004.phpt b/Zend/tests/call_static_004.phpt
index 5af33ef45b..09d28dd371 100644
--- a/Zend/tests/call_static_004.phpt
+++ b/Zend/tests/call_static_004.phpt
@@ -18,4 +18,7 @@ foo::$a();
 --EXPECTF--
 string(3) "AaA"
 
-Fatal error: Function name must be a string in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Function name must be a string' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/call_static_006.phpt b/Zend/tests/call_static_006.phpt
index b160acc63a..723c65747d 100644
--- a/Zend/tests/call_static_006.phpt
+++ b/Zend/tests/call_static_006.phpt
@@ -27,4 +27,7 @@ ok
 Deprecated: Non-static method foo::aa() should not be called statically in %s on line %d
 ok
 
-Fatal error: Cannot call constructor in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot call constructor' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/call_user_func_004.phpt b/Zend/tests/call_user_func_004.phpt
index add15249db..cc675cc400 100644
--- a/Zend/tests/call_user_func_004.phpt
+++ b/Zend/tests/call_user_func_004.phpt
@@ -15,4 +15,8 @@ call_user_func(array('foo', 'teste'));
 --EXPECTF--
 Deprecated: %son-static method foo::teste() should not be called statically in %s on line %d
 
-Fatal error: Using $this when not in object context in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Using $this when not in object context' in %s:%d
+Stack trace:
+#0 %s(%d): foo::teste()
+#1 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/class_alias_008.phpt b/Zend/tests/class_alias_008.phpt
index 8ee8fa03f8..b294b01ac9 100644
--- a/Zend/tests/class_alias_008.phpt
+++ b/Zend/tests/class_alias_008.phpt
@@ -13,4 +13,7 @@ new $a;
 
 ?>
 --EXPECTF--
-Fatal error: Cannot instantiate abstract class foo in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot instantiate abstract class foo' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/class_alias_016.phpt b/Zend/tests/class_alias_016.phpt
index 930f2ee0e4..8bb1026eaf 100644
--- a/Zend/tests/class_alias_016.phpt
+++ b/Zend/tests/class_alias_016.phpt
@@ -18,4 +18,7 @@ var_dump(new foo);
 object(foo\bar)#%d (0) {
 }
 
-Fatal error: Class 'foo\foo' not found in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Class 'foo\foo' not found' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/class_alias_020.phpt b/Zend/tests/class_alias_020.phpt
index e2c7d9245e..a29f90c77d 100644
--- a/Zend/tests/class_alias_020.phpt
+++ b/Zend/tests/class_alias_020.phpt
@@ -30,4 +30,7 @@ object(foo\foo)#1 (0) {
 object(foo\bar\foo)#2 (0) {
 }
 
-Fatal error: Class 'foo\bar' not found in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Class 'foo\bar' not found' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/class_constants_001.phpt b/Zend/tests/class_constants_001.phpt
index 45270f6f73..8eebc58bda 100644
--- a/Zend/tests/class_constants_001.phpt
+++ b/Zend/tests/class_constants_001.phpt
@@ -19,4 +19,7 @@ echo "Done\n";
 string(6) "string"
 int(1)
 
-Fatal error: Undefined class constant 'val3' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined class constant 'val3'' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/class_name_as_scalar_error_005.phpt b/Zend/tests/class_name_as_scalar_error_005.phpt
index 27700fd646..32524d11f9 100644
--- a/Zend/tests/class_name_as_scalar_error_005.phpt
+++ b/Zend/tests/class_name_as_scalar_error_005.phpt
@@ -7,4 +7,7 @@ $x = static::class;
 
 ?>
 --EXPECTF--
-Fatal error: Cannot use "static" when no class scope is active in %s on line 3
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot use "static" when no class scope is active' in %s:3
+Stack trace:
+#0 {main}
+  thrown in %s on line 3
diff --git a/Zend/tests/class_name_as_scalar_error_006.phpt b/Zend/tests/class_name_as_scalar_error_006.phpt
index a1078d0c7e..954ab2e23b 100644
--- a/Zend/tests/class_name_as_scalar_error_006.phpt
+++ b/Zend/tests/class_name_as_scalar_error_006.phpt
@@ -7,4 +7,7 @@ $x = parent::class;
 
 ?>
 --EXPECTF--
-Fatal error: Cannot use "parent" when no class scope is active in %s on line 3
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot use "parent" when no class scope is active' in %s:3
+Stack trace:
+#0 {main}
+  thrown in %s on line 3
diff --git a/Zend/tests/class_name_as_scalar_error_007.phpt b/Zend/tests/class_name_as_scalar_error_007.phpt
index 684470d211..fac2dbeb22 100644
--- a/Zend/tests/class_name_as_scalar_error_007.phpt
+++ b/Zend/tests/class_name_as_scalar_error_007.phpt
@@ -7,4 +7,7 @@ var_dump(self::class);
 
 ?>
 --EXPECTF--
-Fatal error: Cannot use "self" when no class scope is active in %s on line 3
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot use "self" when no class scope is active' in %s:3
+Stack trace:
+#0 {main}
+  thrown in %s on line 3
diff --git a/Zend/tests/clone_001.phpt b/Zend/tests/clone_001.phpt
index c8ff8d8340..9f147f9e35 100644
--- a/Zend/tests/clone_001.phpt
+++ b/Zend/tests/clone_001.phpt
@@ -7,4 +7,7 @@ $a = clone array();
 
 ?>
 --EXPECTF--
-Fatal error: __clone method called on non-object in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '__clone method called on non-object' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/clone_003.phpt b/Zend/tests/clone_003.phpt
index 362e3466e6..4a97c565b1 100644
--- a/Zend/tests/clone_003.phpt
+++ b/Zend/tests/clone_003.phpt
@@ -9,4 +9,7 @@ $a = clone $b;
 --EXPECTF--
 Notice: Undefined variable: b in %s on line %d
 
-Fatal error: __clone method called on non-object in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '__clone method called on non-object' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/clone_004.phpt b/Zend/tests/clone_004.phpt
index 984313ce74..10b18fbc54 100644
--- a/Zend/tests/clone_004.phpt
+++ b/Zend/tests/clone_004.phpt
@@ -17,4 +17,7 @@ $a = clone $c->b[1];
 
 ?>
 --EXPECTF--
-Fatal error: Cannot use object of type foo as array in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot use object of type foo as array' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/closure_005.phpt b/Zend/tests/closure_005.phpt
index 4e32faa017..0143ac173c 100644
--- a/Zend/tests/closure_005.phpt
+++ b/Zend/tests/closure_005.phpt
@@ -71,4 +71,8 @@ echo "Done\n";
 7
 Destroyed
 
-Fatal error: Using $this when not in object context in %sclosure_005.php on line 28
+Fatal error: Uncaught exception 'EngineException' with message 'Using $this when not in object context' in %sclosure_005.php:28
+Stack trace:
+#0 %s(%d): A::{closure}()
+#1 {main}
+  thrown in %sclosure_005.php on line 28
diff --git a/Zend/tests/closure_019.phpt b/Zend/tests/closure_019.phpt
index 57aa2dec17..682c7db634 100644
--- a/Zend/tests/closure_019.phpt
+++ b/Zend/tests/closure_019.phpt
@@ -26,4 +26,8 @@ int(9)
 Notice: Only variable references should be returned by reference in %sclosure_019.php on line 4
 int(81)
 
-Fatal error: Cannot pass parameter 1 by reference in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot pass parameter 1 by reference' in %s:%d
+Stack trace:
+#0 %s(%d): test()
+#1 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/closure_020.phpt b/Zend/tests/closure_020.phpt
index bec2bedd7f..edc9659ca1 100644
--- a/Zend/tests/closure_020.phpt
+++ b/Zend/tests/closure_020.phpt
@@ -40,4 +40,7 @@ object(foo)#%d (2) {
 bool(true)
 bool(true)
 
-Fatal error: Cannot access private property foo::$test in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot access private property foo::$test' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/closure_022.phpt b/Zend/tests/closure_022.phpt
index 25fbe931d8..55f1ff5a8d 100644
--- a/Zend/tests/closure_022.phpt
+++ b/Zend/tests/closure_022.phpt
@@ -8,5 +8,8 @@ $foo = function() use ($a) {
 $foo->a = 1;
 ?>
 --EXPECTF--
-Fatal error: Closure object cannot have properties in %sclosure_022.php on line 5
+Fatal error: Uncaught exception 'EngineException' with message 'Closure object cannot have properties' in %sclosure_022.php:5
+Stack trace:
+#0 {main}
+  thrown in %sclosure_022.php on line 5
 
diff --git a/Zend/tests/closure_033.phpt b/Zend/tests/closure_033.phpt
index f6510066bb..bc7eb88b2f 100644
--- a/Zend/tests/closure_033.phpt
+++ b/Zend/tests/closure_033.phpt
@@ -25,4 +25,7 @@ $o->func();
 --EXPECTF--
 Test::{closure}()
 
-Fatal error: Call to private method Test::func() from context '' in %sclosure_033.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to private method Test::func() from context ''' in %sclosure_033.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sclosure_033.php on line %d
diff --git a/Zend/tests/closure_038.phpt b/Zend/tests/closure_038.phpt
index fef0734786..b1e9406872 100644
--- a/Zend/tests/closure_038.phpt
+++ b/Zend/tests/closure_038.phpt
@@ -55,4 +55,18 @@ Testing with scope as string
 int(23)
 int(24)
 
-Fatal error: Cannot access private property B::$x in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot access private property B::$x' in %s:%d
+Stack trace:
+#0 %s(%d): Closure->{closure}()
+#1 {main}
+
+Next exception 'EngineException' with message 'Cannot access private property B::$x' in %s:%d
+Stack trace:
+#0 %s(%d): Closure->{closure}()
+#1 {main}
+
+Next exception 'EngineException' with message 'Cannot access private property B::$x' in %s:%d
+Stack trace:
+#0 %s(%d): Closure->{closure}()
+#1 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/closure_039.phpt b/Zend/tests/closure_039.phpt
index c6a727c0fa..9e5ecbd21b 100644
--- a/Zend/tests/closure_039.phpt
+++ b/Zend/tests/closure_039.phpt
@@ -55,4 +55,18 @@ Testing with scope as string
 int(23)
 int(24)
 
-Fatal error: Cannot access private property B::$x in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot access private property B::$x' in %s:%d
+Stack trace:
+#0 %s(%d): Closure->{closure}()
+#1 {main}
+
+Next exception 'EngineException' with message 'Cannot access private property B::$x' in %s:%d
+Stack trace:
+#0 %s(%d): Closure->{closure}()
+#1 {main}
+
+Next exception 'EngineException' with message 'Cannot access private property B::$x' in %s:%d
+Stack trace:
+#0 %s(%d): Closure->{closure}()
+#1 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/constant_expressions_invalid_offset_type_error.phpt b/Zend/tests/constant_expressions_invalid_offset_type_error.phpt
index 440eabc652..ded692c2c4 100644
--- a/Zend/tests/constant_expressions_invalid_offset_type_error.phpt
+++ b/Zend/tests/constant_expressions_invalid_offset_type_error.phpt
@@ -8,4 +8,7 @@ const C2 = [C1, [] => 1];
 
 ?>
 --EXPECTF--
-Fatal error: Illegal offset type in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Illegal offset type' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/constant_expressions_self_referencing_array.phpt b/Zend/tests/constant_expressions_self_referencing_array.phpt
index ae76a08602..6820f47ded 100644
--- a/Zend/tests/constant_expressions_self_referencing_array.phpt
+++ b/Zend/tests/constant_expressions_self_referencing_array.phpt
@@ -9,5 +9,8 @@ class A {
 var_dump(A::FOO);
 ?>
 --EXPECTF--
-Fatal error: Cannot declare self-referencing constant 'self::FOO' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot declare self-referencing constant 'self::FOO'' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
 
diff --git a/Zend/tests/dereference_002.phpt b/Zend/tests/dereference_002.phpt
index da13decc39..4d8d9c9942 100644
--- a/Zend/tests/dereference_002.phpt
+++ b/Zend/tests/dereference_002.phpt
@@ -76,4 +76,7 @@ NULL
 
 Notice: Undefined offset: 3 in %s on line %d
 
-Fatal error: Call to a member function bar() on null in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to a member function bar() on null' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/dereference_010.phpt b/Zend/tests/dereference_010.phpt
index 6acda77ba8..16c76eb777 100644
--- a/Zend/tests/dereference_010.phpt
+++ b/Zend/tests/dereference_010.phpt
@@ -24,4 +24,7 @@ var_dump(b()[1]);
 NULL
 NULL
 
-Fatal error: Cannot use object of type stdClass as array in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot use object of type stdClass as array' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/div_002.phpt b/Zend/tests/div_002.phpt
index b74743380c..6a7794fa46 100644
--- a/Zend/tests/div_002.phpt
+++ b/Zend/tests/div_002.phpt
@@ -20,4 +20,7 @@ echo "Done\n";
 --EXPECTF--	
 Exception: Unsupported operand types
 
-Fatal error: Unsupported operand types in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Unsupported operand types' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/dynamic_call_001.phpt b/Zend/tests/dynamic_call_001.phpt
index 9a22dc2c6b..5a1025cfa7 100644
--- a/Zend/tests/dynamic_call_001.phpt
+++ b/Zend/tests/dynamic_call_001.phpt
@@ -16,4 +16,7 @@ $a::$a();
 --EXPECTF--
 Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; foo has a deprecated constructor in %s on line %d
 
-Fatal error: Non-static method foo::foo() cannot be called statically in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Non-static method foo::foo() cannot be called statically' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/dynamic_call_002.phpt b/Zend/tests/dynamic_call_002.phpt
index dcb1529692..c8fad52241 100644
--- a/Zend/tests/dynamic_call_002.phpt
+++ b/Zend/tests/dynamic_call_002.phpt
@@ -9,4 +9,7 @@ $a::$a();
 
 ?>
 --EXPECTF--
-Fatal error: Function name must be a string in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Function name must be a string' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/dynamic_call_003.phpt b/Zend/tests/dynamic_call_003.phpt
index 15b830ec68..7d5e3e5507 100644
--- a/Zend/tests/dynamic_call_003.phpt
+++ b/Zend/tests/dynamic_call_003.phpt
@@ -10,4 +10,7 @@ $a::$b();
 
 ?>
 --EXPECTF--
-Fatal error: Function name must be a string in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Function name must be a string' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/dynamic_call_004.phpt b/Zend/tests/dynamic_call_004.phpt
index 6e833035a6..056adfc16b 100644
--- a/Zend/tests/dynamic_call_004.phpt
+++ b/Zend/tests/dynamic_call_004.phpt
@@ -9,4 +9,7 @@ $a::$b();
 --EXPECTF--
 Notice: Undefined variable: a in %s on line %d
 
-Fatal error: Class name must be a valid object or a string in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Class name must be a valid object or a string' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/errmsg_044.phpt b/Zend/tests/errmsg_044.phpt
index e908845ae4..50234f89c6 100644
--- a/Zend/tests/errmsg_044.phpt
+++ b/Zend/tests/errmsg_044.phpt
@@ -8,4 +8,7 @@ $a[0][0] = new stdclass;
 
 ?>
 --EXPECTF--
-Fatal error: Cannot use object of type stdClass as array in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot use object of type stdClass as array' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/exception_004.phpt b/Zend/tests/exception_004.phpt
index 77d947f47e..cc9990c386 100644
--- a/Zend/tests/exception_004.phpt
+++ b/Zend/tests/exception_004.phpt
@@ -15,4 +15,7 @@ try {
 
 ?>
 --EXPECTF--
-Fatal error: Exceptions must be valid objects derived from the Exception base class in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Exceptions must be valid objects derived from the Exception base class' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/exception_005.phpt b/Zend/tests/exception_005.phpt
index 45a9269605..e52b907ac3 100644
--- a/Zend/tests/exception_005.phpt
+++ b/Zend/tests/exception_005.phpt
@@ -9,4 +9,7 @@ throw new a();
 
 ?>
 --EXPECTF--
-Fatal error: Cannot instantiate interface a in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot instantiate interface a' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/exception_006.phpt b/Zend/tests/exception_006.phpt
index 5c981fc1b6..fb131b5de4 100644
--- a/Zend/tests/exception_006.phpt
+++ b/Zend/tests/exception_006.phpt
@@ -7,4 +7,7 @@ throw 1;
 
 ?>
 --EXPECTF--
-Fatal error: Can only throw objects in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Can only throw objects' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/exception_013.phpt b/Zend/tests/exception_013.phpt
index 72e9377866..4bbfc32050 100644
--- a/Zend/tests/exception_013.phpt
+++ b/Zend/tests/exception_013.phpt
@@ -33,4 +33,7 @@ Exception: Cannot access private property C::$p in %sexception_013.php on line 1
 
 Exception: Attempt to unset static property C::$a in %sexception_013.php on line 19
 
-Fatal error: Access to undeclared static property: C::$a in %sexception_013.php on line 24
+Fatal error: Uncaught exception 'EngineException' with message 'Access to undeclared static property: C::$a' in %sexception_013.php:24
+Stack trace:
+#0 {main}
+  thrown in %sexception_013.php on line 24
diff --git a/Zend/tests/exception_014.phpt b/Zend/tests/exception_014.phpt
index 71bb14df1d..c1f8615926 100644
--- a/Zend/tests/exception_014.phpt
+++ b/Zend/tests/exception_014.phpt
@@ -18,4 +18,7 @@ var_dump($x->p);
 --EXPECTF--
 Exception: Cannot access private property C::$p in %sexception_014.php on line %d
 
-Fatal error: Cannot access private property C::$p in %sexception_014.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot access private property C::$p' in %sexception_014.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sexception_014.php on line %d
diff --git a/Zend/tests/exception_015.phpt b/Zend/tests/exception_015.phpt
index 033848950e..f4db02aa40 100644
--- a/Zend/tests/exception_015.phpt
+++ b/Zend/tests/exception_015.phpt
@@ -14,4 +14,7 @@ $s[] = "D";
 --EXPECTF--
 Exception: [] operator not supported for strings in %sexception_015.php on line %d
 
-Fatal error: [] operator not supported for strings in %sexception_015.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message '[] operator not supported for strings' in %sexception_015.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sexception_015.php on line %d
diff --git a/Zend/tests/exception_016.phpt b/Zend/tests/exception_016.phpt
index ffa0a45b84..f4ad66855b 100644
--- a/Zend/tests/exception_016.phpt
+++ b/Zend/tests/exception_016.phpt
@@ -13,4 +13,7 @@ $this->foo();
 --EXPECTF--
 Exception: Using $this when not in object context in %sexception_016.php on line %d
 
-Fatal error: Using $this when not in object context in %sexception_016.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Using $this when not in object context' in %sexception_016.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sexception_016.php on line %d
diff --git a/Zend/tests/exception_017.phpt b/Zend/tests/exception_017.phpt
index 9ce9ebd8c3..5a5cca7488 100644
--- a/Zend/tests/exception_017.phpt
+++ b/Zend/tests/exception_017.phpt
@@ -33,4 +33,7 @@ Exception: Cannot call abstract method C::foo() in %sexception_017.php on line %
 Exception: Argument 1 passed to foo() must be callable, string given, called in %sexception_017.php on line %d
 Exception: Cannot call abstract method C::foo()
 
-Fatal error: Cannot call abstract method C::foo() in %sexception_017.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot call abstract method C::foo()' in %sexception_017.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sexception_017.php on line %d
diff --git a/Zend/tests/generators/bug63066.phpt b/Zend/tests/generators/bug63066.phpt
index 8c4c8b4a84..439b1f5a64 100644
--- a/Zend/tests/generators/bug63066.phpt
+++ b/Zend/tests/generators/bug63066.phpt
@@ -13,4 +13,8 @@ foreach(gen(new stdClass()) as $value)
 --EXPECTF--
 foo
 
-Fatal error: Call to undefined method stdClass::fatalError() in %sbug63066.php on line 5
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method stdClass::fatalError()' in %sbug63066.php:5
+Stack trace:
+#0 %s(%d): gen(Object(stdClass))
+#1 {main}
+  thrown in %sbug63066.php on line 5
diff --git a/Zend/tests/generators/bug65161.phpt b/Zend/tests/generators/bug65161.phpt
index 215c1880e3..104462fd22 100644
--- a/Zend/tests/generators/bug65161.phpt
+++ b/Zend/tests/generators/bug65161.phpt
@@ -17,4 +17,10 @@ foreach (testGenerator() as $i);
 
 ?>
 --EXPECTF--
-Fatal error: Call to undefined function foo() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function foo()' in %s:%d
+Stack trace:
+#0 [internal function]: autoload('SyntaxError')
+#1 %s(%d): spl_autoload_call('SyntaxError')
+#2 %s(%d): testGenerator()
+#3 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/generators/clone.phpt b/Zend/tests/generators/clone.phpt
index 22f4428121..cdf0453577 100644
--- a/Zend/tests/generators/clone.phpt
+++ b/Zend/tests/generators/clone.phpt
@@ -12,4 +12,7 @@ clone $gen;
 
 ?>
 --EXPECTF--
-Fatal error: Trying to clone an uncloneable object of class Generator in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class Generator' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/generators/errors/generator_instantiate_error.phpt b/Zend/tests/generators/errors/generator_instantiate_error.phpt
index 990c7481c6..a67a2f30c8 100644
--- a/Zend/tests/generators/errors/generator_instantiate_error.phpt
+++ b/Zend/tests/generators/errors/generator_instantiate_error.phpt
@@ -7,4 +7,7 @@ new Generator;
 
 ?>
 --EXPECTF--
-Fatal error: The "Generator" class is reserved for internal use and cannot be manually instantiated in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'The "Generator" class is reserved for internal use and cannot be manually instantiated' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/generators/errors/resume_running_generator_error.phpt b/Zend/tests/generators/errors/resume_running_generator_error.phpt
index 9a39155d38..e31a2c49ae 100644
--- a/Zend/tests/generators/errors/resume_running_generator_error.phpt
+++ b/Zend/tests/generators/errors/resume_running_generator_error.phpt
@@ -21,4 +21,10 @@ $gen->next();
 --EXPECTF--
 Exception: Cannot resume an already running generator
 
-Fatal error: Cannot resume an already running generator in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot resume an already running generator' in %s:%d
+Stack trace:
+#0 %s(%d): Generator->next()
+#1 [internal function]: gen()
+#2 %s(%d): Generator->send(Object(Generator))
+#3 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/generators/errors/yield_in_force_closed_finally_error.phpt b/Zend/tests/generators/errors/yield_in_force_closed_finally_error.phpt
index aada676a68..83523b1baa 100644
--- a/Zend/tests/generators/errors/yield_in_force_closed_finally_error.phpt
+++ b/Zend/tests/generators/errors/yield_in_force_closed_finally_error.phpt
@@ -26,4 +26,8 @@ unset($gen);
 before yield
 before yield in finally
 
-Fatal error: Cannot yield from finally in a force-closed generator in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot yield from finally in a force-closed generator' in %s:%d
+Stack trace:
+#0 %s(%d): gen()
+#1 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/generators/throw_not_an_exception.phpt b/Zend/tests/generators/throw_not_an_exception.phpt
index d93903e215..4ff1464e7c 100644
--- a/Zend/tests/generators/throw_not_an_exception.phpt
+++ b/Zend/tests/generators/throw_not_an_exception.phpt
@@ -12,4 +12,9 @@ $gen->throw(new stdClass);
 
 ?>
 --EXPECTF--
-Fatal error: Exceptions must be valid objects derived from the Exception base class in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Exceptions must be valid objects derived from the Exception base class' in %s:%d
+Stack trace:
+#0 [internal function]: gen()
+#1 %s(%d): Generator->throw(Object(stdClass))
+#2 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/generators/yield_from_already_running.phpt b/Zend/tests/generators/yield_from_already_running.phpt
index 789490ccd3..16fda98368 100644
--- a/Zend/tests/generators/yield_from_already_running.phpt
+++ b/Zend/tests/generators/yield_from_already_running.phpt
@@ -11,4 +11,9 @@ function gen() {
 
 ?>
 --EXPECTF--
-Fatal error: Impossible to yield from the Generator being currently run in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Impossible to yield from the Generator being currently run' in %s:%d
+Stack trace:
+#0 [internal function]: gen()
+#1 %s(%d): Generator->send(Object(Generator))
+#2 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/indirect_call_array_001.phpt b/Zend/tests/indirect_call_array_001.phpt
index 56675b81a5..73bd1584ef 100644
--- a/Zend/tests/indirect_call_array_001.phpt
+++ b/Zend/tests/indirect_call_array_001.phpt
@@ -8,4 +8,7 @@ $arr();
 
 ?>
 --EXPECTF--
-Fatal error: Class 'a' not found in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Class 'a' not found' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/indirect_call_array_002.phpt b/Zend/tests/indirect_call_array_002.phpt
index 013fa559fe..09c3e79e1a 100644
--- a/Zend/tests/indirect_call_array_002.phpt
+++ b/Zend/tests/indirect_call_array_002.phpt
@@ -8,4 +8,7 @@ $arr();
 
 ?>
 --EXPECTF--
-Fatal error: Call to undefined method stdClass::b() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method stdClass::b()' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/indirect_method_call_002.phpt b/Zend/tests/indirect_method_call_002.phpt
index 1589533bdc..8b3e9299dd 100644
--- a/Zend/tests/indirect_method_call_002.phpt
+++ b/Zend/tests/indirect_method_call_002.phpt
@@ -29,4 +29,7 @@ string(7) "testing"
 string(3) "foo"
 NULL
 
-Fatal error: Call to undefined method foo::www() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method foo::www()' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/list_005.phpt b/Zend/tests/list_005.phpt
index a3b0d57434..d82120e252 100644
--- a/Zend/tests/list_005.phpt
+++ b/Zend/tests/list_005.phpt
@@ -44,4 +44,7 @@ NULL
 NULL
 ----
 
-Fatal error: Cannot use object of type stdClass as array in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot use object of type stdClass as array' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/list_007.phpt b/Zend/tests/list_007.phpt
index cc712406ec..1752b749d8 100644
--- a/Zend/tests/list_007.phpt
+++ b/Zend/tests/list_007.phpt
@@ -9,4 +9,7 @@ var_dump($x, $y);
 
 ?>
 --EXPECTF--
-Fatal error: Cannot use object of type Closure as array in %slist_007.php on line 3
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot use object of type Closure as array' in %slist_007.php:3
+Stack trace:
+#0 {main}
+  thrown in %slist_007.php on line 3
diff --git a/Zend/tests/methods-on-non-objects.phpt b/Zend/tests/methods-on-non-objects.phpt
index baf9e1c8c7..803de1cffa 100644
--- a/Zend/tests/methods-on-non-objects.phpt
+++ b/Zend/tests/methods-on-non-objects.phpt
@@ -9,4 +9,7 @@ echo "Should not get here!\n";
 ?>
 --EXPECTF--
 
-Fatal error: Call to a member function method() on null in %s on line %d 
+Fatal error: Uncaught exception 'EngineException' with message 'Call to a member function method() on null' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d 
diff --git a/Zend/tests/mul_001.phpt b/Zend/tests/mul_001.phpt
index 2a827af74f..71ec3feb54 100644
--- a/Zend/tests/mul_001.phpt
+++ b/Zend/tests/mul_001.phpt
@@ -20,4 +20,7 @@ echo "Done\n";
 --EXPECTF--	
 Exception: Unsupported operand types
 
-Fatal error: Unsupported operand types in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Unsupported operand types' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/not_002.phpt b/Zend/tests/not_002.phpt
index 4c9be5befa..78899a4652 100644
--- a/Zend/tests/not_002.phpt
+++ b/Zend/tests/not_002.phpt
@@ -20,4 +20,7 @@ echo "Done\n";
 --EXPECTF--	
 Exception: Unsupported operand types
 
-Fatal error: Unsupported operand types in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Unsupported operand types' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/ns_004.phpt b/Zend/tests/ns_004.phpt
index d293f65dce..e7b63ea1ac 100644
--- a/Zend/tests/ns_004.phpt
+++ b/Zend/tests/ns_004.phpt
@@ -6,4 +6,7 @@ namespace test\ns1;
 
 echo get_class(new Exception()),"\n";
 --EXPECTF--
-Fatal error: Class 'test\ns1\Exception' not found in %sns_004.php on line %d
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Class 'test\ns1\Exception' not found' in %sns_004.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sns_004.php on line %d
+\ No newline at end of file
diff --git a/Zend/tests/ns_026.phpt b/Zend/tests/ns_026.phpt
index 45f88750eb..bb596901e3 100644
--- a/Zend/tests/ns_026.phpt
+++ b/Zend/tests/ns_026.phpt
@@ -32,4 +32,7 @@ Method - Foo\Foo::__construct
 Method - Foo\Foo::Bar
 Func   - Foo\Bar
 
-Fatal error: Call to undefined function Foo\Foo\Bar() in %sns_026.php on line %d
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function Foo\Foo\Bar()' in %sns_026.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sns_026.php on line %d
+\ No newline at end of file
diff --git a/Zend/tests/ns_038.phpt b/Zend/tests/ns_038.phpt
index f3a8c8cc63..5664eafdcb 100644
--- a/Zend/tests/ns_038.phpt
+++ b/Zend/tests/ns_038.phpt
@@ -11,5 +11,8 @@ function foo() {
 --EXPECTF--
 ok
 
-Fatal error: Call to undefined method Exception::bar() in %sns_038.php on line 7
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method Exception::bar()' in %sns_038.php:7
+Stack trace:
+#0 {main}
+  thrown in %sns_038.php on line 7
 
diff --git a/Zend/tests/ns_057.phpt b/Zend/tests/ns_057.phpt
index 13bf3054cc..aae2e7c12b 100644
--- a/Zend/tests/ns_057.phpt
+++ b/Zend/tests/ns_057.phpt
@@ -56,4 +56,7 @@ const ok
 class ok
 ok
 
-Fatal error: Undefined constant 'Test\ns1\unknown' in %sns_057.php on line %d
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'Test\ns1\unknown'' in %sns_057.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sns_057.php on line %d
+\ No newline at end of file
diff --git a/Zend/tests/ns_058.phpt b/Zend/tests/ns_058.phpt
index 7a0cd97d92..b46c968ff4 100644
--- a/Zend/tests/ns_058.phpt
+++ b/Zend/tests/ns_058.phpt
@@ -54,4 +54,7 @@ const ok
 class ok
 ok
 
-Fatal error: Undefined constant 'unknown' in %sns_058.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'unknown'' in %sns_058.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sns_058.php on line %d
diff --git a/Zend/tests/ns_076.phpt b/Zend/tests/ns_076.phpt
index eeda39bd2e..ac4e519b8a 100644
--- a/Zend/tests/ns_076.phpt
+++ b/Zend/tests/ns_076.phpt
@@ -22,4 +22,7 @@ array(1) {
   %s(7) "unknown"
 }
 
-Fatal error: Undefined constant 'unknown' in %sns_076.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'unknown'' in %sns_076.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sns_076.php on line %d
diff --git a/Zend/tests/ns_077_1.phpt b/Zend/tests/ns_077_1.phpt
index 5a9c4b1539..ffe4a7d3a5 100644
--- a/Zend/tests/ns_077_1.phpt
+++ b/Zend/tests/ns_077_1.phpt
@@ -10,4 +10,8 @@ function foo($a = array(0 => \unknown))
 
 foo();
 --EXPECTF--
-Fatal error: Undefined constant 'unknown' in %sns_077_%d.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'unknown'' in %sns_077_%d.php:%d
+Stack trace:
+#0 %s(%d): foo\foo()
+#1 {main}
+  thrown in %sns_077_%d.php on line %d
diff --git a/Zend/tests/ns_077_2.phpt b/Zend/tests/ns_077_2.phpt
index 8c26721855..c8c1b96399 100644
--- a/Zend/tests/ns_077_2.phpt
+++ b/Zend/tests/ns_077_2.phpt
@@ -10,4 +10,8 @@ function foo($a = array(\unknown => unknown))
 
 foo();
 --EXPECTF--
-Fatal error: Undefined constant 'unknown' in %sns_077_%d.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'unknown'' in %sns_077_%d.php:%d
+Stack trace:
+#0 %s(%d): foo\foo()
+#1 {main}
+  thrown in %sns_077_%d.php on line %d
diff --git a/Zend/tests/ns_077_3.phpt b/Zend/tests/ns_077_3.phpt
index bdeb7924e6..ff53e793c2 100644
--- a/Zend/tests/ns_077_3.phpt
+++ b/Zend/tests/ns_077_3.phpt
@@ -10,4 +10,8 @@ function foo($a = array(namespace\unknown => unknown))
 
 foo();
 --EXPECTF--
-Fatal error: Undefined constant 'foo\unknown' in %sns_077_%d.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'foo\unknown'' in %sns_077_%d.php:%d
+Stack trace:
+#0 %s(%d): foo\foo()
+#1 {main}
+  thrown in %sns_077_%d.php on line %d
diff --git a/Zend/tests/ns_077_4.phpt b/Zend/tests/ns_077_4.phpt
index aef91fd3e6..4b7f06dc9a 100644
--- a/Zend/tests/ns_077_4.phpt
+++ b/Zend/tests/ns_077_4.phpt
@@ -10,4 +10,8 @@ function foo($a = array(0 => namespace\unknown))
 
 foo();
 --EXPECTF--
-Fatal error: Undefined constant 'foo\unknown' in %sns_077_%d.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'foo\unknown'' in %sns_077_%d.php:%d
+Stack trace:
+#0 %s(%d): foo\foo()
+#1 {main}
+  thrown in %sns_077_%d.php on line %d
diff --git a/Zend/tests/ns_077_5.phpt b/Zend/tests/ns_077_5.phpt
index 17afe03f4b..ade0983e1f 100644
--- a/Zend/tests/ns_077_5.phpt
+++ b/Zend/tests/ns_077_5.phpt
@@ -9,4 +9,8 @@ function foo($a = array(0 => \unknown))
 
 foo();
 --EXPECTF--
-Fatal error: Undefined constant 'unknown' in %sns_077_%d.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'unknown'' in %sns_077_%d.php:%d
+Stack trace:
+#0 %s(%d): foo()
+#1 {main}
+  thrown in %sns_077_%d.php on line %d
diff --git a/Zend/tests/ns_077_6.phpt b/Zend/tests/ns_077_6.phpt
index 17afe03f4b..ade0983e1f 100644
--- a/Zend/tests/ns_077_6.phpt
+++ b/Zend/tests/ns_077_6.phpt
@@ -9,4 +9,8 @@ function foo($a = array(0 => \unknown))
 
 foo();
 --EXPECTF--
-Fatal error: Undefined constant 'unknown' in %sns_077_%d.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'unknown'' in %sns_077_%d.php:%d
+Stack trace:
+#0 %s(%d): foo()
+#1 {main}
+  thrown in %sns_077_%d.php on line %d
diff --git a/Zend/tests/ns_077_7.phpt b/Zend/tests/ns_077_7.phpt
index 9bf5baf058..650eb07b63 100644
--- a/Zend/tests/ns_077_7.phpt
+++ b/Zend/tests/ns_077_7.phpt
@@ -9,4 +9,8 @@ function foo($a = array(0 => namespace\unknown))
 
 foo();
 --EXPECTF--
-Fatal error: Undefined constant 'unknown' in %sns_077_%d.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'unknown'' in %sns_077_%d.php:%d
+Stack trace:
+#0 %s(%d): foo()
+#1 {main}
+  thrown in %sns_077_%d.php on line %d
diff --git a/Zend/tests/ns_077_8.phpt b/Zend/tests/ns_077_8.phpt
index 9f9240db07..34e9554164 100644
--- a/Zend/tests/ns_077_8.phpt
+++ b/Zend/tests/ns_077_8.phpt
@@ -9,4 +9,8 @@ function foo($a = array(namespace\unknown => unknown))
 
 foo();
 --EXPECTF--
-Fatal error: Undefined constant 'unknown' in %sns_077_%d.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'unknown'' in %sns_077_%d.php:%d
+Stack trace:
+#0 %s(%d): foo()
+#1 {main}
+  thrown in %sns_077_%d.php on line %d
diff --git a/Zend/tests/ns_092.phpt b/Zend/tests/ns_092.phpt
index a5d1bcb6e9..ef0f5dacf9 100644
--- a/Zend/tests/ns_092.phpt
+++ b/Zend/tests/ns_092.phpt
@@ -64,4 +64,7 @@ Foo\Bar\fiz
 Foo\Bar\biz
 Foo\Bar\buz
 
-Fatal error: Call to undefined function Foo\Bar\A() in %sns_092.php on line 45
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function Foo\Bar\A()' in %sns_092.php:45
+Stack trace:
+#0 {main}
+  thrown in %sns_092.php on line 45
diff --git a/Zend/tests/objects_017.phpt b/Zend/tests/objects_017.phpt
index 63030304ff..c07de71b73 100644
--- a/Zend/tests/objects_017.phpt
+++ b/Zend/tests/objects_017.phpt
@@ -15,4 +15,7 @@ test()->test = 2;
 
 ?>
 --EXPECTF--
-Fatal error: Cannot access private property foo::$test in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot access private property foo::$test' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/objects_025.phpt b/Zend/tests/objects_025.phpt
index 110ffc69b7..e2711bd417 100644
--- a/Zend/tests/objects_025.phpt
+++ b/Zend/tests/objects_025.phpt
@@ -43,4 +43,7 @@ static - ok
 non-static - ok
 static - ok
 
-Fatal error: Method name must be a string in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Method name must be a string' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/objects_026.phpt b/Zend/tests/objects_026.phpt
index eb3a89f678..e3bc411a46 100644
--- a/Zend/tests/objects_026.phpt
+++ b/Zend/tests/objects_026.phpt
@@ -10,4 +10,7 @@ try {
 
 ?>
 --EXPECTF--
-Fatal error: Using $this when not in object context in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Using $this when not in object context' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/objects_029.phpt b/Zend/tests/objects_029.phpt
index 5e8de185f2..883785d75c 100644
--- a/Zend/tests/objects_029.phpt
+++ b/Zend/tests/objects_029.phpt
@@ -23,4 +23,8 @@ new foo;
 
 ?>
 --EXPECTF--
-Fatal error: Access to undeclared static property: foo::$f in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Access to undeclared static property: foo::$f' in %s:%d
+Stack trace:
+#0 %s(%d): foo->__construct()
+#1 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/objects_030.phpt b/Zend/tests/objects_030.phpt
index 8b7cfe39a8..21e42cb247 100644
--- a/Zend/tests/objects_030.phpt
+++ b/Zend/tests/objects_030.phpt
@@ -23,4 +23,8 @@ new foo;
 
 ?>
 --EXPECTF--
-Fatal error: Access to undeclared static property: bar::$f in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Access to undeclared static property: bar::$f' in %s:%d
+Stack trace:
+#0 %s(%d): foo->__construct()
+#1 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/offset_assign.phpt b/Zend/tests/offset_assign.phpt
index 721516f53c..ab547c8cd1 100644
--- a/Zend/tests/offset_assign.phpt
+++ b/Zend/tests/offset_assign.phpt
@@ -10,4 +10,7 @@ echo "Done\n";
 --EXPECTF--	
 Warning: Illegal string offset 'x' in %soffset_assign.php on line %d
 
-Fatal error: Cannot use string offset as an array in %soffset_assign.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot use string offset as an array' in %soffset_assign.php:%d
+Stack trace:
+#0 {main}
+  thrown in %soffset_assign.php on line %d
diff --git a/Zend/tests/offset_object.phpt b/Zend/tests/offset_object.phpt
index b570fd2a2f..4b9d9329a2 100644
--- a/Zend/tests/offset_object.phpt
+++ b/Zend/tests/offset_object.phpt
@@ -8,4 +8,7 @@ var_dump($object[1]);
 
 ?>
 --EXPECTF--	
-Fatal error: Cannot use object of type stdClass as array in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot use object of type stdClass as array' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/parent_class_name_without_parent.phpt b/Zend/tests/parent_class_name_without_parent.phpt
index 0e67173f87..8cef8619e3 100644
--- a/Zend/tests/parent_class_name_without_parent.phpt
+++ b/Zend/tests/parent_class_name_without_parent.phpt
@@ -17,5 +17,9 @@ class C {
 
 ?>
 --EXPECTF--
-Fatal error: Cannot use "parent" when current class scope has no parent in %s on line 5
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot use "parent" when current class scope has no parent' in %s:5
+Stack trace:
+#0 %s(%d): C->f()
+#1 {main}
+  thrown in %s on line 5
 
diff --git a/Zend/tests/str_offset_002.phpt b/Zend/tests/str_offset_002.phpt
index 1c465e5bae..596a7c6eba 100644
--- a/Zend/tests/str_offset_002.phpt
+++ b/Zend/tests/str_offset_002.phpt
@@ -6,4 +6,7 @@ $a = "aaa";
 $x = array(&$a[1]);
 ?>
 --EXPECTF--
-Fatal error: Cannot create references to/from string offsets in %sstr_offset_002.php on line 3
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot create references to/from string offsets' in %sstr_offset_002.php:3
+Stack trace:
+#0 {main}
+  thrown in %sstr_offset_002.php on line 3
diff --git a/Zend/tests/sub_001.phpt b/Zend/tests/sub_001.phpt
index a9438fdcde..bbfdaa7fa5 100644
--- a/Zend/tests/sub_001.phpt
+++ b/Zend/tests/sub_001.phpt
@@ -20,4 +20,7 @@ echo "Done\n";
 --EXPECTF--	
 Exception: Unsupported operand types
 
-Fatal error: Unsupported operand types in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Unsupported operand types' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/traits/bug60173.phpt b/Zend/tests/traits/bug60173.phpt
index a28a1033a0..ddc667693b 100644
--- a/Zend/tests/traits/bug60173.phpt
+++ b/Zend/tests/traits/bug60173.phpt
@@ -9,4 +9,8 @@ $rc = new ReflectionClass('foo');
 $rc->newInstance();
 
 --EXPECTF--
-Fatal error: Cannot instantiate trait foo in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot instantiate trait foo' in %s:%d
+Stack trace:
+#0 %s(%d): ReflectionClass->newInstance()
+#1 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/traits/bugs/alias01.phpt b/Zend/tests/traits/bugs/alias01.phpt
index b60261efac..094948c273 100644
--- a/Zend/tests/traits/bugs/alias01.phpt
+++ b/Zend/tests/traits/bugs/alias01.phpt
@@ -23,4 +23,7 @@ T:m1
 T:m1
 T:m2
 
-Fatal error: Call to undefined method C1::a2() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method C1::a2()' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/traits/error_007.phpt b/Zend/tests/traits/error_007.phpt
index 82a6a2e941..92ff664174 100644
--- a/Zend/tests/traits/error_007.phpt
+++ b/Zend/tests/traits/error_007.phpt
@@ -10,4 +10,7 @@ new abc;
 
 ?>
 --EXPECTF--
-Fatal error: Cannot instantiate trait abc in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot instantiate trait abc' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/traits/error_012.phpt b/Zend/tests/traits/error_012.phpt
index b90e32ac84..8e631fd5cc 100644
--- a/Zend/tests/traits/error_012.phpt
+++ b/Zend/tests/traits/error_012.phpt
@@ -16,4 +16,7 @@ var_dump($x->test());
 
 ?>
 --EXPECTF--
-Fatal error: Call to protected method bar::test() from context '' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to protected method bar::test() from context ''' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/traits/language008a.phpt b/Zend/tests/traits/language008a.phpt
index 5a12a4e74b..45164d550c 100644
--- a/Zend/tests/traits/language008a.phpt
+++ b/Zend/tests/traits/language008a.phpt
@@ -20,4 +20,7 @@ $o->sayHello();
 
 ?>
 --EXPECTF--	
-Fatal error: Call to protected method MyClass::sayHello() from context '' in %s on line %d
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Call to protected method MyClass::sayHello() from context ''' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
+\ No newline at end of file
diff --git a/Zend/tests/traits/language008b.phpt b/Zend/tests/traits/language008b.phpt
index 9abbdbeb0d..14e4ba8198 100644
--- a/Zend/tests/traits/language008b.phpt
+++ b/Zend/tests/traits/language008b.phpt
@@ -27,4 +27,7 @@ $o->sayHelloWorld();
 ?>
 --EXPECTF--	
 Hello World!Hello World!
-Fatal error: Call to private method MyClass::sayHelloWorld() from context '' in %s on line %d
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Call to private method MyClass::sayHelloWorld() from context ''' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
+\ No newline at end of file
diff --git a/Zend/tests/use_const/no_global_fallback.phpt b/Zend/tests/use_const/no_global_fallback.phpt
index 64e2a154ce..40978c17fb 100644
--- a/Zend/tests/use_const/no_global_fallback.phpt
+++ b/Zend/tests/use_const/no_global_fallback.phpt
@@ -10,4 +10,7 @@ var_dump(baz);
 
 ?>
 --EXPECTF--
-Fatal error: Undefined constant 'foo\bar\baz' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'foo\bar\baz'' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/use_function/no_global_fallback.phpt b/Zend/tests/use_function/no_global_fallback.phpt
index 6597d0d301..45fc32c4da 100644
--- a/Zend/tests/use_function/no_global_fallback.phpt
+++ b/Zend/tests/use_function/no_global_fallback.phpt
@@ -10,4 +10,7 @@ var_dump(baz());
 
 ?>
 --EXPECTF--
-Fatal error: Call to undefined function foo\bar\baz() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function foo\bar\baz()' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/use_function/no_global_fallback2.phpt b/Zend/tests/use_function/no_global_fallback2.phpt
index 5d012c10e5..24551e0089 100644
--- a/Zend/tests/use_function/no_global_fallback2.phpt
+++ b/Zend/tests/use_function/no_global_fallback2.phpt
@@ -15,4 +15,7 @@ namespace foo {
 
 ?>
 --EXPECTF--
-Fatal error: Call to undefined function bar\test() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function bar\test()' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/varSyntax/method_call_on_string_literal.phpt b/Zend/tests/varSyntax/method_call_on_string_literal.phpt
index 01ea5f2aea..93b51a2570 100644
--- a/Zend/tests/varSyntax/method_call_on_string_literal.phpt
+++ b/Zend/tests/varSyntax/method_call_on_string_literal.phpt
@@ -5,4 +5,7 @@ Method call on string literal
 "string"->length();
 ?>
 --EXPECTF--
-Fatal error: Call to a member function length() on string in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to a member function length() on string' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/varSyntax/tempDimFetchByRefError.phpt b/Zend/tests/varSyntax/tempDimFetchByRefError.phpt
index 492627302f..9421d8edc5 100644
--- a/Zend/tests/varSyntax/tempDimFetchByRefError.phpt
+++ b/Zend/tests/varSyntax/tempDimFetchByRefError.phpt
@@ -8,4 +8,7 @@ $fn([0, 1][0]);
 
 ?>
 --EXPECTF--
-Fatal error: Cannot use temporary expression in write context in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot use temporary expression in write context' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/varSyntax/tempPropFetchByRefError.phpt b/Zend/tests/varSyntax/tempPropFetchByRefError.phpt
index f8298a936d..8bcb9198e7 100644
--- a/Zend/tests/varSyntax/tempPropFetchByRefError.phpt
+++ b/Zend/tests/varSyntax/tempPropFetchByRefError.phpt
@@ -8,4 +8,7 @@ $fn([0, 1]->prop);
 
 ?>
 --EXPECTF--
-Fatal error: Cannot use temporary expression in write context in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot use temporary expression in write context' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index cb8b79ece9..671c09cd60 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -908,7 +908,7 @@ ZEND_API void zend_exception_error(zend_object *ex, int severity) /* {{{ */
 	ZVAL_OBJ(&exception, ex);
 	ce_exception = Z_OBJCE(exception);
 	EG(exception) = NULL;
-	if (ce_exception == parse_exception_ce || ce_exception == engine_exception_ce || ce_exception == type_exception_ce) {
+	if (ce_exception == parse_exception_ce || ce_exception == type_exception_ce) {
 		zend_string *message = zval_get_string(GET_PROPERTY(&exception, "message"));
 		zend_string *file = zval_get_string(GET_PROPERTY_SILENT(&exception, "file"));
 		zend_long line = zval_get_long(GET_PROPERTY_SILENT(&exception, "line"));
diff --git a/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt b/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
index 33e07c641d..2ef17926aa 100644
--- a/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
+++ b/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
@@ -12,4 +12,7 @@ require_once dirname(__FILE__) .'/skipif.inc';
 DOMDocument::saveHTMLFile();
 ?>
 --EXPECTF--
-Fatal error: Non-static method DOMDocument::saveHTMLFile() cannot be called statically in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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 614605b34a..1f7c95c6ae 100644
--- a/ext/dom/tests/DOMDocument_saveHTML_error2.phpt
+++ b/ext/dom/tests/DOMDocument_saveHTML_error2.phpt
@@ -12,4 +12,7 @@ require_once dirname(__FILE__) .'/skipif.inc';
 DOMDocument::saveHTML(true);
 ?>
 --EXPECTF--
-Fatal error: Non-static method DOMDocument::saveHTML() cannot be called statically in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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 fe7e4fc9d9..0ef15691de 100644
--- a/ext/dom/tests/DOMDocument_validate_error2.phpt
+++ b/ext/dom/tests/DOMDocument_validate_error2.phpt
@@ -12,4 +12,7 @@ require_once dirname(__FILE__) .'/skipif.inc';
 DOMDocument::validate();
 ?>
 --EXPECTF--
-Fatal error: Non-static method DOMDocument::validate() cannot be called statically in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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/regsiter_node_class.phpt b/ext/dom/tests/regsiter_node_class.phpt
index c632c613da..7fff3bfacf 100644
--- a/ext/dom/tests/regsiter_node_class.phpt
+++ b/ext/dom/tests/regsiter_node_class.phpt
@@ -37,4 +37,7 @@ myAttribute
 HELLO Attribute
 DOMAttr
 
-Fatal error: Call to undefined method DOMAttr::testit() in %s on line 25
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method DOMAttr::testit()' in %s:25
+Stack trace:
+#0 {main}
+  thrown in %s on line 25
diff --git a/ext/intl/tests/breakiter___construct.phpt b/ext/intl/tests/breakiter___construct.phpt
index a818075a30..a1e59ddf5d 100644
--- a/ext/intl/tests/breakiter___construct.phpt
+++ b/ext/intl/tests/breakiter___construct.phpt
@@ -11,4 +11,7 @@ ini_set("intl.error_level", E_WARNING);
 new IntlBreakIterator();
 --EXPECTF--
 
-Fatal error: Call to private IntlBreakIterator::__construct() from invalid context in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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/timezone_getCanonicalID_error.phpt b/ext/intl/tests/timezone_getCanonicalID_error.phpt
index c7ffb45b77..7fe2f61d51 100644
--- a/ext/intl/tests/timezone_getCanonicalID_error.phpt
+++ b/ext/intl/tests/timezone_getCanonicalID_error.phpt
@@ -29,4 +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: Cannot pass parameter 2 by reference in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot pass parameter 2 by reference' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/ext/mysqli/tests/bug33491.phpt b/ext/mysqli/tests/bug33491.phpt
index 8cab16ca4d..dbb3b7218c 100644
--- a/ext/mysqli/tests/bug33491.phpt
+++ b/ext/mysqli/tests/bug33491.phpt
@@ -26,4 +26,8 @@ $DB->query_single('SELECT DATE()');
 
 ?>
 --EXPECTF--
-Fatal error: Call to a member function fetch_row() on boolean in %sbug33491.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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}
+  thrown in %sbug33491.php on line %d
diff --git a/ext/mysqli/tests/bug38003.phpt b/ext/mysqli/tests/bug38003.phpt
index af71f85f2c..f1efa56b30 100644
--- a/ext/mysqli/tests/bug38003.phpt
+++ b/ext/mysqli/tests/bug38003.phpt
@@ -17,4 +17,7 @@ $DB = new DB();
 echo "Done\n";
 ?>
 --EXPECTF--	
-Fatal error: Call to private DB::__construct() from invalid context in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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 0e2438eef9..fe3a91af63 100644
--- a/ext/mysqli/tests/mysqli_driver_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_driver_unclonable.phpt
@@ -10,4 +10,7 @@ Trying to clone mysqli_driver object
 	print "done!";
 ?>
 --EXPECTF--
-Fatal error: Trying to clone an uncloneable object of class mysqli_driver in %s on line %d
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message '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_no_constructor.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
index 2fa80cfa94..d0786f9e1a 100644
--- a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
@@ -62,4 +62,7 @@ Exception: Class mysqli_fetch_object_test does not have a constructor hence you
 
 Fatal error with PHP (but no exception!):
 
-Fatal error: Call to undefined method mysqli_fetch_object_test::mysqli_fetch_object_test() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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_result_unclonable.phpt b/ext/mysqli/tests/mysqli_result_unclonable.phpt
index 0ecc30b62a..0b400396c7 100644
--- a/ext/mysqli/tests/mysqli_result_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_result_unclonable.phpt
@@ -21,4 +21,7 @@ require_once('skipifconnectfailure.inc');
 	print "done!";
 ?>
 --EXPECTF--
-Fatal error: Trying to clone an uncloneable object of class mysqli_result in %s on line %d
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message '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 57d8d6d6a6..efec3dbc08 100644
--- a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
@@ -22,4 +22,7 @@ require_once('skipifconnectfailure.inc');
 	print "done!";
 ?>
 --EXPECTF--
-Fatal error: Trying to clone an uncloneable object of class mysqli_stmt in %s on line %d
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message '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 e332b9f24f..7b54fe5e81 100644
--- a/ext/mysqli/tests/mysqli_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_unclonable.phpt
@@ -20,4 +20,7 @@ require_once('skipifconnectfailure.inc');
 	print "done!";
 ?>
 --EXPECTF--
-Fatal error: Trying to clone an uncloneable object of class mysqli in %s on line %d
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message '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/pdo/tests/bug47769.phpt b/ext/pdo/tests/bug47769.phpt
index 3b2f1e89fc..f6f2749cc0 100644
--- a/ext/pdo/tests/bug47769.phpt
+++ b/ext/pdo/tests/bug47769.phpt
@@ -34,4 +34,7 @@ this is a protected method.
 this is a private method.
 foo
 
-Fatal error: Call to protected method test::isProtected() from context '' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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 d16d8dd9bd..4170cec88c 100644
--- a/ext/pdo/tests/pdo_025.phpt
+++ b/ext/pdo/tests/pdo_025.phpt
@@ -110,4 +110,7 @@ object(Test)#%d (3) {
 }
 ===FAIL===
 
-Fatal error: Cannot access protected property Fail::$id in %spdo_025.php on line %d%A
+Fatal error: Uncaught exception 'EngineException' with message '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 a0ead4b75f..2880a1b38a 100644
--- a/ext/pdo/tests/pdo_037.phpt
+++ b/ext/pdo/tests/pdo_037.phpt
@@ -16,4 +16,7 @@ var_dump($obj->foo());
 
 ?>
 --EXPECTF--
-Fatal error: Call to undefined method MyStatement::foo() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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 8e915332d4..20a73ce703 100644
--- a/ext/pdo_mysql/tests/bug_37445.phpt
+++ b/ext/pdo_mysql/tests/bug_37445.phpt
@@ -17,4 +17,7 @@ $stmt = $db->prepare("SELECT 1");
 $stmt->bindParam(':a', 'b');
 ?>
 --EXPECTF--
-Fatal error: Cannot pass parameter 2 by reference in %sbug_37445.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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_attr_statement_class.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
index 631a918dd0..aee3e901a0 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
@@ -152,4 +152,8 @@ array(1) {
   }
 }
 
-Fatal error: Cannot instantiate abstract class mystatement6 in %s on line %d
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot instantiate abstract class mystatement6' in %s:%d
+Stack trace:
+#0 %s(%d): PDO->query('SELECT id, labe...')
+#1 {main}
+  thrown in %s on line %d
+\ No newline at end of file
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 224684b878..05f7de80e9 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,4 +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: Call to a member function execute() on boolean in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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 b7b0ab6294..d0201a1a76 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,4 +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: Call to a member function execute() on boolean in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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 c16ce5dd1c..61a9702d52 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
@@ -56,4 +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: Call to a member function execute() on boolean in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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 b367f3e188..0c2e75d2be 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
@@ -99,4 +99,8 @@ 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: Call to a member function errorInfo() on boolean in %s on line %d
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message '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}
+  thrown in %s on line %d
+\ No newline at end of file
diff --git a/ext/phar/tests/cache_list/frontcontroller29.phpt b/ext/phar/tests/cache_list/frontcontroller29.phpt
index 1cd8f96f2d..4cfcd6489f 100644
--- a/ext/phar/tests/cache_list/frontcontroller29.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller29.phpt
@@ -14,4 +14,9 @@ files/frontcontroller8.phar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECTF--
-Fatal error: Call to undefined function oopsie_daisy() in phar://%sfatalerror.phps on line 1
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message '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)
+#2 {main}
+  thrown in phar://%sfatalerror.phps on line 1
+\ No newline at end of file
diff --git a/ext/phar/tests/frontcontroller29.phpt b/ext/phar/tests/frontcontroller29.phpt
index 0afc17929f..b5f572d49c 100644
--- a/ext/phar/tests/frontcontroller29.phpt
+++ b/ext/phar/tests/frontcontroller29.phpt
@@ -13,4 +13,9 @@ files/frontcontroller8.phar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECTF--
-Fatal error: Call to undefined function oopsie_daisy() in phar://%sfatalerror.phps on line 1
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message '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)
+#2 {main}
+  thrown in phar://%sfatalerror.phps on line 1
+\ No newline at end of file
diff --git a/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt b/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt
index 6b440cfe06..a2eedf7c54 100644
--- a/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt
@@ -12,4 +12,7 @@ if (!extension_loaded('reflection)) print 'skip';
 $rc = new ReflectionClass("stdClass");
 $rc2 = clone($rc);
 --EXPECTF--
-Fatal error: Trying to clone an uncloneable object of class ReflectionClass in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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 5590137f89..4bffdf8473 100644
--- a/ext/reflection/tests/ReflectionClass_getName_error1.phpt
+++ b/ext/reflection/tests/ReflectionClass_getName_error1.phpt
@@ -5,4 +5,7 @@ ReflectionClass::getName - forbid static invocation
 ReflectionClass::getName();
 ?>
 --EXPECTF--
-Fatal error: Non-static method ReflectionClass::getName() cannot be called statically in %s on line 2
+Fatal error: Uncaught exception 'EngineException' with message '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 f1042cc130..c47859e428 100644
--- a/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt
@@ -68,4 +68,7 @@ Internal class - XMLWriter
 bool(false)
 bool(false)
 
-Fatal error: Trying to clone an uncloneable object of class XMLWriter in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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 4936413ef6..d83f9acce0 100644
--- a/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt
@@ -86,4 +86,7 @@ NULL
 
 Test static invocation:
 
-Fatal error: Non-static method ReflectionClass::isIterateable() cannot be called statically in %s on line 43
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message '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/ReflectionObject_getName_error1.phpt b/ext/reflection/tests/ReflectionObject_getName_error1.phpt
index 26c342d7f4..c846e27422 100644
--- a/ext/reflection/tests/ReflectionObject_getName_error1.phpt
+++ b/ext/reflection/tests/ReflectionObject_getName_error1.phpt
@@ -5,4 +5,7 @@ ReflectionObject::getName - forbid static invocation
 ReflectionObject::getName();
 ?> 
 --EXPECTF--
-Fatal error: Non-static method ReflectionClass::getName() cannot be called statically in %s on line 2
+Fatal error: Uncaught exception 'EngineException' with message '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/bug64007.phpt b/ext/reflection/tests/bug64007.phpt
index 50149a2a74..8ee07bf555 100644
--- a/ext/reflection/tests/bug64007.phpt
+++ b/ext/reflection/tests/bug64007.phpt
@@ -16,4 +16,8 @@ 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: The "Generator" class is reserved for internal use and cannot be manually instantiated in %sbug64007.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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}
+  thrown in %sbug64007.php on line %d
diff --git a/ext/session/tests/bug60634_error_1.phpt b/ext/session/tests/bug60634_error_1.phpt
index 276153e322..80d7c13bb0 100644
--- a/ext/session/tests/bug60634_error_1.phpt
+++ b/ext/session/tests/bug60634_error_1.phpt
@@ -45,4 +45,9 @@ echo "um, hi\n";
 --EXPECTF--
 write: goodbye cruel world
 
-Fatal error: Call to undefined function undefined_function() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function undefined_function()' in %s:%d
+Stack trace:
+#0 [internal function]: write(%s, '')
+#1 %s(%d): session_write_close()
+#2 {main}
+  thrown in %s on line %d
diff --git a/ext/session/tests/bug60634_error_3.phpt b/ext/session/tests/bug60634_error_3.phpt
index 4a508a4d8f..a930982743 100644
--- a/ext/session/tests/bug60634_error_3.phpt
+++ b/ext/session/tests/bug60634_error_3.phpt
@@ -43,5 +43,9 @@ session_start();
 --EXPECTF--
 write: goodbye cruel world
 
-Fatal error: Call to undefined function undefined_function() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function undefined_function()' in %s:%d
+Stack trace:
+#0 [internal function]: write(%s, '')
+#1 {main}
+  thrown in %s on line %d
 close: goodbye cruel world
diff --git a/ext/session/tests/bug60634_error_5.phpt b/ext/session/tests/bug60634_error_5.phpt
index 8081ab988a..da8de1117e 100644
--- a/ext/session/tests/bug60634_error_5.phpt
+++ b/ext/session/tests/bug60634_error_5.phpt
@@ -44,4 +44,9 @@ echo "um, hi\n";
 --EXPECTF--
 close: goodbye cruel world
 
-Fatal error: Call to undefined function undefined_function() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function undefined_function()' in %s:%d
+Stack trace:
+#0 [internal function]: close()
+#1 %s(%d): session_write_close()
+#2 {main}
+  thrown in %s on line %d
diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
index 2d5184495e..77402270d2 100644
--- a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
@@ -11,4 +11,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: Call to a member function xpath() on null in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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/spl/tests/arrayObject_setFlags_basic2.phpt b/ext/spl/tests/arrayObject_setFlags_basic2.phpt
index 806f8129a3..534c755995 100644
--- a/ext/spl/tests/arrayObject_setFlags_basic2.phpt
+++ b/ext/spl/tests/arrayObject_setFlags_basic2.phpt
@@ -26,4 +26,7 @@ string(6) "secret"
 string(6) "public"
 string(6) "secret"
 
-Fatal error: Cannot access private property C::$x in %s on line 19
+Fatal error: Uncaught exception 'EngineException' with message '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/bug48023.phpt b/ext/spl/tests/bug48023.phpt
index ed0ff9e35a..59bbb81f8b 100644
--- a/ext/spl/tests/bug48023.phpt
+++ b/ext/spl/tests/bug48023.phpt
@@ -9,4 +9,7 @@ new Foo;
 ?>
 ===DONE===
 --EXPECTF--
-Fatal error: Class 'Foo' not found in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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 843c2519ba..dff469f625 100644
--- a/ext/spl/tests/bug49972.phpt
+++ b/ext/spl/tests/bug49972.phpt
@@ -8,4 +8,7 @@ $iterator->undefined();
 
 ?>
 --EXPECTF--
-Fatal error: Call to undefined method AppendIterator::undefined() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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/iterator_035.phpt b/ext/spl/tests/iterator_035.phpt
index fc0271e381..d166cfdba7 100644
--- a/ext/spl/tests/iterator_035.phpt
+++ b/ext/spl/tests/iterator_035.phpt
@@ -14,4 +14,7 @@ echo "Done\n";
 --EXPECTF--	
 Notice: Indirect modification of overloaded element of ArrayIterator has no effect in %s on line %d
 
-Fatal error: Cannot assign by reference to overloaded object in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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/spl_iterator_recursive_getiterator_error.phpt b/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt
index 0d45c31513..9fee08b9f4 100644
--- a/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt
+++ b/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt
@@ -13,4 +13,8 @@ function p ($i) {
 }
 ?>
 --EXPECTF--
-Fatal error: An iterator cannot be used with foreach by reference in %s
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'An iterator cannot be used with foreach by reference' in %s:%d
+Stack trace:
+#0 %s(%d): p(Object(IteratorIterator))
+#1 {main}
+  thrown in %s on line %d
diff --git a/ext/standard/tests/array/arsort_object1.phpt b/ext/standard/tests/array/arsort_object1.phpt
index 8fd80f91b8..e7c5bf8035 100644
--- a/ext/standard/tests/array/arsort_object1.phpt
+++ b/ext/standard/tests/array/arsort_object1.phpt
@@ -87,4 +87,7 @@ echo "Done\n";
 --EXPECTF--
 *** Testing arsort() : object functionality ***
 
-Fatal error: Class 'for_integer_asort' not found in %sarsort_object1.php on line %d
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message '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 24da657878..b21982e6f3 100644
--- a/ext/standard/tests/array/arsort_object2.phpt
+++ b/ext/standard/tests/array/arsort_object2.phpt
@@ -91,4 +91,7 @@ echo "Done\n";
 --EXPECTF--
 *** Testing arsort() : object functionality ***
 
-Fatal error: Class 'for_integer_asort' not found in %sarsort_object2.php on line %d
-\ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message '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/general_functions/bug47857.phpt b/ext/standard/tests/general_functions/bug47857.phpt
index 10c3fa78e6..98c1981841 100644
--- a/ext/standard/tests/general_functions/bug47857.phpt
+++ b/ext/standard/tests/general_functions/bug47857.phpt
@@ -19,5 +19,8 @@ Deprecated: Non-static method foo::bar() should not be called statically in %sbu
 ok
 bool(false)
 
-Fatal error: Non-static method BaseException::getMessage() cannot be called statically in %sbug47857.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Non-static method BaseException::getMessage() cannot be called statically' in %sbug47857.php:%d
+Stack trace:
+#0 {main}
+  thrown in %sbug47857.php on line %d
 
diff --git a/ext/tidy/tests/035.phpt b/ext/tidy/tests/035.phpt
index 832f90fe57..a7183e1921 100644
--- a/ext/tidy/tests/035.phpt
+++ b/ext/tidy/tests/035.phpt
@@ -9,4 +9,7 @@ tidyNode::__construct()
 new tidyNode;
 ?>
 --EXPECTF--
-Fatal error: Call to private tidyNode::__construct() from invalid context in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message '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/xmlreader/tests/bug51936.phpt b/ext/xmlreader/tests/bug51936.phpt
index 4b5f1012e7..619b9ec1d9 100644
--- a/ext/xmlreader/tests/bug51936.phpt
+++ b/ext/xmlreader/tests/bug51936.phpt
@@ -19,4 +19,7 @@ Done
 --EXPECTF--
 Test
 
-Fatal error: Trying to clone an uncloneable object of class XMLReader in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class XMLReader' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/sapi/cgi/tests/004.phpt b/sapi/cgi/tests/004.phpt
index c841b68e04..e6314c9b61 100644
--- a/sapi/cgi/tests/004.phpt
+++ b/sapi/cgi/tests/004.phpt
@@ -36,7 +36,10 @@ echo "Done\n";
 --EXPECTF--	
 string(%d) "
 <br />
-<b>Fatal error</b>:  Cannot access private property test::$pri in <b>%s004.test.php</b> on line <b>8</b><br />
+<b>Fatal error</b>:  Uncaught exception 'EngineException' with message 'Cannot access private property test::$pri' in %s004.test.php:8
+Stack trace:
+#0 {main}
+  thrown in <b>%s004.test.php</b> on line <b>8</b><br />
 "
 string(25) "No input file specified.
 "
diff --git a/sapi/cli/tests/008.phpt b/sapi/cli/tests/008.phpt
index e14338f5f5..279064d3a7 100644
--- a/sapi/cli/tests/008.phpt
+++ b/sapi/cli/tests/008.phpt
@@ -36,7 +36,10 @@ echo "Done\n";
 --EXPECTF--	
 string(%d) "
 
-Fatal error: Cannot access private property test::$pri in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot access private property test::$pri' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
 "
 string(33) "Could not open input file: wrong
 "
diff --git a/sapi/cli/tests/php_cli_server_015.phpt b/sapi/cli/tests/php_cli_server_015.phpt
index e3d8c4170d..fc7d0f2b9b 100644
--- a/sapi/cli/tests/php_cli_server_015.phpt
+++ b/sapi/cli/tests/php_cli_server_015.phpt
@@ -46,4 +46,8 @@ X-Powered-By: PHP/%s
 Content-type: text/html; charset=UTF-8
 
 <br />
-<b>Fatal error</b>:  Call to undefined function non_exists_function() in <b>%ssyntax_error.php</b> on line <b>%s</b><br />
+<b>Fatal error</b>:  Uncaught exception 'EngineException' with message 'Call to undefined function non_exists_function()' in %ssyntax_error.php:%d
+Stack trace:
+#0 %sindex.php(%d): require()
+#1 {main}
+  thrown in <b>%ssyntax_error.php</b> on line <b>%d</b><br />
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
author	Nikita Popov <nikic@php.net>	2015-05-15 21:04:07 +0200
committer	Nikita Popov <nikic@php.net>	2015-05-15 23:40:32 +0200
commit	c9f27ee4227268bc74fc54e0e06102317e614804 (patch)
tree	35680688ecebfd7bc1321f21a6919133dffa666f
parent	34e6fbbfed6bd63e7f71ca61ff73ca67d0c12b7b (diff)
download	php-git-c9f27ee4227268bc74fc54e0e06102317e614804.tar.gz