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.

diff --git a/Zend/tests/028.phpt b/Zend/tests/028.phpt
index 2c58a87b32249a717245dcbb406b65e171f0e594..810c091a872a451eb5fda55de83f1a60b3cbc077 100644 (file)
--- 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 d7057b4844d2468f8135d0b2c93cb321fe551c2e..bda491d7e61ddee5a3b6f6b370a7d6ca01989ba9 100644 (file)
--- 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 637ea36ce95b4c2c8daf85ea5bd8dc3b5dce43ab..5fd65e5bef3cf05ec3902d0e9cdb7adb3907ab76 100644 (file)
--- 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 ca3b3eb6af6a2e4e65abddc2dcf00872549eb6b0..a242f7543eddc40f407884e0ed0f4e2463e29516 100644 (file)
--- 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 f0c9314b2d982b3d2c16176f4d1cb1f5880538e5..4023e24c2a587e40e6013685f00246ba31e21323 100644 (file)
--- 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 5629ed2ea4bc47ceef91ce4cb0ab4bb5cc955bde..b0a10f82f32c9221a7aac4a025076f4ede2af6a8 100644 (file)
--- 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 b7d44a86834c0820b35538eb5d9afaf713daa25b..455f664dfaa21aa73b50d3bf7874c60984cfbb50 100644 (file)
--- 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 e8c2aa83955111d2b980c875fb1d0348b4f3d124..ea08f84c263be6bd7efff809d40f126c32891aec 100644 (file)
--- 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 6c18ab8a09961464df1040e6b702517f5756b346..f5a4e0ac412c49fbf028ed5e61b5d1d5b6f89755 100644 (file)
--- 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 30c23faa0e99cab4194c2da882b0b679309665dc..f94c2290b4e11bcb295de1ec6fc840a2f9c7dbc8 100644 (file)
--- 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 b7911bea51ca9645275436b598961a582146bbee..0dbfd5a34f6f38602f7a1ec24c77859cb7fd854d 100644 (file)
--- 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 3a307189a4fd0bae33e8a32202dea97ff30a3cf4..d99e2f8e14c54aad50ad9e9bdff874381987b380 100644 (file)
--- 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 dc1afbb1535d164136156bc0ac6f460d0713eec1..4abb90866fae89d4c9dc635d02e705d7464c1398 100644 (file)
--- 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 84208a54f8654f1fb76e7f2322032c984609482a..91ee3e6f810205d67407b5659af4dec76ed78505 100644 (file)
--- 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 e5146091e134327d57e6f25a96f135f705b7a9bb..918cea83b2608dd39aefc16f0e86350e375a6e63 100644 (file)
--- 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 5276d50d48188d1fce5219fb50f0c7a0b9c91706..ad652ce01524f651deeac4d9ea273084b5705f8e 100644 (file)
--- 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 fb72f893457f476e8225dc3e65ef957d8804ddd4..974471ffd3ef2a7f127fd706610992c0c7a4f146 100644 (file)
--- 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 b15a43171b02eeed479e4fee286349151c2418c3..3180c8c921f9fac6245574a77abedfd33400bb3c 100644 (file)
--- 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 3deb4516acf0e2215fe67c3304e902bfabf0200f..d64092c691fea6faa501e30287d2f3ec79608353 100644 (file)
--- 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 7b9452db85d4d91954adbca7a7a4a49d0e95578c..bf0e95db8101e34ef959ddc4a7489a6bb606b872 100644 (file)
--- 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 c330b14fe8a4155311c3582a0625b803c750c9f1..5c52051692452e547c1fa921a444b6133c7d17e1 100644 (file)
--- 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 0ac3276b076d9052d368258929113c1b8389b3ca..4b872b486765cfdedcc61c12993994a0d28815a2 100644 (file)
--- 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 b1beca4d0aef030699d8420d7b43430f754df487..46d01170a7dbdd91af5be538df51c5aa34a80e8d 100644 (file)
--- 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 09ad693b44adce9dd508c41d82c7e3afad7ae73d..ea83ced5fc905f0e3e27d77ffe64bb5155af5df6 100644 (file)
--- 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 e5266036990d26e7107ca8b601037c7dcd88ed4f..e6bdba715b13c16b90d2d41697cf20a82900a33c 100644 (file)
--- 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 537c5679270526b5afadaa736a97e65a0bd1ad82..53e6fe7f492a4d3e1aaca9a943e6c87e83282a5e 100644 (file)
--- 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 e9f918cd613fb14f5bb0ccdd64fc661f58f52b7d..67508d0d69ccd4a58f0521d39b96300c0f48b565 100644 (file)
--- 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 b55cdccdeac0bf5f27b30ca9f5493adadd905880..d7c51e6361d4933d2ba29421749c0091eb4ac409 100644 (file)
--- 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 4d1e154f319aa4172519ed2e5cf07afd5cd3f8a1..1d14d4b40bedee81758cef3de2b647dd11a45e40 100644 (file)
--- 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 c6aaf92fb3a48a8648e865f8bfa326e535ac7d51..83d79864d1f78301924a0f77fcde78d39572a68e 100644 (file)
--- 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 57766afa9474cada8801459da1edfe7c23821bdd..094672f3d16fcf5f872cef36ebace91abd05ce82 100644 (file)
--- 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 38e1961aadce6af59dbbe937406741c2d832be85..ef9eb5886723632928ddbbeb81e099982f85eb17 100644 (file)
--- 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 94e00d9e1fed8ebb90a75c6ac5c4ccbc4fce9506..661e93aea817e7373a6473bfe8c21f631a78229d 100644 (file)
--- 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 eb694f7118f921fd20a3f0102a1d60a058a8e41b..14aeb7d8afacdb5e2b60d0a2abe3f4b466dbb9d3 100644 (file)
--- 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 31604e7a943cddb0a3bb15ff8d4d1b25d76ffeab..0642dc545a731f22c0e1728a2bcb8d4af84f9893 100644 (file)
--- 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 1a9ee892b63483105295f89f57750872ca6e21eb..aa0ae7ed4b4586a8346d7cea77274ca8498cb848 100644 (file)
--- 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 0a6e3bffcb8a903f4056778cb41e2b95ab4aacd3..43f28775e5f3219fc5b517ae194ebe85f2096c2d 100644 (file)
--- 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 92c020b167b2fde8d5f6b2129f6387ec020223d4..c6484a00f5e6139094bb7c1ffee1e57f5b9e60ae 100644 (file)
--- 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 6e5f4f68ab74bfd63245bda0f69dc774ae8849ae..378cae9ba514ebf30b4f7c6e9eccf09a55bd61f7 100644 (file)
--- 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 23ea5a494d92da81e6f14f816d8f7c71e09e3ce3..6e96c5bb31f6bf55e47e4c2494755b352b6ad1ea 100644 (file)
--- 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 151754a4f9617ce2b24ad70f765182d235136e74..db51d9eb20a0034dce6a401c0da74985c5581f3a 100644 (file)
--- 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 da6b7a84b650e4966acf2a83b86d3b18974ac251..aac5bfd5e27c28c27b30ecf17c68101a44bbea16 100644 (file)
--- 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 7fbc0d80287fc9ff2ece54eb17a8561e6e2cdef3..047a162953cbed75850a8efad77a10c0a11a4d62 100644 (file)
--- 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 2ad1ff6e5a1d1bab32079d92233a8c89d9d9523c..f6cdb796dd84b4a5ff1934518aa18bc7da95d6c8 100644 (file)
--- 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 ccdf858f65b2cc8d500994b5d12a3eb21a5a055c..bf9d494aaa42c2d0f3e6d0bad32d3c406522f2e7 100644 (file)
--- 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 1639c810293af4f806d11c6b043937c8fe8e9a3d..3ffb2af3e94160f948a14abba15689257f55520b 100644 (file)
--- 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 20dde3d3c51d144de92424aa99f8461717f53e4c..877b45d9e3e0afd509b5342ef10645fb9bd2df2b 100644 (file)
--- 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 0709c28fbc5917c08ed6cc1c1f7567d4298e67d7..69f64d61e81bcf6019ae1e4edfc6e0b48c308c9d 100644 (file)
--- 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 be6c0c31f562b49ce8dc6d43a72a33ad5e408d90..92b3a5e93a36d58dd9158ea996e005ccd1280833 100644 (file)
--- 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 36ebf203d25a6e74589bb36d1dfd29b75a0dded5..34d3d6e7d7b217e4081df9d223e92c13093fe8f2 100644 (file)
--- 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 6c33165bb5233fb2c59d87dbdb297fbc9f02d01c..fd71d6bdd630f23248dceb9bcde060927b6f3a67 100644 (file)
--- 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 29f086b5e34bfc98052f8f6cbe1e2c532a2e2c48..2f80e93b3561589aa7ba8c4308d9c1605c2da731 100644 (file)
--- 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 b9f37b7bd6a45feac6f58d0c9c3e125b16c4cf92..470d45f1f549898b1117d83930e95e7011593fde 100644 (file)
--- 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 be65513faa6df56ceed1d4c6891576908b4d8f24..e96a263aaaf0a6aec246128be4096716ca37c23e 100644 (file)
--- 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 5af33ef45b34ce77f2fe66b97f06a998479f181d..09d28dd3713833877d68488aef3c05f9fb63df14 100644 (file)
--- 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 b160acc63a92ad87a522f45cd94ca71a0af9e007..723c65747d33fc3155bca51b95e3c502b3ab795b 100644 (file)
--- 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 add15249db0d3e1436e1d9482b11b79c057aee00..cc675cc400e0659db80e499c2282cee958cb78f9 100644 (file)
--- 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 8ee8fa03f84e6730b5878a67abdd59b9504a39f1..b294b01ac9f6d791c2452eb03a99528c13bbf7ea 100644 (file)
--- 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 930f2ee0e4ad40cb4587d8cab8ebcd71454e43f0..8bb1026eaffad4817f9440084dc222d078be3046 100644 (file)
--- 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 e2c7d9245e000d4d6fd3411cff0dccbc3c10b705..a29f90c77dcf9e48f8007ddfc9c780dc2ce0b080 100644 (file)
--- 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 45270f6f7307113998ea7a9734c7439be292477b..8eebc58bda2cb10a2abf5328a767090161e1d402 100644 (file)
--- 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 27700fd64601021685c7ae086f511da0b2ee2567..32524d11f99184777545088282561194fdf91c39 100644 (file)
--- 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 a1078d0c7e9a724897026bdaa77e1d257f23dbd7..954ab2e23b99fb6616fcea8ae42d8263e7ead8a3 100644 (file)
--- 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 684470d211e7990bee157c70f0b7cdeaaf06a0da..fac2dbeb226d7e5e002f8c4f999871cf96a730a8 100644 (file)
--- 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 c8ff8d8340fd56844cadaa4ca81e3df2716a5640..9f147f9e3514dd55cbc279772063c1dc77be6782 100644 (file)
--- 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 362e3466e65ab08079f20082a46bcb53c3044f74..4a97c565b1a0205ca2247ef4d623740189429b7c 100644 (file)
--- 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 984313ce7448e4a10df2bffdeb2ac50b506307d8..10b18fbc54fea475e69d027b9ebaff0b016e4fe0 100644 (file)
--- 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 4e32faa017d751a4139ba30431411f39f9ac58c0..0143ac173cb2364a80c235646d6b82e9421c5fd5 100644 (file)
--- 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 57aa2dec17cf71e37e587e4941183111fae866b6..682c7db6346c8334fc6079910ad6ac26221a00d7 100644 (file)
--- 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 bec2bedd7f28725c65596af98e4e9b885b8bf60d..edc9659ca13743b73d85da25d927d61d9e626cbf 100644 (file)
--- 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 25fbe931d8ad31596343caa30bcebda8de6e8f7a..55f1ff5a8d3ff511fcbb73461276c7f127ae1c56 100644 (file)
--- 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 f6510066bbc681e8c6de863653c3590dadbd5b2e..bc7eb88b2f0b91e061f58db957eaf66712046c2b 100644 (file)
--- 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 fef07347864404bff75a47de3d54301b4ff29de4..b1e940687295b3f756b9179b72bb1c07f7ada7a0 100644 (file)
--- 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 c6a727c0fa5398e9055a4a5d62fa05f9109970ed..9e5ecbd21bfa08647273de5c62e413e5a529f3a4 100644 (file)
--- 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 440eabc65279e6466e711eff5cbdf0f4d8af017e..ded692c2c46c24a6490c5a876cf5723b2c5d19d2 100644 (file)
--- 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 ae76a086022f7902acfd435d1ba6f334171f060f..6820f47ded15ec8594b7a8a494960ef9b53c1525 100644 (file)
--- 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 da13decc396be6b7de19d31e698281d8f5e21ebd..4d8d9c9942fc112b589f0e68afeaa875bd908cc9 100644 (file)
--- 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 6acda77ba84e5ea326aa7e96c00ac9a7afe4b259..16c76eb77706cdbb32d60f914666e116a86a0c89 100644 (file)
--- 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 b74743380c5ea89f8bda144edd7f001301db8993..6a7794fa46242487782561758e00248c6063f8d1 100644 (file)
--- 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 9a22dc2c6b0c1de051fc5931df401c76d32d626b..5a1025cfa74cdb8fca1cca597bce3904222c856d 100644 (file)
--- 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 dcb152969275454a8c0fba9c44c0c4d16a4f4a81..c8fad52241d13387e37a49504d5b9c51f11b5635 100644 (file)
--- 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 15b830ec684455f4a450fed6bfa5916efcb60763..7d5e3e55077fe643abf569113c51e5e82b7bd210 100644 (file)
--- 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 6e833035a605228197a248bdf0baa10bd2796e41..056adfc16ba87800bf472476709598e12b0d3bbf 100644 (file)
--- 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 e908845ae4c166d3e1c95f2b38f1a565b2af41c1..50234f89c686d6d9d01a6fed7d8435ca545c7198 100644 (file)
--- 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 77d947f47ee6242af7188277aa994640274b8245..cc9990c386bfce7fa8459dcdcd3eb43091ed1b3f 100644 (file)
--- 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 45a926960511fc6ee27dad9bfd8694c345095100..e52b907ac3be6a9a3c8c88d3f1ffe36882cb4487 100644 (file)
--- 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 5c981fc1b67be78207b9418639999897f306b891..fb131b5de40f7c1b1d2fd255a68e308e93c9a86c 100644 (file)
--- 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 72e9377866cd9ac0e505c4518bc669df115323f6..4bbfc320509320c4a01e335cbae1d5a3273e4f6b 100644 (file)
--- 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 71bb14df1dcd48080027460e3fec814360d440d5..c1f8615926e1b3afca587c54e4334a1f822e7ed6 100644 (file)
--- 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 033848950ebd735b6f33333ca8c0153e55fb7d71..f4db02aa40e2e73049e412c3671fd66893f1a73b 100644 (file)
--- 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 ffa0a45b8449e4c86623a7fffae2d76150f5410b..f4ad66855b3129c533cb13f9a3ff39d84849024f 100644 (file)
--- 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 9ce9ebd8c31206ead0d8ed38ff213a4a51dcaafb..5a5cca7488b98a142911638790edd015338add27 100644 (file)
--- 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 8c4c8b4a84d3a337edc455094424448f6e70265c..439b1f5a6453e0e24564c2d6a5aa2244167f4ea9 100644 (file)
--- 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 215c1880e3a610d76215388f339029991670c718..104462fd22c3f2fdd041869b0ca989b60ac3a630 100644 (file)
--- 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 22f4428121845b6d0aeaf8164f41bd457d93d092..cdf0453577139f5c6a28b5c89332b95e7cdcb915 100644 (file)
--- 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 990c7481c6a0436b2b908f5c0b170326003bd2cc..a67a2f30c8dbfd502f81385c4206e374bf079bfe 100644 (file)
--- 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 9a39155d389b3316899b04e9fefd4236935c160e..e31a2c49ae1ab6774a72d5cadaf17fa16cb4647f 100644 (file)
--- 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 aada676a68e8e4b9c340d9076d5dbaaba14fbf8b..83523b1baa2fd0d1041bc25419813e96c19df624 100644 (file)
--- 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 d93903e2150d1fa1a46a6690ab97c61a77eff43f..4ff1464e7c58d56f44a4f48538679a457446d8f2 100644 (file)
--- 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 789490ccd3d76da8cfb89300ca56437e19dfeebe..16fda983687e8c529e37c998a4b42a4dcb468030 100644 (file)
--- 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 56675b81a5bf35366bcaa9087a329e733277b8c3..73bd1584ef4a1b64b7aa150ff9300f3c9c402fea 100644 (file)
--- 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 013fa559fe78a1e6cca354b8348f2eb8536e30d0..09c3e79e1a0ffe3d4f8cec8ae55e8a2454fb5ec5 100644 (file)
--- 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 1589533bdc81f356c7dbd92538f24f098661eefd..8b3e9299dd405a1d32175a472c50c41946fba9ab 100644 (file)
--- 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 a3b0d574340b224f79a2c80b59ebe49a815b48fb..d82120e2522738c2a62c9882fd59dd3bb3a864c5 100644 (file)
--- 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 cc712406ec6a9dbd4f78bb134cf04136974f42fb..1752b749d8991adf3da7a35a248bb1eec5eb8766 100644 (file)
--- 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 baf9e1c8c707e1eb64fa1048ecbd11502105b916..803de1cffa205e58720065d398c54674ea9190e0 100644 (file)
--- 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 2a827af74ffde5efa23b32e748936356b108be0a..71ec3feb54817f11b68b519a5c4da72f4bb6a56f 100644 (file)
--- 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 4c9be5befad6ef9b0ad87ecdbd30ff7678abe380..78899a4652948ddcab22af9af0b5d583e8ae10e5 100644 (file)
--- 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 d293f65dce313336628e4a0b699d00f8cdaae6e2..e7b63ea1ac20b1bb9ef5ca050de5a6b3baa02137 100644 (file)
--- 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 45f88750ebbb04778df5008b20e5ae090131e58d..bb596901e3d52dc15c21778dcb7d25262fa8ff30 100644 (file)
--- 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 f3a8c8cc632f74654cf5e9f99821dd70a27ef6aa..5664eafdcb0fafb9e56e6c3ccf4518557d37b009 100644 (file)
--- 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 13bf3054ccdd6a121d2b03b464fef462ba44dbca..aae2e7c12ba91244d51c3d3a732c571fb139db8d 100644 (file)
--- 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 7a0cd97d922aa9a9162ad0527a6d1229230adfd6..b46c968ff4d68eee8294a53b1a57073247820290 100644 (file)
--- 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 eeda39bd2ec123826072ccd9d78e6f5f507c2ea5..ac4e519b8aaf27088bff449e3246c2376e145f7b 100644 (file)
--- 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 5a9c4b15393b6d4c03faad782ea672ccd80563d1..ffe4a7d3a50319969b2f94143a7ff809bb8e827a 100644 (file)
--- 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 8c26721855ba646eb26a193a2dd42c6c822fc30a..c8c1b96399307e9f42e838009343c56f77e42e6a 100644 (file)
--- 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 bdeb7924e61c37d37de8861980c5cde35cf9439f..ff53e793c28ffcdec7e0ffa5d207044610cd1f1b 100644 (file)
--- 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 aef91fd3e666e95278a6880e0cd62d7e97a504a4..4b7f06dc9ae9fff92e5b486ba2be0c2aa17fd6e5 100644 (file)
--- 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 17afe03f4b20fe33611f21f3774dfae8fd67f246..ade0983e1ff98defd81607e78d773124600b131c 100644 (file)
--- 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 17afe03f4b20fe33611f21f3774dfae8fd67f246..ade0983e1ff98defd81607e78d773124600b131c 100644 (file)
--- 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 9bf5baf058788cc8e9a2a85db2f1c98ccbb25cbb..650eb07b63479ccdbb95f0e79482efc758d30c32 100644 (file)
--- 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 9f9240db072505cb8bd7dbe8dd3d8acd23447f8c..34e955416404cf5d44aa9e94ab7a4abee48032c9 100644 (file)
--- 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 a5d1bcb6e99b53139d89c83a60ef53a21935c24d..ef0f5dacf951c8ecac35e50d705d4c6741533320 100644 (file)
--- 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 63030304ff2dde76a0847b78bfe80375cbf20d1d..c07de71b73e7a124fe9648872bc820e98fe9bed0 100644 (file)
--- 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 110ffc69b7e7396ded92c6af577131bf3ab1b5c6..e2711bd4179d953f7773d43a06584ab78f7c7666 100644 (file)
--- 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 eb3a89f67801d8d8cbe6e89c65ac03e06eff3e06..e3bc411a468ce0789dec98f8e3787af8e9ab1da4 100644 (file)
--- 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 5e8de185f2541298dbe9515ab86f4d39b69e12e3..883785d75c60754f75b8e2d8b4380e871c7b52ef 100644 (file)
--- 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 8b7cfe39a8b2e78bbaffa2c0c5328db6e5431b3c..21e42cb2475065102782735c629a42b1394e072c 100644 (file)
--- 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 721516f53cb2f1405f7eb92474b602c50f99546e..ab547c8cd172f8e75598c4bbd78f03af71f25938 100644 (file)
--- 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 b570fd2a2f6e17d02faa9539e45c5cb071f8b687..4b9d9329a2d815ac10803fd1a998a2d2a3c90d64 100644 (file)
--- 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 0e67173f87eb4434618892e06ebffddbb7ac4dce..8cef8619e3958158ac385dfa98fb425e9c67e520 100644 (file)
--- 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 1c465e5bae8054c224f303d408367d15fe91f34d..596a7c6eba80c5b4a5356bf27019fb3496bc151d 100644 (file)
--- a/Zend/tests/str_offset_002.phpt
+++ b/Zend/tests/str_offset_002.phpt
@@ -6,4 +6,7 @@ $a = "aaa";
 $x = array(&$a[1]);\r
 ?>\r
 --EXPECTF--\r
