diff options
Diffstat (limited to 'tests')
56 files changed, 243 insertions, 59 deletions
diff --git a/tests/basic/timeout_variation_6.phpt b/tests/basic/timeout_variation_6.phpt index 607db5e94a..d3d843ca86 100644 --- a/tests/basic/timeout_variation_6.phpt +++ b/tests/basic/timeout_variation_6.phpt @@ -22,7 +22,7 @@ f($t); never reached here --EXPECTF-- call -Fatal error: Uncaught exception 'Exception' with message 'exception before timeout' in %s:%d +Fatal error: Uncaught Exception: exception before timeout in %s:%d Stack trace: #0 %s(%d): f(%d) #1 {main} diff --git a/tests/classes/abstract.phpt b/tests/classes/abstract.phpt index fbebf4da73..811aa45a13 100644 --- a/tests/classes/abstract.phpt +++ b/tests/classes/abstract.phpt @@ -27,4 +27,8 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call to function show() -Fatal error: Cannot call abstract method fail::show() in %s on line %d +Fatal error: Uncaught EngineException: Cannot call abstract method fail::show() in %s:%d +Stack trace: +#0 %s(%d): pass->error() +#1 {main} + thrown in %s on line %d diff --git a/tests/classes/abstract_class.phpt b/tests/classes/abstract_class.phpt index 571a9b9581..1725d45762 100644 --- a/tests/classes/abstract_class.phpt +++ b/tests/classes/abstract_class.phpt @@ -26,4 +26,7 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call to function show() -Fatal error: Cannot instantiate abstract class fail in %s on line %d +Fatal error: Uncaught EngineException: Cannot instantiate abstract class fail in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/tests/classes/abstract_inherit.phpt b/tests/classes/abstract_inherit.phpt index 362ccb0b76..1657599787 100644 --- a/tests/classes/abstract_inherit.phpt +++ b/tests/classes/abstract_inherit.phpt @@ -19,4 +19,7 @@ echo "Done\n"; // Shouldn't be displayed ?> --EXPECTF-- -Fatal error: Cannot instantiate abstract class fail in %s on line %d +Fatal error: Uncaught EngineException: Cannot instantiate abstract class fail in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/tests/classes/abstract_user_call.phpt b/tests/classes/abstract_user_call.phpt index 0e1ddbe796..5118efda99 100644 --- a/tests/classes/abstract_user_call.phpt +++ b/tests/classes/abstract_user_call.phpt @@ -27,4 +27,7 @@ call_user_func(array($o, 'test_base::func')); --EXPECTF-- test::func() -Fatal error: Cannot call abstract method test_base::func() in %s on line %d +Fatal error: Uncaught EngineException: Cannot call abstract method test_base::func() in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/tests/classes/array_access_012.phpt b/tests/classes/array_access_012.phpt index 8f85f296eb..ef8553493f 100644 --- a/tests/classes/array_access_012.phpt +++ b/tests/classes/array_access_012.phpt @@ -33,4 +33,7 @@ $data['element'] = &$test; Notice: Indirect modification of overloaded element of ArrayAccessImpl has no effect in %sarray_access_012.php on line 24 -Fatal error: Cannot assign by reference to overloaded object in %sarray_access_012.php on line 24 +Fatal error: Uncaught EngineException: Cannot assign by reference to overloaded object in %sarray_access_012.php:24 +Stack trace: +#0 {main} + thrown in %sarray_access_012.php on line 24 diff --git a/tests/classes/autoload_009.phpt b/tests/classes/autoload_009.phpt index 7b7e88dd26..b25d7eb69d 100644 --- a/tests/classes/autoload_009.phpt +++ b/tests/classes/autoload_009.phpt @@ -14,7 +14,8 @@ Ensure type hints for unknown types do not trigger autoload. f(new stdClass); ?> --EXPECTF-- - -Fatal error: Argument 1 passed to f() must be an instance of UndefClass, instance of stdClass given, called in %s - - +Fatal error: Uncaught TypeException: Argument 1 passed to f() must be an instance of UndefClass, instance of stdClass given, called in %s on line %d and defined in %s:%d +Stack trace: +#0 %s(%d): f(Object(stdClass)) +#1 {main} + thrown in %s on line %d diff --git a/tests/classes/autoload_021.phpt b/tests/classes/autoload_021.phpt index 13562b4000..c3945ed4b3 100644 --- a/tests/classes/autoload_021.phpt +++ b/tests/classes/autoload_021.phpt @@ -10,4 +10,7 @@ $x = new $a; echo "BUG\n"; ?> --EXPECTF-- -Fatal error: Class '../BUG' not found in %sautoload_021.php on line 6 +Fatal error: Uncaught EngineException: Class '../BUG' not found in %sautoload_021.php:6 +Stack trace: +#0 {main} + thrown in %sautoload_021.php on line 6 diff --git a/tests/classes/bug27504.phpt b/tests/classes/bug27504.phpt index 5f2c5a03ce..1555f5343c 100644 --- a/tests/classes/bug27504.phpt +++ b/tests/classes/bug27504.phpt @@ -22,4 +22,7 @@ Called function foo:bar(1) Warning: call_user_func_array() expects parameter 1 to be a valid callback, cannot access private method foo::bar() in %s on line %d -Fatal error: Call to private method foo::bar() from context '' in %s on line %d +Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/tests/classes/class_abstract.phpt b/tests/classes/class_abstract.phpt index 880f84930f..04b21b5259 100644 --- a/tests/classes/class_abstract.phpt +++ b/tests/classes/class_abstract.phpt @@ -25,4 +25,7 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- base -Fatal error: Cannot instantiate abstract class base in %s on line %d +Fatal error: Uncaught EngineException: Cannot instantiate abstract class base in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/tests/classes/constants_basic_001.phpt b/tests/classes/constants_basic_001.phpt index 74b0fcdf48..457584df32 100644 --- a/tests/classes/constants_basic_001.phpt +++ b/tests/classes/constants_basic_001.phpt @@ -86,4 +86,7 @@ string(6) "hello2" Expecting fatal error: -Fatal error: Undefined class constant 'c19' in %s on line 53 +Fatal error: Uncaught EngineException: Undefined class constant 'c19' in %s:53 +Stack trace: +#0 {main} + thrown in %s on line 53 diff --git a/tests/classes/ctor_visibility.phpt b/tests/classes/ctor_visibility.phpt index 8d3b1c5c50..69383675a1 100644 --- a/tests/classes/ctor_visibility.phpt +++ b/tests/classes/ctor_visibility.phpt @@ -66,4 +66,9 @@ Test::__construct() TestPriv::__construct() DerivedPriv::__construct() -Fatal error: Cannot call private TestPriv::__construct() in %sctor_visibility.php on line %d +Fatal error: Uncaught EngineException: Cannot call private TestPriv::__construct() in %sctor_visibility.php:%d +Stack trace: +#0 %s(%d): DerivedPriv->__construct() +#1 %s(%d): DerivedPriv::f() +#2 {main} + thrown in %sctor_visibility.php on line %d diff --git a/tests/classes/destructor_visibility_001.phpt b/tests/classes/destructor_visibility_001.phpt index 7674c512f6..40a62f2ec4 100644 --- a/tests/classes/destructor_visibility_001.phpt +++ b/tests/classes/destructor_visibility_001.phpt @@ -21,4 +21,7 @@ unset($obj); ?> ===DONE=== --EXPECTF-- -Fatal error: Call to private Derived::__destruct() from context '' in %sdestructor_visibility_001.php on line %d +Fatal error: Uncaught EngineException: Call to private Derived::__destruct() from context '' in %sdestructor_visibility_001.php:%d +Stack trace: +#0 {main} + thrown in %sdestructor_visibility_001.php on line %d diff --git a/tests/classes/factory_and_singleton_003.phpt b/tests/classes/factory_and_singleton_003.phpt index 3d50a810a6..272773c439 100644 --- a/tests/classes/factory_and_singleton_003.phpt +++ b/tests/classes/factory_and_singleton_003.phpt @@ -15,4 +15,7 @@ $obj = new test; echo "Done\n"; ?> --EXPECTF-- -Fatal error: Call to protected test::__construct() from invalid context in %s on line %d +Fatal error: Uncaught EngineException: Call to protected test::__construct() from invalid context in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/tests/classes/factory_and_singleton_004.phpt b/tests/classes/factory_and_singleton_004.phpt index 14edcb1fc8..89c4f161ea 100644 --- a/tests/classes/factory_and_singleton_004.phpt +++ b/tests/classes/factory_and_singleton_004.phpt @@ -15,4 +15,7 @@ $obj = new test; echo "Done\n"; ?> --EXPECTF-- -Fatal error: Call to private test::__construct() from invalid context in %s on line %d +Fatal error: Uncaught EngineException: Call to private test::__construct() from invalid context in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/tests/classes/factory_and_singleton_005.phpt b/tests/classes/factory_and_singleton_005.phpt index 2cd7e5cc99..e4911f086f 100644 --- a/tests/classes/factory_and_singleton_005.phpt +++ b/tests/classes/factory_and_singleton_005.phpt @@ -16,4 +16,7 @@ $obj = NULL; echo "Done\n"; ?> --EXPECTF-- -Fatal error: Call to protected test::__destruct() from context '' in %sfactory_and_singleton_005.php on line %d +Fatal error: Uncaught EngineException: Call to protected test::__destruct() from context '' in %sfactory_and_singleton_005.php:%d +Stack trace: +#0 {main} + thrown in %sfactory_and_singleton_005.php on line %d diff --git a/tests/classes/factory_and_singleton_006.phpt b/tests/classes/factory_and_singleton_006.phpt index 81cf714888..38b8ceb155 100644 --- a/tests/classes/factory_and_singleton_006.phpt +++ b/tests/classes/factory_and_singleton_006.phpt @@ -16,5 +16,8 @@ $obj = NULL; echo "Done\n"; ?> --EXPECTF-- -Fatal error: Call to private test::__destruct() from context '' in %sfactory_and_singleton_006.php on line %d +Fatal error: Uncaught EngineException: Call to private test::__destruct() from context '' in %sfactory_and_singleton_006.php:%d +Stack trace: +#0 {main} + thrown in %sfactory_and_singleton_006.php on line %d diff --git a/tests/classes/factory_and_singleton_007.phpt b/tests/classes/factory_and_singleton_007.phpt index 4788dbf087..c86243bcfd 100644 --- a/tests/classes/factory_and_singleton_007.phpt +++ b/tests/classes/factory_and_singleton_007.phpt @@ -17,4 +17,7 @@ $obj = NULL; echo "Done\n"; ?> --EXPECTF-- -Fatal error: Call to protected test::__clone() from context '' %sfactory_and_singleton_007.php on line %d +Fatal error: Uncaught EngineException: Call to protected test::__clone() from context '' in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/tests/classes/factory_and_singleton_008.phpt b/tests/classes/factory_and_singleton_008.phpt index 750b9db340..d6041b0105 100644 --- a/tests/classes/factory_and_singleton_008.phpt +++ b/tests/classes/factory_and_singleton_008.phpt @@ -17,4 +17,7 @@ $obj = NULL; echo "Done\n"; ?> --EXPECTF-- -Fatal error: Call to private test::__clone() from context '' %sfactory_and_singleton_008.php on line %d +Fatal error: Uncaught EngineException: Call to private test::__clone() from context '' in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/tests/classes/interface_instantiate.phpt b/tests/classes/interface_instantiate.phpt index 61c4e6b95b..310dc8800d 100644 --- a/tests/classes/interface_instantiate.phpt +++ b/tests/classes/interface_instantiate.phpt @@ -13,4 +13,7 @@ $t = new if_a(); ?> --EXPECTF-- -Fatal error: Cannot instantiate interface if_a in %s on line %d +Fatal error: Uncaught EngineException: Cannot instantiate interface if_a in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/tests/classes/interfaces_003.phpt b/tests/classes/interfaces_003.phpt index f95cbc1ef3..0ce8f9e320 100644 --- a/tests/classes/interfaces_003.phpt +++ b/tests/classes/interfaces_003.phpt @@ -23,4 +23,8 @@ $obj = new MyTestClass; ===DONE=== --EXPECTF-- -Fatal error: Argument 1 passed to MyTestClass::__construct() must be an instance of MyObject, none given, called in %sinterfaces_003.php on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to MyTestClass::__construct() must be an instance of MyObject, none given, called in %sinterfaces_003.php:%d +Stack trace: +#0 %s(%d): MyTestClass->__construct() +#1 {main} + thrown in %sinterfaces_003.php on line %d diff --git a/tests/classes/private_001.phpt b/tests/classes/private_001.phpt index 310b9c6434..11574ccde3 100644 --- a/tests/classes/private_001.phpt +++ b/tests/classes/private_001.phpt @@ -23,4 +23,7 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call show() -Fatal error: Call to private method pass::show() from context '' in %s on line %d +Fatal error: Uncaught EngineException: Call to private method pass::show() from context '' in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/tests/classes/private_002.phpt b/tests/classes/private_002.phpt index 258fd3a17d..664c95837f 100644 --- a/tests/classes/private_002.phpt +++ b/tests/classes/private_002.phpt @@ -32,4 +32,8 @@ echo "Done\n"; // shouldn't be displayed Call pass::show() Call fail::show() -Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d +Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d +Stack trace: +#0 %s(%d): fail::show() +#1 {main} + thrown in %s on line %d diff --git a/tests/classes/private_003.phpt b/tests/classes/private_003.phpt index 716efbc8c7..ce18af196e 100644 --- a/tests/classes/private_003.phpt +++ b/tests/classes/private_003.phpt @@ -33,4 +33,8 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call show() -Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d +Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d +Stack trace: +#0 %s(%d): fail::not_ok() +#1 {main} + thrown in %s on line %d diff --git a/tests/classes/private_003b.phpt b/tests/classes/private_003b.phpt index 780b2e6b4c..27f398d839 100644 --- a/tests/classes/private_003b.phpt +++ b/tests/classes/private_003b.phpt @@ -34,4 +34,8 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call show() -Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d +Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d +Stack trace: +#0 %s(%d): fail->not_ok() +#1 {main} + thrown in %s on line %d diff --git a/tests/classes/private_004.phpt b/tests/classes/private_004.phpt index 027434ab87..7ebd72da3b 100644 --- a/tests/classes/private_004.phpt +++ b/tests/classes/private_004.phpt @@ -29,4 +29,8 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call show() -Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d +Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d +Stack trace: +#0 %s(%d): fail::do_show() +#1 {main} + thrown in %s on line %d diff --git a/tests/classes/private_004b.phpt b/tests/classes/private_004b.phpt index 2d1850b519..5bb9f05b15 100644 --- a/tests/classes/private_004b.phpt +++ b/tests/classes/private_004b.phpt @@ -32,4 +32,8 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call show() -Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d +Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d +Stack trace: +#0 %s(%d): fail->do_show() +#1 {main} + thrown in %s on line %d diff --git a/tests/classes/private_005.phpt b/tests/classes/private_005.phpt index 49b2bee3ba..acd9f825b5 100644 --- a/tests/classes/private_005.phpt +++ b/tests/classes/private_005.phpt @@ -29,4 +29,8 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call show() -Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d +Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d +Stack trace: +#0 %s(%d): fail::do_show() +#1 {main} + thrown in %s on line %d diff --git a/tests/classes/private_005b.phpt b/tests/classes/private_005b.phpt index 2d1850b519..5bb9f05b15 100644 --- a/tests/classes/private_005b.phpt +++ b/tests/classes/private_005b.phpt @@ -32,4 +32,8 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call show() -Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d +Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d +Stack trace: +#0 %s(%d): fail->do_show() +#1 {main} + thrown in %s on line %d diff --git a/tests/classes/private_redeclare.phpt b/tests/classes/private_redeclare.phpt index e3061f1136..a1b3e459d7 100644 --- a/tests/classes/private_redeclare.phpt +++ b/tests/classes/private_redeclare.phpt @@ -35,4 +35,8 @@ test derived base -Fatal error: Call to private method base::show() from context 'derived' in %s on line %d +Fatal error: Uncaught EngineException: Call to private method base::show() from context 'derived' in %s:%d +Stack trace: +#0 %s(%d): derived->test() +#1 {main} + thrown in %s on line %d diff --git a/tests/classes/property_recreate_private.phpt b/tests/classes/property_recreate_private.phpt index 410395e0e0..c392d077b5 100644 --- a/tests/classes/property_recreate_private.phpt +++ b/tests/classes/property_recreate_private.phpt @@ -78,4 +78,7 @@ object(C)#%d (1) { Unset a private property, and attempt to recreate at global scope (expecting failure): -Fatal error: Cannot access private property C::$p in %s on line 46 +Fatal error: Uncaught EngineException: Cannot access private property C::$p in %s:46 +Stack trace: +#0 {main} + thrown in %s on line 46 diff --git a/tests/classes/property_recreate_protected.phpt b/tests/classes/property_recreate_protected.phpt index f8444c3a2f..d5f4b45791 100644 --- a/tests/classes/property_recreate_protected.phpt +++ b/tests/classes/property_recreate_protected.phpt @@ -50,4 +50,7 @@ object(D)#%d (1) { Unset a protected property, and attempt to recreate it outside of scope (expected failure): -Fatal error: Cannot access protected property %s::$p in %s on line 32 +Fatal error: Uncaught EngineException: Cannot access protected property %s::$p in %s:32 +Stack trace: +#0 {main} + thrown in %s on line 32 diff --git a/tests/classes/protected_001.phpt b/tests/classes/protected_001.phpt index 19872c6f16..fe48ebe67b 100644 --- a/tests/classes/protected_001.phpt +++ b/tests/classes/protected_001.phpt @@ -23,4 +23,7 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call fail() -Fatal error: Call to protected method pass::fail() from context '' in %s on line %d +Fatal error: Uncaught EngineException: Call to protected method pass::fail() from context '' in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/tests/classes/protected_001b.phpt b/tests/classes/protected_001b.phpt index 4d24a926ea..a1c69b9729 100644 --- a/tests/classes/protected_001b.phpt +++ b/tests/classes/protected_001b.phpt @@ -24,4 +24,7 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call fail() -Fatal error: Call to protected method pass::fail() from context '' in %s on line %d +Fatal error: Uncaught EngineException: Call to protected method pass::fail() from context '' in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/tests/classes/protected_002.phpt b/tests/classes/protected_002.phpt index f26ef9c495..e67c6b2f3d 100644 --- a/tests/classes/protected_002.phpt +++ b/tests/classes/protected_002.phpt @@ -32,4 +32,8 @@ echo "Done\n"; // shouldn't be displayed Call pass::show() Call fail::show() -Fatal error: Call to protected method pass::show() from context 'fail' in %s on line %d +Fatal error: Uncaught EngineException: Call to protected method pass::show() from context 'fail' in %s:%d +Stack trace: +#0 %s(%d): fail::show() +#1 {main} + thrown in %s on line %d diff --git a/tests/classes/static_properties_003_error1.phpt b/tests/classes/static_properties_003_error1.phpt index 7a5e3d931a..4b8efe2bf4 100644 --- a/tests/classes/static_properties_003_error1.phpt +++ b/tests/classes/static_properties_003_error1.phpt @@ -15,4 +15,7 @@ unset($c->y); --> Access non-visible static prop like instance prop: -Fatal error: Cannot access protected property C::$y in %s on line 8 +Fatal error: Uncaught EngineException: Cannot access protected property C::$y in %s:8 +Stack trace: +#0 {main} + thrown in %s on line 8 diff --git a/tests/classes/static_properties_003_error2.phpt b/tests/classes/static_properties_003_error2.phpt index 589cc6909e..c43666fbb1 100644 --- a/tests/classes/static_properties_003_error2.phpt +++ b/tests/classes/static_properties_003_error2.phpt @@ -15,4 +15,7 @@ echo $c->y; --> Access non-visible static prop like instance prop: -Fatal error: Cannot access protected property C::$y in %s on line 8 +Fatal error: Uncaught EngineException: Cannot access protected property C::$y in %s:8 +Stack trace: +#0 {main} + thrown in %s on line 8 diff --git a/tests/classes/static_properties_003_error3.phpt b/tests/classes/static_properties_003_error3.phpt index 3e01e0e42b..8cee25a5e6 100644 --- a/tests/classes/static_properties_003_error3.phpt +++ b/tests/classes/static_properties_003_error3.phpt @@ -15,4 +15,7 @@ $c->y = 1; --> Access non-visible static prop like instance prop: -Fatal error: Cannot access protected property C::$y in %s on line 8 +Fatal error: Uncaught EngineException: Cannot access protected property C::$y in %s:8 +Stack trace: +#0 {main} + thrown in %s on line 8 diff --git a/tests/classes/static_properties_003_error4.phpt b/tests/classes/static_properties_003_error4.phpt index fd69a9ffb8..3b01351c7a 100644 --- a/tests/classes/static_properties_003_error4.phpt +++ b/tests/classes/static_properties_003_error4.phpt @@ -15,4 +15,11 @@ $c->y =& $ref; --> Access non-visible static prop like instance prop: -Fatal error: Cannot access protected property C::$y in %s on line 8 +Fatal error: Uncaught EngineException: Cannot access protected property C::$y in %s:8 +Stack trace: +#0 {main} + +Next EngineException: Cannot access protected property C::$y in %s:8 +Stack trace: +#0 {main} + thrown in %s on line 8 diff --git a/tests/classes/static_properties_undeclared_assign.phpt b/tests/classes/static_properties_undeclared_assign.phpt index aed65797b4..71859abce3 100644 --- a/tests/classes/static_properties_undeclared_assign.phpt +++ b/tests/classes/static_properties_undeclared_assign.phpt @@ -6,4 +6,7 @@ Class C {} C::$p = 1; ?> --EXPECTF-- -Fatal error: Access to undeclared static property: C::$p in %s on line 3 +Fatal error: Uncaught EngineException: Access to undeclared static property: C::$p in %s:3 +Stack trace: +#0 {main} + thrown in %s on line 3 diff --git a/tests/classes/static_properties_undeclared_assignInc.phpt b/tests/classes/static_properties_undeclared_assignInc.phpt index 9680bf5f15..3f73220de4 100644 --- a/tests/classes/static_properties_undeclared_assignInc.phpt +++ b/tests/classes/static_properties_undeclared_assignInc.phpt @@ -6,4 +6,7 @@ Class C {} C::$p += 1; ?> --EXPECTF-- -Fatal error: Access to undeclared static property: C::$p in %s on line 3 +Fatal error: Uncaught EngineException: Access to undeclared static property: C::$p in %s:3 +Stack trace: +#0 {main} + thrown in %s on line 3 diff --git a/tests/classes/static_properties_undeclared_assignRef.phpt b/tests/classes/static_properties_undeclared_assignRef.phpt index 9f677f6c58..8d6b74e9f8 100644 --- a/tests/classes/static_properties_undeclared_assignRef.phpt +++ b/tests/classes/static_properties_undeclared_assignRef.phpt @@ -7,4 +7,7 @@ $a = 'foo'; C::$p =& $a; ?> --EXPECTF-- -Fatal error: Access to undeclared static property: C::$p in %s on line 4 +Fatal error: Uncaught EngineException: Access to undeclared static property: C::$p in %s:4 +Stack trace: +#0 {main} + thrown in %s on line 4 diff --git a/tests/classes/static_properties_undeclared_inc.phpt b/tests/classes/static_properties_undeclared_inc.phpt index a9b28d6cdd..56f8606f36 100644 --- a/tests/classes/static_properties_undeclared_inc.phpt +++ b/tests/classes/static_properties_undeclared_inc.phpt @@ -6,4 +6,7 @@ Class C {} C::$p++; ?> --EXPECTF-- -Fatal error: Access to undeclared static property: C::$p in %s on line 3 +Fatal error: Uncaught EngineException: Access to undeclared static property: C::$p in %s:3 +Stack trace: +#0 {main} + thrown in %s on line 3 diff --git a/tests/classes/static_properties_undeclared_read.phpt b/tests/classes/static_properties_undeclared_read.phpt index ae518d8ee1..658bc049ab 100644 --- a/tests/classes/static_properties_undeclared_read.phpt +++ b/tests/classes/static_properties_undeclared_read.phpt @@ -6,4 +6,7 @@ Class C {} echo C::$p; ?> --EXPECTF-- -Fatal error: Access to undeclared static property: C::$p in %s on line 3 +Fatal error: Uncaught EngineException: Access to undeclared static property: C::$p in %s:3 +Stack trace: +#0 {main} + thrown in %s on line 3 diff --git a/tests/classes/type_hinting_001.phpt b/tests/classes/type_hinting_001.phpt index 5479a4c193..da3de4611f 100644 --- a/tests/classes/type_hinting_001.phpt +++ b/tests/classes/type_hinting_001.phpt @@ -35,4 +35,8 @@ $a->b($b); ?> --EXPECTF-- -Fatal error: Argument 1 passed to FooBar::a() must implement interface Foo, instance of Blort given, called in %s on line 27 and defined in %s on line 12 +Fatal error: Uncaught TypeException: Argument 1 passed to FooBar::a() must implement interface Foo, instance of Blort given, called in %s on line 27 and defined in %s:12 +Stack trace: +#0 %s(%d): FooBar->a(Object(Blort)) +#1 {main} + thrown in %s on line 12 diff --git a/tests/classes/type_hinting_002.phpt b/tests/classes/type_hinting_002.phpt index 7c0581624b..1988e24d97 100644 --- a/tests/classes/type_hinting_002.phpt +++ b/tests/classes/type_hinting_002.phpt @@ -13,4 +13,8 @@ $o = new Foo; $o->a($o); ?> --EXPECTF-- -Fatal error: Argument 1 passed to Foo::a() must be an instance of NonExisting, instance of Foo given, called in %s on line %d and defined in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to Foo::a() must be an instance of NonExisting, instance of Foo given, called in %s on line %d and defined in %s:%d +Stack trace: +#0 %s(%d): Foo->a(Object(Foo)) +#1 {main} + thrown in %s on line %d diff --git a/tests/classes/type_hinting_003.phpt b/tests/classes/type_hinting_003.phpt index fbfe0cefeb..a58c579dc5 100644 --- a/tests/classes/type_hinting_003.phpt +++ b/tests/classes/type_hinting_003.phpt @@ -57,4 +57,8 @@ array(1) { int(25) } -Fatal error: Argument 1 passed to Test::f1() must be of the type array, integer given, called in %s on line %d and defined in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to Test::f1() must be of the type array, integer given, called in %s on line %d and defined in %s:%d +Stack trace: +#0 %s(%d): Test::f1(1) +#1 {main} + thrown in %s on line %d diff --git a/tests/lang/041.phpt b/tests/lang/041.phpt index 6972412d5b..5e88569a32 100644 --- a/tests/lang/041.phpt +++ b/tests/lang/041.phpt @@ -17,4 +17,7 @@ echo $wrongClassname::$b."\n"; --EXPECTF-- foo -Fatal error: Class 'B' not found in %s041.php on line %d +Fatal error: Uncaught EngineException: Class 'B' not found in %s041.php:%d +Stack trace: +#0 {main} + thrown in %s041.php on line %d diff --git a/tests/lang/042.phpt b/tests/lang/042.phpt index 217aab83e3..bdf7c018fd 100644 --- a/tests/lang/042.phpt +++ b/tests/lang/042.phpt @@ -16,4 +16,7 @@ echo $wrongClassname::B."\n"; --EXPECTF-- foo -Fatal error: Class 'B' not found in %s042.php on line %d +Fatal error: Uncaught EngineException: Class 'B' not found in %s042.php:%d +Stack trace: +#0 {main} + thrown in %s042.php on line %d diff --git a/tests/lang/043.phpt b/tests/lang/043.phpt index 7ca2d74b69..58457bbce3 100644 --- a/tests/lang/043.phpt +++ b/tests/lang/043.phpt @@ -16,4 +16,7 @@ echo $wrongClassname::foo()."\n"; --EXPECTF-- foo -Fatal error: Class 'B' not found in %s043.php on line %d +Fatal error: Uncaught EngineException: Class 'B' not found in %s043.php:%d +Stack trace: +#0 {main} + thrown in %s043.php on line %d diff --git a/tests/lang/044.phpt b/tests/lang/044.phpt index a0de889a7a..2e0479baee 100644 --- a/tests/lang/044.phpt +++ b/tests/lang/044.phpt @@ -18,4 +18,7 @@ echo $wrongClassname::$methodname()."\n"; --EXPECTF-- foo -Fatal error: Class 'B' not found in %s044.php on line %d +Fatal error: Uncaught EngineException: Class 'B' not found in %s044.php:%d +Stack trace: +#0 {main} + thrown in %s044.php on line %d diff --git a/tests/lang/bug24658.phpt b/tests/lang/bug24658.phpt index 635eb8cd0c..6e57d9b66b 100644 --- a/tests/lang/bug24658.phpt +++ b/tests/lang/bug24658.phpt @@ -53,4 +53,9 @@ int(2) object(foo)#%d (0) { } -Fatal error: Argument 1 passed to typehint() must be an instance of foo, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to typehint() must be an instance of foo, integer given in %s:%d +Stack trace: +#0 [internal function]: typehint(1, 1) +#1 %s(%d): array_walk(Array, 'typehint') +#2 {main} + thrown in %s on line %d diff --git a/tests/lang/bug32828.phpt b/tests/lang/bug32828.phpt index ad59646f50..4abf21604f 100644 --- a/tests/lang/bug32828.phpt +++ b/tests/lang/bug32828.phpt @@ -13,7 +13,7 @@ ob_start('output_handler'); ob_end_clean(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Exception' in %s:%d +Fatal error: Uncaught Exception in %s:%d Stack trace: #0 [internal function]: output_handler('', %d) #1 %s(%d): ob_end_clean() diff --git a/tests/lang/catchable_error_001.phpt b/tests/lang/catchable_error_001.phpt index e3e3692440..4343ac0e8f 100644 --- a/tests/lang/catchable_error_001.phpt +++ b/tests/lang/catchable_error_001.phpt @@ -19,4 +19,8 @@ Catchable fatal error [1] echo "ALIVE!\n"; ?> --EXPECTF-- -Fatal error: Argument 1 passed to blah() must be an instance of Foo, instance of stdClass given, called in %scatchable_error_001.php on line 15 and defined in %scatchable_error_001.php on line 5 +Fatal error: Uncaught TypeException: Argument 1 passed to blah() must be an instance of Foo, instance of stdClass given, called in %scatchable_error_001.php on line 15 and defined in %scatchable_error_001.php:5 +Stack trace: +#0 %s(%d): blah(Object(stdClass)) +#1 {main} + thrown in %scatchable_error_001.php on line 5 diff --git a/tests/lang/foreachLoopIterator.002.phpt b/tests/lang/foreachLoopIterator.002.phpt index fda3fdfb2b..38b8fd66d7 100644 --- a/tests/lang/foreachLoopIterator.002.phpt +++ b/tests/lang/foreachLoopIterator.002.phpt @@ -21,4 +21,7 @@ foreach ($f as $k=>&$v) { --EXPECTF-- -----( Try to iterate with &$value: )----- -Fatal error: An iterator cannot be used with foreach by reference in %s on line 13 +Fatal error: Uncaught EngineException: An iterator cannot be used with foreach by reference in %s:13 +Stack trace: +#0 {main} + thrown in %s on line 13 diff --git a/tests/lang/type_hints_001.phpt b/tests/lang/type_hints_001.phpt index 48004ba97f..0a061b7d9e 100644 --- a/tests/lang/type_hints_001.phpt +++ b/tests/lang/type_hints_001.phpt @@ -23,4 +23,8 @@ type_hint_foo($bar); ?> --EXPECTF-- -Fatal error: Argument 1 passed to type_hint_foo() must be an instance of Foo, instance of Bar given, called in %s on line 16 and defined in %s on line 9 +Fatal error: Uncaught TypeException: Argument 1 passed to type_hint_foo() must be an instance of Foo, instance of Bar given, called in %s on line 16 and defined in %s:9 +Stack trace: +#0 %s(%d): type_hint_foo(Object(Bar)) +#1 {main} + thrown in %s on line 9 |