summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt5
-rw-r--r--ext/dom/tests/DOMDocument_saveHTML_error2.phpt5
-rw-r--r--ext/dom/tests/DOMDocument_validate_error2.phpt5
-rw-r--r--ext/dom/tests/regsiter_node_class.phpt5
-rw-r--r--ext/intl/tests/breakiter___construct.phpt5
-rw-r--r--ext/intl/tests/timezone_getCanonicalID_error.phpt5
-rw-r--r--ext/mysqli/tests/bug33491.phpt6
-rw-r--r--ext/mysqli/tests/bug38003.phpt5
-rw-r--r--ext/mysqli/tests/mysqli_driver_unclonable.phpt5
-rw-r--r--ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt5
-rw-r--r--ext/mysqli/tests/mysqli_result_unclonable.phpt5
-rw-r--r--ext/mysqli/tests/mysqli_stmt_unclonable.phpt5
-rw-r--r--ext/mysqli/tests/mysqli_unclonable.phpt5
-rw-r--r--ext/pdo/tests/bug47769.phpt5
-rw-r--r--ext/pdo/tests/pdo_025.phpt5
-rw-r--r--ext/pdo/tests/pdo_037.phpt5
-rw-r--r--ext/pdo_mysql/tests/bug_37445.phpt5
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt6
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt5
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt5
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt5
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt6
-rw-r--r--ext/phar/tests/cache_list/frontcontroller29.phpt7
-rw-r--r--ext/phar/tests/frontcontroller29.phpt7
-rw-r--r--ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt5
-rw-r--r--ext/reflection/tests/ReflectionClass_getName_error1.phpt5
-rw-r--r--ext/reflection/tests/ReflectionClass_isCloneable_001.phpt5
-rw-r--r--ext/reflection/tests/ReflectionClass_isIterateable_001.phpt5
-rw-r--r--ext/reflection/tests/ReflectionObject_getName_error1.phpt5
-rw-r--r--ext/reflection/tests/bug64007.phpt6
-rw-r--r--ext/session/tests/bug60634_error_1.phpt7
-rw-r--r--ext/session/tests/bug60634_error_3.phpt6
-rw-r--r--ext/session/tests/bug60634_error_5.phpt7
-rw-r--r--ext/simplexml/tests/SimpleXMLElement_xpath.phpt5
-rw-r--r--ext/spl/tests/arrayObject_setFlags_basic2.phpt5
-rw-r--r--ext/spl/tests/bug48023.phpt5
-rw-r--r--ext/spl/tests/bug49972.phpt5
-rw-r--r--ext/spl/tests/iterator_035.phpt5
-rw-r--r--ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt6
-rw-r--r--ext/standard/tests/array/arsort_object1.phpt5
-rw-r--r--ext/standard/tests/array/arsort_object2.phpt5
-rw-r--r--ext/standard/tests/general_functions/bug47857.phpt5
-rw-r--r--ext/tidy/tests/035.phpt5
-rw-r--r--ext/xmlreader/tests/bug51936.phpt5
44 files changed, 190 insertions, 44 deletions
diff --git a/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt b/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
index 33e07c641d..2ef17926aa 100644
--- a/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
+++ b/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
@@ -12,4 +12,7 @@ require_once dirname(__FILE__) .'/skipif.inc';
DOMDocument::saveHTMLFile();
?>
--EXPECTF--
-Fatal error: Non-static method DOMDocument::saveHTMLFile() cannot be called statically in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Non-static method DOMDocument::saveHTMLFile() cannot be called statically' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/dom/tests/DOMDocument_saveHTML_error2.phpt b/ext/dom/tests/DOMDocument_saveHTML_error2.phpt
index 614605b34a..1f7c95c6ae 100644
--- a/ext/dom/tests/DOMDocument_saveHTML_error2.phpt
+++ b/ext/dom/tests/DOMDocument_saveHTML_error2.phpt
@@ -12,4 +12,7 @@ require_once dirname(__FILE__) .'/skipif.inc';
DOMDocument::saveHTML(true);
?>
--EXPECTF--
-Fatal error: Non-static method DOMDocument::saveHTML() cannot be called statically in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Non-static method DOMDocument::saveHTML() cannot be called statically' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/dom/tests/DOMDocument_validate_error2.phpt b/ext/dom/tests/DOMDocument_validate_error2.phpt
index fe7e4fc9d9..0ef15691de 100644
--- a/ext/dom/tests/DOMDocument_validate_error2.phpt
+++ b/ext/dom/tests/DOMDocument_validate_error2.phpt
@@ -12,4 +12,7 @@ require_once dirname(__FILE__) .'/skipif.inc';
DOMDocument::validate();
?>
--EXPECTF--
-Fatal error: Non-static method DOMDocument::validate() cannot be called statically in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Non-static method DOMDocument::validate() cannot be called statically' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/dom/tests/regsiter_node_class.phpt b/ext/dom/tests/regsiter_node_class.phpt
index c632c613da..7fff3bfacf 100644
--- a/ext/dom/tests/regsiter_node_class.phpt
+++ b/ext/dom/tests/regsiter_node_class.phpt
@@ -37,4 +37,7 @@ myAttribute
HELLO Attribute
DOMAttr
-Fatal error: Call to undefined method DOMAttr::testit() in %s on line 25
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method DOMAttr::testit()' in %s:25
+Stack trace:
+#0 {main}
+ thrown in %s on line 25
diff --git a/ext/intl/tests/breakiter___construct.phpt b/ext/intl/tests/breakiter___construct.phpt
index a818075a30..a1e59ddf5d 100644
--- a/ext/intl/tests/breakiter___construct.phpt
+++ b/ext/intl/tests/breakiter___construct.phpt
@@ -11,4 +11,7 @@ ini_set("intl.error_level", E_WARNING);
new IntlBreakIterator();
--EXPECTF--
-Fatal error: Call to private IntlBreakIterator::__construct() from invalid context in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to private IntlBreakIterator::__construct() from invalid context' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/intl/tests/timezone_getCanonicalID_error.phpt b/ext/intl/tests/timezone_getCanonicalID_error.phpt
index c7ffb45b77..7fe2f61d51 100644
--- a/ext/intl/tests/timezone_getCanonicalID_error.phpt
+++ b/ext/intl/tests/timezone_getCanonicalID_error.phpt
@@ -29,4 +29,7 @@ bool(false)
Warning: IntlTimeZone::getCanonicalID(): intltz_get_canonical_id: could not convert time zone id to UTF-16 in %s on line %d
bool(false)
-Fatal error: Cannot pass parameter 2 by reference in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot pass parameter 2 by reference' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/mysqli/tests/bug33491.phpt b/ext/mysqli/tests/bug33491.phpt
index 8cab16ca4d..dbb3b7218c 100644
--- a/ext/mysqli/tests/bug33491.phpt
+++ b/ext/mysqli/tests/bug33491.phpt
@@ -26,4 +26,8 @@ $DB->query_single('SELECT DATE()');
?>
--EXPECTF--
-Fatal error: Call to a member function fetch_row() on boolean in %sbug33491.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to a member function fetch_row() on boolean' in %sbug33491.php:%d
+Stack trace:
+#0 %s(%d): DB->query_single('SELECT DATE()')
+#1 {main}
+ thrown in %sbug33491.php on line %d
diff --git a/ext/mysqli/tests/bug38003.phpt b/ext/mysqli/tests/bug38003.phpt
index af71f85f2c..f1efa56b30 100644
--- a/ext/mysqli/tests/bug38003.phpt
+++ b/ext/mysqli/tests/bug38003.phpt
@@ -17,4 +17,7 @@ $DB = new DB();
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Call to private DB::__construct() from invalid context in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to private DB::__construct() from invalid context' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_driver_unclonable.phpt b/ext/mysqli/tests/mysqli_driver_unclonable.phpt
index 0e2438eef9..fe3a91af63 100644
--- a/ext/mysqli/tests/mysqli_driver_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_driver_unclonable.phpt
@@ -10,4 +10,7 @@ Trying to clone mysqli_driver object
print "done!";
?>
--EXPECTF--
-Fatal error: Trying to clone an uncloneable object of class mysqli_driver in %s on line %d \ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class mysqli_driver' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d \ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
index 2fa80cfa94..d0786f9e1a 100644
--- a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
@@ -62,4 +62,7 @@ Exception: Class mysqli_fetch_object_test does not have a constructor hence you
Fatal error with PHP (but no exception!):
-Fatal error: Call to undefined method mysqli_fetch_object_test::mysqli_fetch_object_test() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method mysqli_fetch_object_test::mysqli_fetch_object_test()' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_result_unclonable.phpt b/ext/mysqli/tests/mysqli_result_unclonable.phpt
index 0ecc30b62a..0b400396c7 100644
--- a/ext/mysqli/tests/mysqli_result_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_result_unclonable.phpt
@@ -21,4 +21,7 @@ require_once('skipifconnectfailure.inc');
print "done!";
?>
--EXPECTF--
-Fatal error: Trying to clone an uncloneable object of class mysqli_result in %s on line %d \ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class mysqli_result' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d \ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
index 57d8d6d6a6..efec3dbc08 100644
--- a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
@@ -22,4 +22,7 @@ require_once('skipifconnectfailure.inc');
print "done!";
?>
--EXPECTF--
-Fatal error: Trying to clone an uncloneable object of class mysqli_stmt in %s on line %d \ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class mysqli_stmt' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d \ No newline at end of file
diff --git a/ext/mysqli/tests/mysqli_unclonable.phpt b/ext/mysqli/tests/mysqli_unclonable.phpt
index e332b9f24f..7b54fe5e81 100644
--- a/ext/mysqli/tests/mysqli_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_unclonable.phpt
@@ -20,4 +20,7 @@ require_once('skipifconnectfailure.inc');
print "done!";
?>
--EXPECTF--
-Fatal error: Trying to clone an uncloneable object of class mysqli in %s on line %d \ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class mysqli' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d \ No newline at end of file
diff --git a/ext/pdo/tests/bug47769.phpt b/ext/pdo/tests/bug47769.phpt
index 3b2f1e89fc..f6f2749cc0 100644
--- a/ext/pdo/tests/bug47769.phpt
+++ b/ext/pdo/tests/bug47769.phpt
@@ -34,4 +34,7 @@ this is a protected method.
this is a private method.
foo
-Fatal error: Call to protected method test::isProtected() from context '' in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to protected method test::isProtected() from context ''' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/pdo/tests/pdo_025.phpt b/ext/pdo/tests/pdo_025.phpt
index d16d8dd9bd..4170cec88c 100644
--- a/ext/pdo/tests/pdo_025.phpt
+++ b/ext/pdo/tests/pdo_025.phpt
@@ -110,4 +110,7 @@ object(Test)#%d (3) {
}
===FAIL===
-Fatal error: Cannot access protected property Fail::$id in %spdo_025.php on line %d%A
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot access protected property Fail::$id' in %spdo_025.php:%d
+Stack trace:
+#0 {main}
+ thrown in %spdo_025.php on line %d
diff --git a/ext/pdo/tests/pdo_037.phpt b/ext/pdo/tests/pdo_037.phpt
index a0ead4b75f..2880a1b38a 100644
--- a/ext/pdo/tests/pdo_037.phpt
+++ b/ext/pdo/tests/pdo_037.phpt
@@ -16,4 +16,7 @@ var_dump($obj->foo());
?>
--EXPECTF--
-Fatal error: Call to undefined method MyStatement::foo() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method MyStatement::foo()' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/pdo_mysql/tests/bug_37445.phpt b/ext/pdo_mysql/tests/bug_37445.phpt
index 8e915332d4..20a73ce703 100644
--- a/ext/pdo_mysql/tests/bug_37445.phpt
+++ b/ext/pdo_mysql/tests/bug_37445.phpt
@@ -17,4 +17,7 @@ $stmt = $db->prepare("SELECT 1");
$stmt->bindParam(':a', 'b');
?>
--EXPECTF--
-Fatal error: Cannot pass parameter 2 by reference in %sbug_37445.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot pass parameter 2 by reference' in %sbug_37445.php:%d
+Stack trace:
+#0 {main}
+ thrown in %sbug_37445.php on line %d
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
index 631a918dd0..aee3e901a0 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
@@ -152,4 +152,8 @@ array(1) {
}
}
-Fatal error: Cannot instantiate abstract class mystatement6 in %s on line %d \ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot instantiate abstract class mystatement6' in %s:%d
+Stack trace:
+#0 %s(%d): PDO->query('SELECT id, labe...')
+#1 {main}
+ thrown in %s on line %d \ No newline at end of file
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt
index 224684b878..05f7de80e9 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt
@@ -93,4 +93,7 @@ array(1) {
Warning: PDO::prepare(): SQLSTATE[42S22]: Column not found: 1054 Unknown column 'unknown_column' in 'field list' in %s on line %d
-Fatal error: Call to a member function execute() on boolean in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to a member function execute() on boolean' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt
index b7b0ab6294..d0201a1a76 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt
@@ -36,4 +36,7 @@ Warning: PDO::prepare(): SQLSTATE[HY093]: Invalid parameter number: mixed named
Warning: PDO::prepare(): SQLSTATE[HY093]: Invalid parameter number in %s on line %d
-Fatal error: Call to a member function execute() on boolean in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to a member function execute() on boolean' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
index c16ce5dd1c..61a9702d52 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
@@ -56,4 +56,7 @@ Testing native PS...
Warning: PDO::prepare(): SQLSTATE[42S02]: Base table or view not found: 1146 Table '%s.ihopeitdoesnotexist' doesn't exist in %s on line %d
-Fatal error: Call to a member function execute() on boolean in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to a member function execute() on boolean' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
index b367f3e188..0c2e75d2be 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
@@ -99,4 +99,8 @@ Native Prepared Statements...
Warning: PDO::query(): SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near '%SSELECT label FROM test ORDER BY id ASC LIMIT 1' at line %d in %s on line %d
-Fatal error: Call to a member function errorInfo() on boolean in %s on line %d \ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Call to a member function errorInfo() on boolean' in %s:%d
+Stack trace:
+#0 %s(%d): mysql_stmt_multiquery_wrong_usage(Object(PDO))
+#1 {main}
+ thrown in %s on line %d \ No newline at end of file
diff --git a/ext/phar/tests/cache_list/frontcontroller29.phpt b/ext/phar/tests/cache_list/frontcontroller29.phpt
index 1cd8f96f2d..4cfcd6489f 100644
--- a/ext/phar/tests/cache_list/frontcontroller29.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller29.phpt
@@ -14,4 +14,9 @@ files/frontcontroller8.phar
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
-Fatal error: Call to undefined function oopsie_daisy() in phar://%sfatalerror.phps on line 1 \ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function oopsie_daisy()' in phar://%sfatalerror.phps:1
+Stack trace:
+#0 [internal function]: unknown()
+#1 %s(%d): Phar::webPhar('whatever', 'index.php', '404.php', Array)
+#2 {main}
+ thrown in phar://%sfatalerror.phps on line 1 \ No newline at end of file
diff --git a/ext/phar/tests/frontcontroller29.phpt b/ext/phar/tests/frontcontroller29.phpt
index 0afc17929f..b5f572d49c 100644
--- a/ext/phar/tests/frontcontroller29.phpt
+++ b/ext/phar/tests/frontcontroller29.phpt
@@ -13,4 +13,9 @@ files/frontcontroller8.phar
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
-Fatal error: Call to undefined function oopsie_daisy() in phar://%sfatalerror.phps on line 1 \ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function oopsie_daisy()' in phar://%sfatalerror.phps:1
+Stack trace:
+#0 [internal function]: unknown()
+#1 %s(%d): Phar::webPhar('whatever', 'index.php', '404.php', Array)
+#2 {main}
+ thrown in phar://%sfatalerror.phps on line 1 \ No newline at end of file
diff --git a/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt b/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt
index 6b440cfe06..a2eedf7c54 100644
--- a/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt
@@ -12,4 +12,7 @@ if (!extension_loaded('reflection)) print 'skip';
$rc = new ReflectionClass("stdClass");
$rc2 = clone($rc);
--EXPECTF--
-Fatal error: Trying to clone an uncloneable object of class ReflectionClass in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class ReflectionClass' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/reflection/tests/ReflectionClass_getName_error1.phpt b/ext/reflection/tests/ReflectionClass_getName_error1.phpt
index 5590137f89..4bffdf8473 100644
--- a/ext/reflection/tests/ReflectionClass_getName_error1.phpt
+++ b/ext/reflection/tests/ReflectionClass_getName_error1.phpt
@@ -5,4 +5,7 @@ ReflectionClass::getName - forbid static invocation
ReflectionClass::getName();
?>
--EXPECTF--
-Fatal error: Non-static method ReflectionClass::getName() cannot be called statically in %s on line 2
+Fatal error: Uncaught exception 'EngineException' with message 'Non-static method ReflectionClass::getName() cannot be called statically' in %s:2
+Stack trace:
+#0 {main}
+ thrown in %s on line 2
diff --git a/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt b/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt
index f1042cc130..c47859e428 100644
--- a/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt
@@ -68,4 +68,7 @@ Internal class - XMLWriter
bool(false)
bool(false)
-Fatal error: Trying to clone an uncloneable object of class XMLWriter in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class XMLWriter' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt b/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt
index 4936413ef6..d83f9acce0 100644
--- a/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt
@@ -86,4 +86,7 @@ NULL
Test static invocation:
-Fatal error: Non-static method ReflectionClass::isIterateable() cannot be called statically in %s on line 43 \ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Non-static method ReflectionClass::isIterateable() cannot be called statically' in %s:43
+Stack trace:
+#0 {main}
+ thrown in %s on line 43 \ No newline at end of file
diff --git a/ext/reflection/tests/ReflectionObject_getName_error1.phpt b/ext/reflection/tests/ReflectionObject_getName_error1.phpt
index 26c342d7f4..c846e27422 100644
--- a/ext/reflection/tests/ReflectionObject_getName_error1.phpt
+++ b/ext/reflection/tests/ReflectionObject_getName_error1.phpt
@@ -5,4 +5,7 @@ ReflectionObject::getName - forbid static invocation
ReflectionObject::getName();
?>
--EXPECTF--
-Fatal error: Non-static method ReflectionClass::getName() cannot be called statically in %s on line 2
+Fatal error: Uncaught exception 'EngineException' with message 'Non-static method ReflectionClass::getName() cannot be called statically' in %s:2
+Stack trace:
+#0 {main}
+ thrown in %s on line 2
diff --git a/ext/reflection/tests/bug64007.phpt b/ext/reflection/tests/bug64007.phpt
index 50149a2a74..8ee07bf555 100644
--- a/ext/reflection/tests/bug64007.phpt
+++ b/ext/reflection/tests/bug64007.phpt
@@ -16,4 +16,8 @@ var_dump($generator);
--EXPECTF--
string(%d) "Class Generator is an internal class marked as final that cannot be instantiated without invoking its constructor"
-Fatal error: The "Generator" class is reserved for internal use and cannot be manually instantiated in %sbug64007.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'The "Generator" class is reserved for internal use and cannot be manually instantiated' in %sbug64007.php:%d
+Stack trace:
+#0 %s(%d): ReflectionClass->newInstance()
+#1 {main}
+ thrown in %sbug64007.php on line %d
diff --git a/ext/session/tests/bug60634_error_1.phpt b/ext/session/tests/bug60634_error_1.phpt
index 276153e322..80d7c13bb0 100644
--- a/ext/session/tests/bug60634_error_1.phpt
+++ b/ext/session/tests/bug60634_error_1.phpt
@@ -45,4 +45,9 @@ echo "um, hi\n";
--EXPECTF--
write: goodbye cruel world
-Fatal error: Call to undefined function undefined_function() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function undefined_function()' in %s:%d
+Stack trace:
+#0 [internal function]: write(%s, '')
+#1 %s(%d): session_write_close()
+#2 {main}
+ thrown in %s on line %d
diff --git a/ext/session/tests/bug60634_error_3.phpt b/ext/session/tests/bug60634_error_3.phpt
index 4a508a4d8f..a930982743 100644
--- a/ext/session/tests/bug60634_error_3.phpt
+++ b/ext/session/tests/bug60634_error_3.phpt
@@ -43,5 +43,9 @@ session_start();
--EXPECTF--
write: goodbye cruel world
-Fatal error: Call to undefined function undefined_function() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function undefined_function()' in %s:%d
+Stack trace:
+#0 [internal function]: write(%s, '')
+#1 {main}
+ thrown in %s on line %d
close: goodbye cruel world
diff --git a/ext/session/tests/bug60634_error_5.phpt b/ext/session/tests/bug60634_error_5.phpt
index 8081ab988a..da8de1117e 100644
--- a/ext/session/tests/bug60634_error_5.phpt
+++ b/ext/session/tests/bug60634_error_5.phpt
@@ -44,4 +44,9 @@ echo "um, hi\n";
--EXPECTF--
close: goodbye cruel world
-Fatal error: Call to undefined function undefined_function() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function undefined_function()' in %s:%d
+Stack trace:
+#0 [internal function]: close()
+#1 %s(%d): session_write_close()
+#2 {main}
+ thrown in %s on line %d
diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
index 2d5184495e..77402270d2 100644
--- a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
@@ -11,4 +11,7 @@ Notice: Undefined variable: x in %s on line %d
Warning: simplexml_load_string() expects parameter 3 to be integer, float given in %s on line %d
-Fatal error: Call to a member function xpath() on null in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to a member function xpath() on null' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/spl/tests/arrayObject_setFlags_basic2.phpt b/ext/spl/tests/arrayObject_setFlags_basic2.phpt
index 806f8129a3..534c755995 100644
--- a/ext/spl/tests/arrayObject_setFlags_basic2.phpt
+++ b/ext/spl/tests/arrayObject_setFlags_basic2.phpt
@@ -26,4 +26,7 @@ string(6) "secret"
string(6) "public"
string(6) "secret"
-Fatal error: Cannot access private property C::$x in %s on line 19
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot access private property C::$x' in %s:19
+Stack trace:
+#0 {main}
+ thrown in %s on line 19
diff --git a/ext/spl/tests/bug48023.phpt b/ext/spl/tests/bug48023.phpt
index ed0ff9e35a..59bbb81f8b 100644
--- a/ext/spl/tests/bug48023.phpt
+++ b/ext/spl/tests/bug48023.phpt
@@ -9,4 +9,7 @@ new Foo;
?>
===DONE===
--EXPECTF--
-Fatal error: Class 'Foo' not found in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Class 'Foo' not found' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/spl/tests/bug49972.phpt b/ext/spl/tests/bug49972.phpt
index 843c2519ba..dff469f625 100644
--- a/ext/spl/tests/bug49972.phpt
+++ b/ext/spl/tests/bug49972.phpt
@@ -8,4 +8,7 @@ $iterator->undefined();
?>
--EXPECTF--
-Fatal error: Call to undefined method AppendIterator::undefined() in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method AppendIterator::undefined()' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/spl/tests/iterator_035.phpt b/ext/spl/tests/iterator_035.phpt
index fc0271e381..d166cfdba7 100644
--- a/ext/spl/tests/iterator_035.phpt
+++ b/ext/spl/tests/iterator_035.phpt
@@ -14,4 +14,7 @@ echo "Done\n";
--EXPECTF--
Notice: Indirect modification of overloaded element of ArrayIterator has no effect in %s on line %d
-Fatal error: Cannot assign by reference to overloaded object in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Cannot assign by reference to overloaded object' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt b/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt
index 0d45c31513..9fee08b9f4 100644
--- a/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt
+++ b/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt
@@ -13,4 +13,8 @@ function p ($i) {
}
?>
--EXPECTF--
-Fatal error: An iterator cannot be used with foreach by reference in %s \ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'An iterator cannot be used with foreach by reference' in %s:%d
+Stack trace:
+#0 %s(%d): p(Object(IteratorIterator))
+#1 {main}
+ thrown in %s on line %d
diff --git a/ext/standard/tests/array/arsort_object1.phpt b/ext/standard/tests/array/arsort_object1.phpt
index 8fd80f91b8..e7c5bf8035 100644
--- a/ext/standard/tests/array/arsort_object1.phpt
+++ b/ext/standard/tests/array/arsort_object1.phpt
@@ -87,4 +87,7 @@ echo "Done\n";
--EXPECTF--
*** Testing arsort() : object functionality ***
-Fatal error: Class 'for_integer_asort' not found in %sarsort_object1.php on line %d \ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Class 'for_integer_asort' not found' in %sarsort_object1.php:%d
+Stack trace:
+#0 {main}
+ thrown in %sarsort_object1.php on line %d \ No newline at end of file
diff --git a/ext/standard/tests/array/arsort_object2.phpt b/ext/standard/tests/array/arsort_object2.phpt
index 24da657878..b21982e6f3 100644
--- a/ext/standard/tests/array/arsort_object2.phpt
+++ b/ext/standard/tests/array/arsort_object2.phpt
@@ -91,4 +91,7 @@ echo "Done\n";
--EXPECTF--
*** Testing arsort() : object functionality ***
-Fatal error: Class 'for_integer_asort' not found in %sarsort_object2.php on line %d \ No newline at end of file
+Fatal error: Uncaught exception 'EngineException' with message 'Class 'for_integer_asort' not found' in %sarsort_object2.php:%d
+Stack trace:
+#0 {main}
+ thrown in %sarsort_object2.php on line %d \ No newline at end of file
diff --git a/ext/standard/tests/general_functions/bug47857.phpt b/ext/standard/tests/general_functions/bug47857.phpt
index 10c3fa78e6..98c1981841 100644
--- a/ext/standard/tests/general_functions/bug47857.phpt
+++ b/ext/standard/tests/general_functions/bug47857.phpt
@@ -19,5 +19,8 @@ Deprecated: Non-static method foo::bar() should not be called statically in %sbu
ok
bool(false)
-Fatal error: Non-static method BaseException::getMessage() cannot be called statically in %sbug47857.php on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Non-static method BaseException::getMessage() cannot be called statically' in %sbug47857.php:%d
+Stack trace:
+#0 {main}
+ thrown in %sbug47857.php on line %d
diff --git a/ext/tidy/tests/035.phpt b/ext/tidy/tests/035.phpt
index 832f90fe57..a7183e1921 100644
--- a/ext/tidy/tests/035.phpt
+++ b/ext/tidy/tests/035.phpt
@@ -9,4 +9,7 @@ tidyNode::__construct()
new tidyNode;
?>
--EXPECTF--
-Fatal error: Call to private tidyNode::__construct() from invalid context in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Call to private tidyNode::__construct() from invalid context' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d
diff --git a/ext/xmlreader/tests/bug51936.phpt b/ext/xmlreader/tests/bug51936.phpt
index 4b5f1012e7..619b9ec1d9 100644
--- a/ext/xmlreader/tests/bug51936.phpt
+++ b/ext/xmlreader/tests/bug51936.phpt
@@ -19,4 +19,7 @@ Done
--EXPECTF--
Test
-Fatal error: Trying to clone an uncloneable object of class XMLReader in %s on line %d
+Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class XMLReader' in %s:%d
+Stack trace:
+#0 {main}
+ thrown in %s on line %d