-Fatal error: Cannot create references to/from string offsets in %sstr_offset_002.php on line 3\r
+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\r

diff --git a/Zend/tests/sub_001.phpt b/Zend/tests/sub_001.phpt
index a9438fdcde007d98f92c2fdc078f1b314d2026b2..bbfdaa7fa5532917f5c8a56a09a482fd574755c5 100644 (file)
--- 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 a28a1033a09bdd26743d38e17a366b4c16d12490..ddc667693bb3f01920b63d3a260c312272763b36 100644 (file)
--- 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 b60261efac0979613230fdb8489401589447a2be..094948c27342e26eef4dbf13ac091c36fd5d0c7c 100644 (file)
--- 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 82a6a2e94139627b301092a63a7469d2b062d705..92ff6641741fbfadd3d73670ef86556bdbe3d5c6 100644 (file)
--- 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 b90e32ac848e4126261b14f98cc63388602e4b5e..8e631fd5cce6ee192e662ba1ae3f6d5e45222e3d 100644 (file)
--- 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 5a12a4e74b5ba075624ca9e25d6684b84ea36d7a..45164d550c520dc3565f56182e44f70c193722c4 100644 (file)
--- 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 9abbdbeb0dc250a1b929be6820c285bf05f5ff31..14e4ba81980229df6cbcc0b8575065b8ad50bdb1 100644 (file)
--- 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 64e2a154cea303433180caf1afb75d50c3739b50..40978c17fb90be44ada3317ee9e7b40d814a505a 100644 (file)
--- 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 6597d0d30173d725a8989e7af7caa548c578f5fb..45fc32c4da1c566e8f171cd9e1a82247a9204de7 100644 (file)
--- 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 5d012c10e5912322076abd7cfe0334dc5f6cd9f4..24551e00892160c823d166e4f3c87d73d81bfbb6 100644 (file)
--- 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 01ea5f2aeab040c87560aecc94ee0a1605f33ffc..93b51a2570f72afda8146322f94075cfdd62e153 100644 (file)
--- 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 492627302faadc2804c6ca20e2e38788e4b4c1b4..9421d8edc5a991199da40ee6ff5f5282ac7168d3 100644 (file)
--- 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 f8298a936dca2d5268509c5b22efcd6ecb533a66..8bcb9198e7ea1d7391b6722087f1a98de23e1886 100644 (file)
--- 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 cb8b79ece956e487269464981c0b9947bf9f8149..671c09cd608786200b1633878c817dd7646f9393 100644 (file)
--- 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 33e07c641d8f5ef869cc83cd970433e589a83ed5..2ef17926aa45c16c13976b39123a20c861aa82bc 100644 (file)
--- 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 614605b34a2de89241404e6276d74cda5894360a..1f7c95c6ae594e69f13cd2a212846090d09ca104 100644 (file)
--- 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 fe7e4fc9d93198bad1eeeacc1a880fd821cd1ef6..0ef15691de801404687743575248ae513636b880 100644 (file)
--- 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 c632c613da1e32a7722097d8651a205d71d15c8f..7fff3bfacfc4b2980ad155d730219a1f6c9b81f8 100644 (file)
--- 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 a818075a30c2aa697e7f5271a7c3b5ff34e6a3bb..a1e59ddf5da9452015911c12358d40e118e073a1 100644 (file)
--- 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 c7ffb45b77728844678a7ec1331699e5f6d0a6b2..7fe2f61d514c8fec08a335d9bcadf5910f7506e3 100644 (file)
--- 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 8cab16ca4d9210ef6935347180f757a352c1b23d..dbb3b7218c613088d00a474fb8567cbe33ae4604 100644 (file)
--- 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 af71f85f2c2a454cc8337df4d6323cbd3d037c6a..f1efa56b301733a8feaab79071aaf9e0a8afa888 100644 (file)
--- 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 0e2438eef9537f119f87d1dd48d6940992e5c308..fe3a91af63133e658346e4c808cebcf1044e970a 100644 (file)
--- 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 2fa80cfa94987cc851e1ca98d2658d16e74a526d..d0786f9e1a90a8896fd67eed85ec09f98d462202 100644 (file)
--- 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 0ecc30b62a3e15b79f2553bc821af68490faf382..0b400396c7d4ab58df89d8e86a8ef73785845c92 100644 (file)
--- 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 57d8d6d6a6c4e3f74f9d4cb15e2a80aa815003b4..efec3dbc085a6c9882a6851a08de6de5197a8958 100644 (file)
--- 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 e332b9f24fef0d150794fbaff5dd56bb272fbf1c..7b54fe5e81844ca919c08e622757c5708de01b27 100644 (file)
--- 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 3b2f1e89fca2bf352be0a0009348bad38195a543..f6f2749cc0d779e5b0eb82a14efd97c8eead5c73 100644 (file)
--- 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 d16d8dd9bd907441da983030754fe4adbec08604..4170cec88ce998147b9d139debf2ed9f96defe69 100644 (file)
--- 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 a0ead4b75fff884fd82f14442c965177dd8d1ad3..2880a1b38a85eaaf37aa2f559b40a01892e23688 100644 (file)
--- 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 8e915332d4278ade122eac6e59e2e363df0f994a..20a73ce7030608f264263850600574710cc60adb 100644 (file)
--- 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 631a918dd067a7ae5066bab6a5899c6bab7941a0..aee3e901a018627d1f84d7cb76d35c4c6886b415 100644 (file)
--- 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 224684b8782d9edfc36440feec78360716ed258c..05f7de80e91ae0fe55d0a8f21cb61a2ab345a34b 100644 (file)
--- 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 b7b0ab6294cc1451825e5c9f6795913ab75e0ca6..d0201a1a76d39a990f8d5af6d731c23d06010e67 100644 (file)
--- 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 c16ce5dd1cbdcb3ab98aab96334783955c0a0fa4..61a9702d528e0cd3b37677ac702189eba3482f5f 100644 (file)
--- 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 b367f3e188be15c28665b11bdbf5c18c2fe0d092..0c2e75d2be2ca8264028735b1c29a41820de0e42 100644 (file)
--- 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 1cd8f96f2d31bb4fe5216c71ff76c9be7a356826..4cfcd6489f5993269a34add276e09cb56405cd8b 100644 (file)
--- 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 0afc17929f37fba45447f8bb9bbc3d5acd1f1cf4..b5f572d49cd5bc30010c4eed79fb5b5ef4d8c1d4 100644 (file)
--- 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 6b440cfe060444be59c48c3dffa73349d09ae025..a2eedf7c546cbe773190d914a2b226f3e94451d0 100644 (file)
--- 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 5590137f894c8813dae9154f3684385d8d2ab7ff..4bffdf8473f892180a76b3ce585cd70b82e00efe 100644 (file)
--- 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 f1042cc130ffef29ece510e0052ca0ab5bdecfe6..c47859e428956f93414d0c48864b7aa4ffc5b5b1 100644 (file)
--- 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 4936413ef6ec847e57a7a61e07f10e6deaf96de3..d83f9acce0ca7ad3f12fe66053c03f9488f78bdc 100644 (file)
--- 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 26c342d7f46b209a64f00f20cb0571c1912297d3..c846e274229af2f977c3275bda2bcabd48772c0a 100644 (file)
--- 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 50149a2a74c0e79c83337085ace34aa929d4502a..8ee07bf5556b7fdf6d381d511efc0b4415cf7167 100644 (file)
--- 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 276153e322ebf268f5406cb38f23a5112a9a9b5b..80d7c13bb01b476881748bb7a36f9c2851672b18 100644 (file)
--- 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 4a508a4d8fe070f6da73b2dc7d1f0c4f01701f08..a93098274370a5a55e1c9ef229249de776a83f6a 100644 (file)
--- 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 8081ab988a3397254af661ffdc6284588a9d4b20..da8de1117e0c040961a02a015283172bb3f71d62 100644 (file)
--- 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 2d5184495e21ec21faf0750631e8a57b2c0a3df7..77402270d293ebc28d27e268683a4b9d3a8ac2f3 100644 (file)
--- 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 806f8129a33319af95b372bf52bcbe6b03b0cf0f..534c75599572a1b848aa6a08a14aef48e2afc796 100644 (file)
--- 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 ed0ff9e35a79a161ef562b67a9175b9b9108d3f2..59bbb81f8bb5ca15b2ae74ae77e20f1c599c0015 100644 (file)
--- 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 843c2519ba6fcb8b3f82d6a3f70269eb5e053b37..dff469f6250f82fe4c17957ea59fe45847d38fc8 100644 (file)
--- 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 fc0271e3811d71bcf0203018cb9dd4f94a39ea1b..d166cfdba730d83131ed0a9f64f698cffeb3ad3f 100644 (file)
--- 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 0d45c31513c31a51711f2686882013fe36699ad6..9fee08b9f4e9310e56e9ac221f1cbbbff746fadb 100644 (file)
--- 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 8fd80f91b82adc70e4772642bdbab51314515aff..e7c5bf8035caa62e4cd92820b3a36717802e630d 100644 (file)
--- 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 24da65787859aa6f01dcaa3734db807f09d53d35..b21982e6f3bbb9a4772fcca636dd205a862d45df 100644 (file)
--- 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 10c3fa78e6c9361890e25d23756b9aa05360c541..98c1981841910527c368be92de0d443d87acd777 100644 (file)
--- 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 832f90fe57cf7fba9be11d9cc95a35ccf850dcb2..a7183e1921f76a2d9619de5a672b78d793b2a336 100644 (file)
--- 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 4b5f1012e79c045b97cc4184154c5570e90e9dc7..619b9ec1d9e6f0f20b613f934e7696b12b7cbb5b 100644 (file)
--- 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 c841b68e04f6306d577123e9bb7ba45ad1e34ecd..e6314c9b6142edc2151dd23414e6da40c25b785f 100644 (file)
--- 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 e14338f5f5589a466245bb9746052e71617fe39a..279064d3a776ef9a219512da33c33799e38f97cf 100644 (file)
--- 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 e3d8c4170db5ae6ae890b80a477397fb79048dd3..fc7d0f2b9b47c4165744b98b10d6d06b3646573d 100644 (file)
--- 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 fbebf4da738985ed51ae8f7df8f73f8b86623909..c827d27108167e5584b790d09a242e9c0fac246f 100644 (file)
--- 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 571a9b95814fc118d8539250cd3969116069f5d3..097cab13246c31ba0d5bb2ca2db6662e1f794625 100644 (file)
--- 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 362ccb0b766d9242dea0b401d69316b860af43a6..baf2a79f60e848931121b776abc41beefa989f4e 100644 (file)
--- 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 0e1ddbe7961c777e561f4143d65082ba4740db01..f19bb7c603cab4c98afa2e28fff9204163c93f59 100644 (file)
--- 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 8f85f296eb9a485556b37f2c98b31938b66014e1..c37eaf246538c56fc9aab13b1445b453ed9f171f 100644 (file)
--- 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 13562b40005ddfd9aae37ba33dae9084f9222313..5ec4ada9dfd9b78d303b047f7988f38255361af1 100644 (file)
--- 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 5f2c5a03ce7ac3abfc7a24f1e7be6ab2dc50ff89..14ab661daeb7e8483ec108494eeda0f342e9565a 100644 (file)
--- 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 880f84930fd46243ac1db15eb6cac34dcc70786d..3de53c35dd31f4ceba07e37b82b1d199db85b6e5 100644 (file)
--- 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 74b0fcdf48fb9824627749829b7a873320b1c5c6..a9fbcbb48e461a878c287e97c8dc15d738e17b10 100644 (file)
--- 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 8d3b1c5c501be33ac19a22c861d75143f578ed02..5014b0fbe281a0df90b5df86a90f841b13806860 100644 (file)
--- 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 7674c512f62a7ced0f5dcc1040234203db3329d3..0b3a3aa7d0e05f221d1669aaab8011fd8172d9d7 100644 (file)
--- 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 3d50a810a6b008b51bff67cb8fb83e5623209fe6..5dcb67a0c23a4cc23f9364d6896d74a63a918589 100644 (file)
--- 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 14edcb1fc8ffc53ca7b4e67029103d5f7eaf9303..c3787c05fc51b90e895f983eedd592ce27dc6299 100644 (file)
--- 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 2cd7e5cc997b7cd84503e3ff4d0e74755e8b10a3..c9c9e34ebba14c15f4708827cb94902d32a4cab8 100644 (file)
--- 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 81cf714888b8739c885fec90027037214f998bda..8773ec6cd4522fa82c7d988d053e46f6127bc9e6 100644 (file)
--- 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 4788dbf08795d5f40cffc45e21847c792c1e3ab9..5dd40512573fe83b60687bce499b538f184f8e47 100644 (file)
--- 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 750b9db340d1eaa8905eaab7665e72de1661a40a..90c3ada4bb100db022dafa09ca00c311401bd7eb 100644 (file)
--- 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 61c4e6b95ba0a43351022b7db0d82f3676f4e319..a89f173aa4dd60fc85364de7dde1e967e35277cc 100644 (file)
--- 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 310b9c64343baaba657f3d67b9b458b0f9b7131d..a6b27235b0fa7cd4d014a8218d6a5419d91d570a 100644 (file)
--- 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 258fd3a17d8fc096b305ff07e48648897ffb0999..7cb41e7e7fc357dd35167752625f4a75cadc104e 100644 (file)
--- 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 716efbc8c781f7220080cded171bef0ccc4dc305..c8209457bdfca0ba0ba4b013fe44dd0925245e69 100644 (file)
--- 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 780b2e6b4cb87c29b91d05e478f3e99dbebe246c..a4f7701ada4e2619b102778566f1bf56d0fc5178 100644 (file)
--- 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 027434ab87f575be7ef46020977efd864ee97188..379cc27a590bcbe847b4ea0a237fabb4c290d460 100644 (file)
--- 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 2d1850b519c0dee40c8594d69fb9f079c95748fc..91433aadc176777bf2cbb100706b7a8c69d39b5c 100644 (file)
--- 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 49b2bee3badba89dfd0bbffc0a2933fa643a628b..32c05fe35854f9e6fa0da1e7a868b1a0b706a7b3 100644 (file)
--- 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 2d1850b519c0dee40c8594d69fb9f079c95748fc..91433aadc176777bf2cbb100706b7a8c69d39b5c 100644 (file)
--- 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 e3061f1136fac94d7f4ec1b07183b442fd36f959..067cd7d9d2056bc937cf79893dd5874ee15ae467 100644 (file)
--- 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 410395e0e08adb04646f9d825d19b4c6fe82579b..fe7c7d249ffcb14bbdb6c064501368bab1cf444a 100644 (file)
--- 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 f8444c3a2f168d5cb6919fb281cbc4cd455bdef6..01d156bff29fc422f114b1b8efbc97db40035a23 100644 (file)
--- 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 19872c6f16ca13f706fe9c6e8d370e1af00cde23..dce77ac66670cd9f6b3d23674161c8d76a57b763 100644 (file)
--- 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 4d24a926ea6b35d8befc57fad40f8b4755a665ee..c9139c711dcc39ddfac424825785f5ebac4aa533 100644 (file)
--- 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 f26ef9c495f89c3cc9cbf67afd83b2a2c6b17b9b..837cc552ae229bdccba568d5172fab0ef2a760f6 100644 (file)
--- 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 7a5e3d931ad3df54d887e2d344a34d317c85b192..b7673f70d53e32f61e4b3dd4e0cf1edc7415c5e8 100644 (file)
--- 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 589cc6909e094c747c9b38a3ada39ed7cbe8bcad..3183e2f73a9efb4399aeef1a5aa3d7194642bd1f 100644 (file)
--- 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 3e01e0e42b88dc5d2add85a3759f1579f1d9f703..f0368a3763970ac7ab91b09bfdeb1bc5b272ae95 100644 (file)
--- 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 fd69a9ffb8f1ea8b476f1e9ad79140728e5e94b7..a6fa9d4044eed8ba4141bb9baca914a70444ca1f 100644 (file)
--- 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 aed65797b40bc83873606e8de522dda34a8f33e1..d2918fa50993261d816989bb2dee4364eee6d149 100644 (file)
--- 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 9680bf5f15bf44cdbf49e18c78619d25e4ca1f52..bd015a048306ec202812680005ae9cec93519d5a 100644 (file)
--- 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 9f677f6c58cd89cc26cc5675c7b510b146571842..4b011916162508691b31f36dc9bde5bf1b83d576 100644 (file)
--- 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 a9b28d6cdd84a77536952725c7d8565fe7adf57a..2b5359063ff1c348fc01d83f830e7eccc19fd1b6 100644 (file)
--- 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 ae518d8ee187cc33189ddf416cdd94558f417a0e..13dc6ed7487bd27fc1277b49b8117efb400f7ecc 100644 (file)
--- 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 6972412d5b7a323de99f6e45df87b58a40bda02d..72ab0e4a62e5a5beec154c7c041e2218f3d75c9a 100644 (file)
--- 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 217aab83e342cdb99ce85357faaf40856bad30e2..ad6e081222d39861c739ae9ccae6efc2f7fb82d0 100644 (file)
--- 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 7ca2d74b69022f90bb56bb35b1e9ad1763dcec72..8425d9f3d381916a3f8311770411ce4a8eddae11 100644 (file)
--- 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 a0de889a7a397c62c4c963a4df9bd97b97270f71..bc5900a301ec85a451a20c92b8cd61ef9ab7d8c2 100644 (file)
--- 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 fda3fdfb2b59dcd219061b6c4fd56f4ac7d1b47e..713aaaa8f8299fd322d6757a023e09ee49e467c0 100644 (file)
--- 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