summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/classes/abstract.phpt2
-rw-r--r--tests/classes/abstract_class.phpt2
-rw-r--r--tests/classes/abstract_inherit.phpt2
-rw-r--r--tests/classes/abstract_user_call.phpt2
-rw-r--r--tests/classes/array_access_012.phpt2
-rw-r--r--tests/classes/autoload_009.phpt2
-rw-r--r--tests/classes/autoload_021.phpt2
-rw-r--r--tests/classes/bug27504.phpt2
-rw-r--r--tests/classes/class_abstract.phpt2
-rw-r--r--tests/classes/constants_basic_001.phpt2
-rw-r--r--tests/classes/ctor_visibility.phpt2
-rw-r--r--tests/classes/destructor_visibility_001.phpt2
-rw-r--r--tests/classes/factory_and_singleton_003.phpt2
-rw-r--r--tests/classes/factory_and_singleton_004.phpt2
-rw-r--r--tests/classes/factory_and_singleton_005.phpt2
-rw-r--r--tests/classes/factory_and_singleton_006.phpt2
-rw-r--r--tests/classes/factory_and_singleton_007.phpt2
-rw-r--r--tests/classes/factory_and_singleton_008.phpt2
-rw-r--r--tests/classes/interface_instantiate.phpt2
-rw-r--r--tests/classes/interfaces_003.phpt2
-rw-r--r--tests/classes/private_001.phpt2
-rw-r--r--tests/classes/private_002.phpt2
-rw-r--r--tests/classes/private_003.phpt2
-rw-r--r--tests/classes/private_003b.phpt2
-rw-r--r--tests/classes/private_004.phpt2
-rw-r--r--tests/classes/private_004b.phpt2
-rw-r--r--tests/classes/private_005.phpt2
-rw-r--r--tests/classes/private_005b.phpt2
-rw-r--r--tests/classes/private_redeclare.phpt2
-rw-r--r--tests/classes/property_recreate_private.phpt2
-rw-r--r--tests/classes/property_recreate_protected.phpt2
-rw-r--r--tests/classes/protected_001.phpt2
-rw-r--r--tests/classes/protected_001b.phpt2
-rw-r--r--tests/classes/protected_002.phpt2
-rw-r--r--tests/classes/static_properties_003_error1.phpt2
-rw-r--r--tests/classes/static_properties_003_error2.phpt2
-rw-r--r--tests/classes/static_properties_003_error3.phpt2
-rw-r--r--tests/classes/static_properties_003_error4.phpt4
-rw-r--r--tests/classes/static_properties_undeclared_assign.phpt2
-rw-r--r--tests/classes/static_properties_undeclared_assignInc.phpt2
-rw-r--r--tests/classes/static_properties_undeclared_assignRef.phpt2
-rw-r--r--tests/classes/static_properties_undeclared_inc.phpt2
-rw-r--r--tests/classes/static_properties_undeclared_read.phpt2
-rw-r--r--tests/classes/type_hinting_001.phpt2
-rw-r--r--tests/classes/type_hinting_002.phpt2
-rw-r--r--tests/classes/type_hinting_003.phpt2
-rw-r--r--tests/lang/041.phpt2
-rw-r--r--tests/lang/042.phpt2
-rw-r--r--tests/lang/043.phpt2
-rw-r--r--tests/lang/044.phpt2
-rw-r--r--tests/lang/bug24658.phpt2
-rw-r--r--tests/lang/catchable_error_001.phpt2
-rw-r--r--tests/lang/foreachLoopIterator.002.phpt2
-rw-r--r--tests/lang/type_hints_001.phpt2
54 files changed, 55 insertions, 55 deletions
diff --git a/tests/classes/abstract.phpt b/tests/classes/abstract.phpt
index 811aa45a13..5852005f43 100644
--- a/tests/classes/abstract.phpt
+++ b/tests/classes/abstract.phpt
@@ -27,7 +27,7 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call to function show()
-Fatal error: Uncaught EngineException: Cannot call abstract method fail::show() in %s:%d
+Fatal error: Uncaught Error: Cannot call abstract method fail::show() in %s:%d
Stack trace:
#0 %s(%d): pass->error()
#1 {main}
diff --git a/tests/classes/abstract_class.phpt b/tests/classes/abstract_class.phpt
index 1725d45762..2085bff009 100644
--- a/tests/classes/abstract_class.phpt
+++ b/tests/classes/abstract_class.phpt
@@ -26,7 +26,7 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call to function show()
-Fatal error: Uncaught EngineException: Cannot instantiate abstract class fail in %s:%d
+Fatal error: Uncaught Error: 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 1657599787..583043d22b 100644
--- a/tests/classes/abstract_inherit.phpt
+++ b/tests/classes/abstract_inherit.phpt
@@ -19,7 +19,7 @@ echo "Done\n"; // Shouldn't be displayed
?>
--EXPECTF--
-Fatal error: Uncaught EngineException: Cannot instantiate abstract class fail in %s:%d
+Fatal error: Uncaught Error: 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 5118efda99..3e88517715 100644
--- a/tests/classes/abstract_user_call.phpt
+++ b/tests/classes/abstract_user_call.phpt
@@ -27,7 +27,7 @@ call_user_func(array($o, 'test_base::func'));
--EXPECTF--
test::func()
-Fatal error: Uncaught EngineException: Cannot call abstract method test_base::func() in %s:%d
+Fatal error: Uncaught Error: 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 ef8553493f..1fe0b24865 100644
--- a/tests/classes/array_access_012.phpt
+++ b/tests/classes/array_access_012.phpt
@@ -33,7 +33,7 @@ $data['element'] = &$test;
Notice: Indirect modification of overloaded element of ArrayAccessImpl has no effect in %sarray_access_012.php on line 24
-Fatal error: Uncaught EngineException: Cannot assign by reference to overloaded object in %sarray_access_012.php:24
+Fatal error: Uncaught Error: 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 2af2d9adc4..51d3e8f791 100644
--- a/tests/classes/autoload_009.phpt
+++ b/tests/classes/autoload_009.phpt
@@ -14,7 +14,7 @@ Ensure type hints for unknown types do not trigger autoload.
f(new stdClass);
?>
--EXPECTF--
-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
+Fatal error: Uncaught TypeError: 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()
#1 {main}
diff --git a/tests/classes/autoload_021.phpt b/tests/classes/autoload_021.phpt
index c3945ed4b3..3237627380 100644
--- a/tests/classes/autoload_021.phpt
+++ b/tests/classes/autoload_021.phpt
@@ -10,7 +10,7 @@ $x = new $a;
echo "BUG\n";
?>
--EXPECTF--
-Fatal error: Uncaught EngineException: Class '../BUG' not found in %sautoload_021.php:6
+Fatal error: Uncaught Error: 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 1555f5343c..ba44806bfe 100644
--- a/tests/classes/bug27504.phpt
+++ b/tests/classes/bug27504.phpt
@@ -22,7 +22,7 @@ Called function foo:bar(1)
Warning: call_user_func_array() expects parameter 1 to be a valid callback, cannot access private method foo::bar() in %s on line %d
-Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d
+Fatal error: Uncaught Error: 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 04b21b5259..10fcdba461 100644
--- a/tests/classes/class_abstract.phpt
+++ b/tests/classes/class_abstract.phpt
@@ -25,7 +25,7 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
base
-Fatal error: Uncaught EngineException: Cannot instantiate abstract class base in %s:%d
+Fatal error: Uncaught Error: 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 457584df32..9536b2a38f 100644
--- a/tests/classes/constants_basic_001.phpt
+++ b/tests/classes/constants_basic_001.phpt
@@ -86,7 +86,7 @@ string(6) "hello2"
Expecting fatal error:
-Fatal error: Uncaught EngineException: Undefined class constant 'c19' in %s:53
+Fatal error: Uncaught Error: 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 69383675a1..e7288bb968 100644
--- a/tests/classes/ctor_visibility.phpt
+++ b/tests/classes/ctor_visibility.phpt
@@ -66,7 +66,7 @@ Test::__construct()
TestPriv::__construct()
DerivedPriv::__construct()
-Fatal error: Uncaught EngineException: Cannot call private TestPriv::__construct() in %sctor_visibility.php:%d
+Fatal error: Uncaught Error: Cannot call private TestPriv::__construct() in %sctor_visibility.php:%d
Stack trace:
#0 %s(%d): DerivedPriv->__construct()
#1 %s(%d): DerivedPriv::f()
diff --git a/tests/classes/destructor_visibility_001.phpt b/tests/classes/destructor_visibility_001.phpt
index 40a62f2ec4..b99c0b20ca 100644
--- a/tests/classes/destructor_visibility_001.phpt
+++ b/tests/classes/destructor_visibility_001.phpt
@@ -21,7 +21,7 @@ unset($obj);
?>
===DONE===
--EXPECTF--
-Fatal error: Uncaught EngineException: Call to private Derived::__destruct() from context '' in %sdestructor_visibility_001.php:%d
+Fatal error: Uncaught Error: 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 272773c439..e312f55442 100644
--- a/tests/classes/factory_and_singleton_003.phpt
+++ b/tests/classes/factory_and_singleton_003.phpt
@@ -15,7 +15,7 @@ $obj = new test;
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Uncaught EngineException: Call to protected test::__construct() from invalid context in %s:%d
+Fatal error: Uncaught Error: 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 89c4f161ea..a8a2f1d7c5 100644
--- a/tests/classes/factory_and_singleton_004.phpt
+++ b/tests/classes/factory_and_singleton_004.phpt
@@ -15,7 +15,7 @@ $obj = new test;
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Uncaught EngineException: Call to private test::__construct() from invalid context in %s:%d
+Fatal error: Uncaught Error: 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 e4911f086f..2bb328da7e 100644
--- a/tests/classes/factory_and_singleton_005.phpt
+++ b/tests/classes/factory_and_singleton_005.phpt
@@ -16,7 +16,7 @@ $obj = NULL;
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Uncaught EngineException: Call to protected test::__destruct() from context '' in %sfactory_and_singleton_005.php:%d
+Fatal error: Uncaught Error: 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 38b8ceb155..5e1c7092d1 100644
--- a/tests/classes/factory_and_singleton_006.phpt
+++ b/tests/classes/factory_and_singleton_006.phpt
@@ -16,7 +16,7 @@ $obj = NULL;
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Uncaught EngineException: Call to private test::__destruct() from context '' in %sfactory_and_singleton_006.php:%d
+Fatal error: Uncaught Error: 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 c86243bcfd..b55168efe5 100644
--- a/tests/classes/factory_and_singleton_007.phpt
+++ b/tests/classes/factory_and_singleton_007.phpt
@@ -17,7 +17,7 @@ $obj = NULL;
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Uncaught EngineException: Call to protected test::__clone() from context '' in %s:%d
+Fatal error: Uncaught Error: 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 d6041b0105..49d4f0a1ff 100644
--- a/tests/classes/factory_and_singleton_008.phpt
+++ b/tests/classes/factory_and_singleton_008.phpt
@@ -17,7 +17,7 @@ $obj = NULL;
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Uncaught EngineException: Call to private test::__clone() from context '' in %s:%d
+Fatal error: Uncaught Error: 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 310dc8800d..70e2e3e8b6 100644
--- a/tests/classes/interface_instantiate.phpt
+++ b/tests/classes/interface_instantiate.phpt
@@ -13,7 +13,7 @@ $t = new if_a();
?>
--EXPECTF--
-Fatal error: Uncaught EngineException: Cannot instantiate interface if_a in %s:%d
+Fatal error: Uncaught Error: 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 0ce8f9e320..e1cbfdaf54 100644
--- a/tests/classes/interfaces_003.phpt
+++ b/tests/classes/interfaces_003.phpt
@@ -23,7 +23,7 @@ $obj = new MyTestClass;
===DONE===
--EXPECTF--
-Fatal error: Uncaught TypeException: Argument 1 passed to MyTestClass::__construct() must be an instance of MyObject, none given, called in %sinterfaces_003.php:%d
+Fatal error: Uncaught TypeError: 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}
diff --git a/tests/classes/private_001.phpt b/tests/classes/private_001.phpt
index 11574ccde3..9dba49e743 100644
--- a/tests/classes/private_001.phpt
+++ b/tests/classes/private_001.phpt
@@ -23,7 +23,7 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call show()
-Fatal error: Uncaught EngineException: Call to private method pass::show() from context '' in %s:%d
+Fatal error: Uncaught Error: 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 664c95837f..2e8d26b058 100644
--- a/tests/classes/private_002.phpt
+++ b/tests/classes/private_002.phpt
@@ -32,7 +32,7 @@ echo "Done\n"; // shouldn't be displayed
Call pass::show()
Call fail::show()
-Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d
+Fatal error: Uncaught Error: Call to private method pass::show() from context 'fail' in %s:%d
Stack trace:
#0 %s(%d): fail::show()
#1 {main}
diff --git a/tests/classes/private_003.phpt b/tests/classes/private_003.phpt
index ce18af196e..397da5d7e2 100644
--- a/tests/classes/private_003.phpt
+++ b/tests/classes/private_003.phpt
@@ -33,7 +33,7 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call show()
-Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d
+Fatal error: Uncaught Error: Call to private method pass::show() from context 'fail' in %s:%d
Stack trace:
#0 %s(%d): fail::not_ok()
#1 {main}
diff --git a/tests/classes/private_003b.phpt b/tests/classes/private_003b.phpt
index 27f398d839..f14de8e9cd 100644
--- a/tests/classes/private_003b.phpt
+++ b/tests/classes/private_003b.phpt
@@ -34,7 +34,7 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call show()
-Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d
+Fatal error: Uncaught Error: Call to private method pass::show() from context 'fail' in %s:%d
Stack trace:
#0 %s(%d): fail->not_ok()
#1 {main}
diff --git a/tests/classes/private_004.phpt b/tests/classes/private_004.phpt
index 7ebd72da3b..749d6eecc9 100644
--- a/tests/classes/private_004.phpt
+++ b/tests/classes/private_004.phpt
@@ -29,7 +29,7 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call show()
-Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d
+Fatal error: Uncaught Error: Call to private method pass::show() from context 'fail' in %s:%d
Stack trace:
#0 %s(%d): fail::do_show()
#1 {main}
diff --git a/tests/classes/private_004b.phpt b/tests/classes/private_004b.phpt
index 5bb9f05b15..8d5cd7c194 100644
--- a/tests/classes/private_004b.phpt
+++ b/tests/classes/private_004b.phpt
@@ -32,7 +32,7 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call show()
-Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d
+Fatal error: Uncaught Error: Call to private method pass::show() from context 'fail' in %s:%d
Stack trace:
#0 %s(%d): fail->do_show()
#1 {main}
diff --git a/tests/classes/private_005.phpt b/tests/classes/private_005.phpt
index acd9f825b5..c09c4285e1 100644
--- a/tests/classes/private_005.phpt
+++ b/tests/classes/private_005.phpt
@@ -29,7 +29,7 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call show()
-Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d
+Fatal error: Uncaught Error: Call to private method pass::show() from context 'fail' in %s:%d
Stack trace:
#0 %s(%d): fail::do_show()
#1 {main}
diff --git a/tests/classes/private_005b.phpt b/tests/classes/private_005b.phpt
index 5bb9f05b15..8d5cd7c194 100644
--- a/tests/classes/private_005b.phpt
+++ b/tests/classes/private_005b.phpt
@@ -32,7 +32,7 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call show()
-Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d
+Fatal error: Uncaught Error: Call to private method pass::show() from context 'fail' in %s:%d
Stack trace:
#0 %s(%d): fail->do_show()
#1 {main}
diff --git a/tests/classes/private_redeclare.phpt b/tests/classes/private_redeclare.phpt
index a1b3e459d7..b42cc7d7fe 100644
--- a/tests/classes/private_redeclare.phpt
+++ b/tests/classes/private_redeclare.phpt
@@ -35,7 +35,7 @@ test
derived
base
-Fatal error: Uncaught EngineException: Call to private method base::show() from context 'derived' in %s:%d
+Fatal error: Uncaught Error: Call to private method base::show() from context 'derived' in %s:%d
Stack trace:
#0 %s(%d): derived->test()
#1 {main}
diff --git a/tests/classes/property_recreate_private.phpt b/tests/classes/property_recreate_private.phpt
index c392d077b5..7bee1072f9 100644
--- a/tests/classes/property_recreate_private.phpt
+++ b/tests/classes/property_recreate_private.phpt
@@ -78,7 +78,7 @@ object(C)#%d (1) {
Unset a private property, and attempt to recreate at global scope (expecting failure):
-Fatal error: Uncaught EngineException: Cannot access private property C::$p in %s:46
+Fatal error: Uncaught Error: 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 d5f4b45791..357f27c796 100644
--- a/tests/classes/property_recreate_protected.phpt
+++ b/tests/classes/property_recreate_protected.phpt
@@ -50,7 +50,7 @@ object(D)#%d (1) {
Unset a protected property, and attempt to recreate it outside of scope (expected failure):
-Fatal error: Uncaught EngineException: Cannot access protected property %s::$p in %s:32
+Fatal error: Uncaught Error: 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 fe48ebe67b..aabcd1b2b7 100644
--- a/tests/classes/protected_001.phpt
+++ b/tests/classes/protected_001.phpt
@@ -23,7 +23,7 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call fail()
-Fatal error: Uncaught EngineException: Call to protected method pass::fail() from context '' in %s:%d
+Fatal error: Uncaught Error: 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 a1c69b9729..d79c1734bb 100644
--- a/tests/classes/protected_001b.phpt
+++ b/tests/classes/protected_001b.phpt
@@ -24,7 +24,7 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call fail()
-Fatal error: Uncaught EngineException: Call to protected method pass::fail() from context '' in %s:%d
+Fatal error: Uncaught Error: 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 e67c6b2f3d..89872fa513 100644
--- a/tests/classes/protected_002.phpt
+++ b/tests/classes/protected_002.phpt
@@ -32,7 +32,7 @@ echo "Done\n"; // shouldn't be displayed
Call pass::show()
Call fail::show()
-Fatal error: Uncaught EngineException: Call to protected method pass::show() from context 'fail' in %s:%d
+Fatal error: Uncaught Error: Call to protected method pass::show() from context 'fail' in %s:%d
Stack trace:
#0 %s(%d): fail::show()
#1 {main}
diff --git a/tests/classes/static_properties_003_error1.phpt b/tests/classes/static_properties_003_error1.phpt
index 4b8efe2bf4..df297a71b2 100644
--- a/tests/classes/static_properties_003_error1.phpt
+++ b/tests/classes/static_properties_003_error1.phpt
@@ -15,7 +15,7 @@ unset($c->y);
--> Access non-visible static prop like instance prop:
-Fatal error: Uncaught EngineException: Cannot access protected property C::$y in %s:8
+Fatal error: Uncaught Error: 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 c43666fbb1..4509568160 100644
--- a/tests/classes/static_properties_003_error2.phpt
+++ b/tests/classes/static_properties_003_error2.phpt
@@ -15,7 +15,7 @@ echo $c->y;
--> Access non-visible static prop like instance prop:
-Fatal error: Uncaught EngineException: Cannot access protected property C::$y in %s:8
+Fatal error: Uncaught Error: 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 8cee25a5e6..4f4288a63c 100644
--- a/tests/classes/static_properties_003_error3.phpt
+++ b/tests/classes/static_properties_003_error3.phpt
@@ -15,7 +15,7 @@ $c->y = 1;
--> Access non-visible static prop like instance prop:
-Fatal error: Uncaught EngineException: Cannot access protected property C::$y in %s:8
+Fatal error: Uncaught Error: 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 3b01351c7a..b43753f1c5 100644
--- a/tests/classes/static_properties_003_error4.phpt
+++ b/tests/classes/static_properties_003_error4.phpt
@@ -15,11 +15,11 @@ $c->y =& $ref;
--> Access non-visible static prop like instance prop:
-Fatal error: Uncaught EngineException: Cannot access protected property C::$y in %s:8
+Fatal error: Uncaught Error: Cannot access protected property C::$y in %s:8
Stack trace:
#0 {main}
-Next EngineException: Cannot access protected property C::$y in %s:8
+Next Error: 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 71859abce3..e2e4835165 100644
--- a/tests/classes/static_properties_undeclared_assign.phpt
+++ b/tests/classes/static_properties_undeclared_assign.phpt
@@ -6,7 +6,7 @@ Class C {}
C::$p = 1;
?>
--EXPECTF--
-Fatal error: Uncaught EngineException: Access to undeclared static property: C::$p in %s:3
+Fatal error: Uncaught Error: 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 3f73220de4..17577863b1 100644
--- a/tests/classes/static_properties_undeclared_assignInc.phpt
+++ b/tests/classes/static_properties_undeclared_assignInc.phpt
@@ -6,7 +6,7 @@ Class C {}
C::$p += 1;
?>
--EXPECTF--
-Fatal error: Uncaught EngineException: Access to undeclared static property: C::$p in %s:3
+Fatal error: Uncaught Error: 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 8d6b74e9f8..680aeaf2e8 100644
--- a/tests/classes/static_properties_undeclared_assignRef.phpt
+++ b/tests/classes/static_properties_undeclared_assignRef.phpt
@@ -7,7 +7,7 @@ $a = 'foo';
C::$p =& $a;
?>
--EXPECTF--
-Fatal error: Uncaught EngineException: Access to undeclared static property: C::$p in %s:4
+Fatal error: Uncaught Error: 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 56f8606f36..86b0949627 100644
--- a/tests/classes/static_properties_undeclared_inc.phpt
+++ b/tests/classes/static_properties_undeclared_inc.phpt
@@ -6,7 +6,7 @@ Class C {}
C::$p++;
?>
--EXPECTF--
-Fatal error: Uncaught EngineException: Access to undeclared static property: C::$p in %s:3
+Fatal error: Uncaught Error: 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 658bc049ab..7028386c69 100644
--- a/tests/classes/static_properties_undeclared_read.phpt
+++ b/tests/classes/static_properties_undeclared_read.phpt
@@ -6,7 +6,7 @@ Class C {}
echo C::$p;
?>
--EXPECTF--
-Fatal error: Uncaught EngineException: Access to undeclared static property: C::$p in %s:3
+Fatal error: Uncaught Error: 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 393f157167..d9412293e9 100644
--- a/tests/classes/type_hinting_001.phpt
+++ b/tests/classes/type_hinting_001.phpt
@@ -35,7 +35,7 @@ $a->b($b);
?>
--EXPECTF--
-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
+Fatal error: Uncaught TypeError: 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()
#1 {main}
diff --git a/tests/classes/type_hinting_002.phpt b/tests/classes/type_hinting_002.phpt
index 1ebceb4549..7486824d50 100644
--- a/tests/classes/type_hinting_002.phpt
+++ b/tests/classes/type_hinting_002.phpt
@@ -13,7 +13,7 @@ $o = new Foo;
$o->a($o);
?>
--EXPECTF--
-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
+Fatal error: Uncaught TypeError: 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()
#1 {main}
diff --git a/tests/classes/type_hinting_003.phpt b/tests/classes/type_hinting_003.phpt
index d8734b1136..6038f25a50 100644
--- a/tests/classes/type_hinting_003.phpt
+++ b/tests/classes/type_hinting_003.phpt
@@ -57,7 +57,7 @@ array(1) {
int(25)
}
-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
+Fatal error: Uncaught TypeError: 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 {main}
diff --git a/tests/lang/041.phpt b/tests/lang/041.phpt
index 5e88569a32..1540243cbe 100644
--- a/tests/lang/041.phpt
+++ b/tests/lang/041.phpt
@@ -17,7 +17,7 @@ echo $wrongClassname::$b."\n";
--EXPECTF--
foo
-Fatal error: Uncaught EngineException: Class 'B' not found in %s041.php:%d
+Fatal error: Uncaught Error: 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 bdf7c018fd..e9e95c8cc1 100644
--- a/tests/lang/042.phpt
+++ b/tests/lang/042.phpt
@@ -16,7 +16,7 @@ echo $wrongClassname::B."\n";
--EXPECTF--
foo
-Fatal error: Uncaught EngineException: Class 'B' not found in %s042.php:%d
+Fatal error: Uncaught Error: 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 58457bbce3..80c427c8a9 100644
--- a/tests/lang/043.phpt
+++ b/tests/lang/043.phpt
@@ -16,7 +16,7 @@ echo $wrongClassname::foo()."\n";
--EXPECTF--
foo
-Fatal error: Uncaught EngineException: Class 'B' not found in %s043.php:%d
+Fatal error: Uncaught Error: 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 2e0479baee..eef85c206f 100644
--- a/tests/lang/044.phpt
+++ b/tests/lang/044.phpt
@@ -18,7 +18,7 @@ echo $wrongClassname::$methodname()."\n";
--EXPECTF--
foo
-Fatal error: Uncaught EngineException: Class 'B' not found in %s044.php:%d
+Fatal error: Uncaught Error: 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 236d8ed394..6229d52a64 100644
--- a/tests/lang/bug24658.phpt
+++ b/tests/lang/bug24658.phpt
@@ -53,7 +53,7 @@ int(2)
object(foo)#%d (0) {
}
-Fatal error: Uncaught TypeException: Argument 1 passed to typehint() must be an instance of foo, integer given in %s:%d
+Fatal error: Uncaught TypeError: Argument 1 passed to typehint() must be an instance of foo, integer given in %s:%d
Stack trace:
#0 [internal function]: typehint(1)
#1 %s(%d): array_walk(Array, 'typehint')
diff --git a/tests/lang/catchable_error_001.phpt b/tests/lang/catchable_error_001.phpt
index f58b26e847..e63e0d7ccc 100644
--- a/tests/lang/catchable_error_001.phpt
+++ b/tests/lang/catchable_error_001.phpt
@@ -19,7 +19,7 @@ Catchable fatal error [1]
echo "ALIVE!\n";
?>
--EXPECTF--
-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
+Fatal error: Uncaught TypeError: 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()
#1 {main}
diff --git a/tests/lang/foreachLoopIterator.002.phpt b/tests/lang/foreachLoopIterator.002.phpt
index 38b8fd66d7..a016dba2b6 100644
--- a/tests/lang/foreachLoopIterator.002.phpt
+++ b/tests/lang/foreachLoopIterator.002.phpt
@@ -21,7 +21,7 @@ foreach ($f as $k=>&$v) {
--EXPECTF--
-----( Try to iterate with &$value: )-----
-Fatal error: Uncaught EngineException: An iterator cannot be used with foreach by reference in %s:13
+Fatal error: Uncaught Error: 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 71ef9f30c3..d487a86a79 100644
--- a/tests/lang/type_hints_001.phpt
+++ b/tests/lang/type_hints_001.phpt
@@ -23,7 +23,7 @@ type_hint_foo($bar);
?>
--EXPECTF--
-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
+Fatal error: Uncaught TypeError: 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()
#1 {main}