summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/curl/tests/curl_file_serialize.phpt2
-rw-r--r--ext/date/tests/DatePeriod_wrong_constructor.phpt2
-rw-r--r--ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt2
-rw-r--r--ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt2
-rw-r--r--ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt2
-rw-r--r--ext/dom/tests/DOMDocument_saveHTML_error2.phpt2
-rw-r--r--ext/dom/tests/DOMDocument_validate_error2.phpt2
-rw-r--r--ext/dom/tests/dom003.phpt2
-rw-r--r--ext/dom/tests/regsiter_node_class.phpt2
-rw-r--r--ext/intl/tests/breakiter___construct.phpt2
-rw-r--r--ext/intl/tests/bug62081.phpt2
-rw-r--r--ext/intl/tests/dateformat_calendars.phpt2
-rw-r--r--ext/intl/tests/dateformat_calendars_variant2.phpt2
-rw-r--r--ext/intl/tests/timezone_getCanonicalID_error.phpt2
-rw-r--r--ext/mysqli/tests/bug33491.phpt2
-rw-r--r--ext/mysqli/tests/bug38003.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_driver_unclonable.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_result_unclonable.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_stmt_unclonable.phpt2
-rw-r--r--ext/mysqli/tests/mysqli_unclonable.phpt2
-rw-r--r--ext/pdo/tests/bug47769.phpt2
-rw-r--r--ext/pdo/tests/pdo_025.phpt2
-rw-r--r--ext/pdo/tests/pdo_036.phpt2
-rw-r--r--ext/pdo/tests/pdo_037.phpt2
-rw-r--r--ext/pdo/tests/pdorow.phpt2
-rw-r--r--ext/pdo_mysql/tests/bug_37445.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt2
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt2
-rw-r--r--ext/phar/tests/bug46032.phpt2
-rw-r--r--ext/phar/tests/bug69441.phpt2
-rw-r--r--ext/phar/tests/bug69453.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller11.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller12.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller13.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller18.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller19.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller20.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller29.phpt2
-rw-r--r--ext/phar/tests/frontcontroller11.phpt2
-rw-r--r--ext/phar/tests/frontcontroller12.phpt2
-rw-r--r--ext/phar/tests/frontcontroller13.phpt2
-rw-r--r--ext/phar/tests/frontcontroller18.phpt2
-rw-r--r--ext/phar/tests/frontcontroller19.phpt2
-rw-r--r--ext/phar/tests/frontcontroller20.phpt2
-rw-r--r--ext/phar/tests/frontcontroller29.phpt2
-rw-r--r--ext/phar/tests/tar/frontcontroller11.phar.phpt2
-rw-r--r--ext/phar/tests/tar/frontcontroller12.phar.phpt2
-rw-r--r--ext/phar/tests/tar/frontcontroller13.phar.phpt2
-rw-r--r--ext/phar/tests/tar/frontcontroller18.phar.phpt2
-rw-r--r--ext/phar/tests/tar/frontcontroller19.phar.phpt2
-rw-r--r--ext/phar/tests/tar/frontcontroller20.phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller11.phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller12.phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller13.phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller18.phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller19.phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller20.phar.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_getName_error1.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_isCloneable_001.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_isIterateable_001.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_isSubclassOf_error1.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt2
-rw-r--r--ext/reflection/tests/ReflectionMethod_constructor_error1.phpt14
-rw-r--r--ext/reflection/tests/ReflectionObject_getName_error1.phpt2
-rw-r--r--ext/reflection/tests/ReflectionObject_isSubclassOf_error.phpt2
-rw-r--r--ext/reflection/tests/ReflectionParameter_export_error3.phpt2
-rw-r--r--ext/reflection/tests/bug64007.phpt2
-rw-r--r--ext/session/tests/bug60634_error_1.phpt2
-rw-r--r--ext/session/tests/bug60634_error_2.phpt2
-rw-r--r--ext/session/tests/bug60634_error_3.phpt2
-rw-r--r--ext/session/tests/bug60634_error_4.phpt2
-rw-r--r--ext/session/tests/bug60634_error_5.phpt2
-rw-r--r--ext/session/tests/session_module_name_variation3.phpt2
-rw-r--r--ext/session/tests/session_set_save_handler_error3.phpt2
-rw-r--r--ext/simplexml/tests/SimpleXMLElement_xpath.phpt2
-rw-r--r--ext/spl/tests/DirectoryIterator_empty_constructor.phpt2
-rw-r--r--ext/spl/tests/DirectoryIterator_getInode_error.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt2
-rw-r--r--ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt2
-rw-r--r--ext/spl/tests/SplFileInfo_getGroup_error.phpt2
-rw-r--r--ext/spl/tests/SplFileInfo_getInode_error.phpt2
-rw-r--r--ext/spl/tests/SplFileInfo_getOwner_error.phpt2
-rw-r--r--ext/spl/tests/SplFileInfo_getPerms_error.phpt2
-rw-r--r--ext/spl/tests/arrayObject_setFlags_basic2.phpt2
-rw-r--r--ext/spl/tests/bug48023.phpt2
-rw-r--r--ext/spl/tests/bug49972.phpt2
-rw-r--r--ext/spl/tests/bug52238.phpt2
-rw-r--r--ext/spl/tests/bug54281.phpt2
-rw-r--r--ext/spl/tests/bug54291.phpt2
-rw-r--r--ext/spl/tests/iterator_035.phpt2
-rw-r--r--ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt2
-rw-r--r--ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt2
-rw-r--r--ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt2
-rw-r--r--ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt2
-rw-r--r--ext/spl/tests/spl_autoload_012.phpt4
-rw-r--r--ext/spl/tests/spl_heap_count_basic.phpt2
-rw-r--r--ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt2
-rw-r--r--ext/sqlite3/tests/sqlite3_15_open_error-win.phpt2
-rw-r--r--ext/sqlite3/tests/sqlite3_15_open_error.phpt2
-rw-r--r--ext/sqlite3/tests/sqlite3_21_security.phpt2
-rw-r--r--ext/standard/tests/array/arsort_object1.phpt2
-rw-r--r--ext/standard/tests/array/arsort_object2.phpt2
-rw-r--r--ext/standard/tests/array/bug35821.phpt2
-rw-r--r--ext/standard/tests/file/bug38450_2.phpt2
-rw-r--r--ext/standard/tests/general_functions/bug47857.phpt2
-rw-r--r--ext/standard/tests/serialize/bug69152.phpt2
-rw-r--r--ext/tidy/tests/035.phpt2
-rw-r--r--ext/xmlreader/tests/bug51936.phpt2
-rw-r--r--ext/xsl/tests/bug49634.phpt20
116 files changed, 132 insertions, 132 deletions
diff --git a/ext/curl/tests/curl_file_serialize.phpt b/ext/curl/tests/curl_file_serialize.phpt
index 43b272ad64..d8eefb355d 100644
--- a/ext/curl/tests/curl_file_serialize.phpt
+++ b/ext/curl/tests/curl_file_serialize.phpt
@@ -12,7 +12,7 @@ $data = 'a:2:{s:4:"file";O:8:"CURLFile":3:{s:4:"name";s:13:"testdata1.txt";s:4:"
var_dump(unserialize($data));
?>
--EXPECTF--
-Fatal error: Uncaught exception 'Exception' with message 'Unserialization of CURLFile instances is not allowed' in %s
+Fatal error: Uncaught Exception: Unserialization of CURLFile instances is not allowed in %s
Stack trace:
#0 [internal function]: CURLFile->__wakeup()
#1 %s
diff --git a/ext/date/tests/DatePeriod_wrong_constructor.phpt b/ext/date/tests/DatePeriod_wrong_constructor.phpt
index 744ca26c87..8acdc5d386 100644
--- a/ext/date/tests/DatePeriod_wrong_constructor.phpt
+++ b/ext/date/tests/DatePeriod_wrong_constructor.phpt
@@ -10,7 +10,7 @@ date.timezone=UTC
new DatePeriod();
?>
--EXPECTF--
-Fatal error: Uncaught exception 'Exception' with message 'DatePeriod::__construct(): This constructor accepts either (DateTimeInterface, DateInterval, int) OR (DateTimeInterface, DateInterval, DateTime) OR (string) as arguments.' in %s:%d
+Fatal error: Uncaught Exception: DatePeriod::__construct(): This constructor accepts either (DateTimeInterface, DateInterval, int) OR (DateTimeInterface, DateInterval, DateTime) OR (string) as arguments. in %s:%d
Stack trace:
#0 %s(%d): DatePeriod->__construct()
#1 {main}
diff --git a/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt b/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt
index 117d5de24e..4795f8176c 100644
--- a/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt
+++ b/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt
@@ -16,7 +16,7 @@ $root->appendChild($cdata);
$cdata->deleteData(5, 1);
?>
--EXPECTF--
-Fatal error: Uncaught exception 'DOMException' with message 'Index Size Error' in %s:%d
+Fatal error: Uncaught DOMException: Index Size Error in %s:%d
Stack trace:
#0 %s(%d): DOMCharacterData->deleteData(5, 1)
#1 {main}
diff --git a/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt b/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt
index c02c920849..7603a01741 100644
--- a/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt
+++ b/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt
@@ -12,7 +12,7 @@ $fragment->appendXML('<bait>crankbait</bait>');
$document->appendChild($fragment);
?>
--EXPECTF--
-Fatal error: Uncaught exception 'DOMException' with message 'No Modification Allowed Error' in %s:%d
+Fatal error: Uncaught DOMException: No Modification Allowed Error in %s:%d
Stack trace:
#0 %s(%d): DOMDocumentFragment->appendXML('<bait>crankbait...')
#1 {main}
diff --git a/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt b/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
index 2ef17926aa..c1ec685b2c 100644
--- a/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
+++ b/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
@@ -12,7 +12,7 @@ require_once dirname(__FILE__) .'/skipif.inc';
DOMDocument::saveHTMLFile();
?>
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Non-static method DOMDocument::saveHTMLFile() cannot be called statically' in %s:%d
+Fatal error: Uncaught EngineException: 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 1f7c95c6ae..41d190c072 100644
--- a/ext/dom/tests/DOMDocument_saveHTML_error2.phpt
+++ b/ext/dom/tests/DOMDocument_saveHTML_error2.phpt
@@ -12,7 +12,7 @@ require_once dirname(__FILE__) .'/skipif.inc';
DOMDocument::saveHTML(true);
?>
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Non-static method DOMDocument::saveHTML() cannot be called statically' in %s:%d
+Fatal error: Uncaught EngineException: 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 0ef15691de..901d541bf3 100644
--- a/ext/dom/tests/DOMDocument_validate_error2.phpt
+++ b/ext/dom/tests/DOMDocument_validate_error2.phpt
@@ -12,7 +12,7 @@ require_once dirname(__FILE__) .'/skipif.inc';
DOMDocument::validate();
?>
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Non-static method DOMDocument::validate() cannot be called statically' in %s:%d
+Fatal error: Uncaught EngineException: 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/dom003.phpt b/ext/dom/tests/dom003.phpt
index 37db1f7677..33f9a0ec81 100644
--- a/ext/dom/tests/dom003.phpt
+++ b/ext/dom/tests/dom003.phpt
@@ -62,7 +62,7 @@ object(DOMException)#%d (%d) {
}
--- Don't catch exception with try/catch
-Fatal error: Uncaught exception 'DOMException' with message 'Hierarchy Request Error' in %sdom003.php:%d
+Fatal error: Uncaught DOMException: Hierarchy Request Error in %sdom003.php:%d
Stack trace:
#0 %sdom003.php(%d): DOMNode->appendChild(Object(DOMElement))
#1 {main}
diff --git a/ext/dom/tests/regsiter_node_class.phpt b/ext/dom/tests/regsiter_node_class.phpt
index 7fff3bfacf..c2f0622438 100644
--- a/ext/dom/tests/regsiter_node_class.phpt
+++ b/ext/dom/tests/regsiter_node_class.phpt
@@ -37,7 +37,7 @@ myAttribute
HELLO Attribute
DOMAttr
-Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method DOMAttr::testit()' in %s:25
+Fatal error: Uncaught EngineException: 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 a1e59ddf5d..37303e583b 100644
--- a/ext/intl/tests/breakiter___construct.phpt
+++ b/ext/intl/tests/breakiter___construct.phpt
@@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING);
new IntlBreakIterator();
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private IntlBreakIterator::__construct() from invalid context' in %s:%d
+Fatal error: Uncaught EngineException: 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/bug62081.phpt b/ext/intl/tests/bug62081.phpt
index 263023ffac..b7adf7f873 100644
--- a/ext/intl/tests/bug62081.phpt
+++ b/ext/intl/tests/bug62081.phpt
@@ -12,7 +12,7 @@ ini_set('intl.error_level', E_WARNING);
$x = new IntlDateFormatter('en', 1, 1);
var_dump($x->__construct('en', 1, 1));
--EXPECTF--
-Fatal error: Uncaught exception 'IntlException' with message 'IntlDateFormatter::__construct(): datefmt_create: cannot call constructor twice' in %sbug62081.php:4
+Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: cannot call constructor twice in %sbug62081.php:4
Stack trace:
#0 %sbug62081.php(4): IntlDateFormatter->__construct('en', 1, 1)
#1 {main}
diff --git a/ext/intl/tests/dateformat_calendars.phpt b/ext/intl/tests/dateformat_calendars.phpt
index 13dde0f370..275dba1c30 100644
--- a/ext/intl/tests/dateformat_calendars.phpt
+++ b/ext/intl/tests/dateformat_calendars.phpt
@@ -41,7 +41,7 @@ string(44) "Sunday, January 1, 2012 5:12:00 AM GMT+05:12"
string(44) "Sunday, January 1, 2012 5:12:00 AM GMT+05:12"
string(42) "Sunday, Tevet 6, 5772 5:12:00 AM GMT+05:12"
-Fatal error: Uncaught exception 'IntlException' with message 'IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object' in %sdateformat_calendars.php:%d
+Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %sdateformat_calendars.php:%d
Stack trace:
#0 %sdateformat_calendars.php(%d): IntlDateFormatter->__construct('en_US@calendar=...', 0, 0, 'GMT+05:12', -1)
#1 {main}
diff --git a/ext/intl/tests/dateformat_calendars_variant2.phpt b/ext/intl/tests/dateformat_calendars_variant2.phpt
index 11a5026da0..fe4493aa7f 100644
--- a/ext/intl/tests/dateformat_calendars_variant2.phpt
+++ b/ext/intl/tests/dateformat_calendars_variant2.phpt
@@ -42,7 +42,7 @@ string(47) "Sunday, January 1, 2012 at 5:12:00 AM GMT+05:12"
string(47) "Sunday, January 1, 2012 at 5:12:00 AM GMT+05:12"
string(48) "Sunday, Tevet 6, 5772 AM at 5:12:00 AM GMT+05:12"
-Fatal error: Uncaught exception 'IntlException' with message 'IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object' in %sdateformat_calendars_variant2.php:27
+Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %sdateformat_calendars_variant2.php:27
Stack trace:
#0 %sdateformat_calendars_variant2.php(27): IntlDateFormatter->__construct('en_US@calendar=...', 0, 0, 'GMT+05:12', -1)
#1 {main}
diff --git a/ext/intl/tests/timezone_getCanonicalID_error.phpt b/ext/intl/tests/timezone_getCanonicalID_error.phpt
index 7fe2f61d51..b0a45bceaf 100644
--- a/ext/intl/tests/timezone_getCanonicalID_error.phpt
+++ b/ext/intl/tests/timezone_getCanonicalID_error.phpt
@@ -29,7 +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: Uncaught exception 'EngineException' with message 'Cannot pass parameter 2 by reference' in %s:%d
+Fatal error: Uncaught EngineException: 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 dbb3b7218c..ff9518f220 100644
--- a/ext/mysqli/tests/bug33491.phpt
+++ b/ext/mysqli/tests/bug33491.phpt
@@ -26,7 +26,7 @@ $DB->query_single('SELECT DATE()');
?>
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Call to a member function fetch_row() on boolean' in %sbug33491.php:%d
+Fatal error: Uncaught EngineException: 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}
diff --git a/ext/mysqli/tests/bug38003.phpt b/ext/mysqli/tests/bug38003.phpt
index f1efa56b30..7158cec30a 100644
--- a/ext/mysqli/tests/bug38003.phpt
+++ b/ext/mysqli/tests/bug38003.phpt
@@ -17,7 +17,7 @@ $DB = new DB();
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private DB::__construct() from invalid context' in %s:%d
+Fatal error: Uncaught EngineException: 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 fe3a91af63..316e351dc4 100644
--- a/ext/mysqli/tests/mysqli_driver_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_driver_unclonable.phpt
@@ -10,7 +10,7 @@ Trying to clone mysqli_driver object
print "done!";
?>
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class mysqli_driver' in %s:%d
+Fatal error: Uncaught EngineException: 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 d0786f9e1a..52941ad6b1 100644
--- a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
@@ -62,7 +62,7 @@ Exception: Class mysqli_fetch_object_test does not have a constructor hence you
Fatal error with PHP (but no exception!):
-Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method mysqli_fetch_object_test::mysqli_fetch_object_test()' in %s:%d
+Fatal error: Uncaught EngineException: 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 0b400396c7..d409ba3bbf 100644
--- a/ext/mysqli/tests/mysqli_result_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_result_unclonable.phpt
@@ -21,7 +21,7 @@ require_once('skipifconnectfailure.inc');
print "done!";
?>
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class mysqli_result' in %s:%d
+Fatal error: Uncaught EngineException: 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 efec3dbc08..b2d7dead7a 100644
--- a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
@@ -22,7 +22,7 @@ require_once('skipifconnectfailure.inc');
print "done!";
?>
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class mysqli_stmt' in %s:%d
+Fatal error: Uncaught EngineException: 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 7b54fe5e81..2ce91584aa 100644
--- a/ext/mysqli/tests/mysqli_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_unclonable.phpt
@@ -20,7 +20,7 @@ require_once('skipifconnectfailure.inc');
print "done!";
?>
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class mysqli' in %s:%d
+Fatal error: Uncaught EngineException: 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 f6f2749cc0..12a5e00d11 100644
--- a/ext/pdo/tests/bug47769.phpt
+++ b/ext/pdo/tests/bug47769.phpt
@@ -34,7 +34,7 @@ this is a protected method.
this is a private method.
foo
-Fatal error: Uncaught exception 'EngineException' with message 'Call to protected method test::isProtected() from context ''' in %s:%d
+Fatal error: Uncaught EngineException: 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 4170cec88c..5083b84708 100644
--- a/ext/pdo/tests/pdo_025.phpt
+++ b/ext/pdo/tests/pdo_025.phpt
@@ -110,7 +110,7 @@ object(Test)#%d (3) {
}
===FAIL===
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot access protected property Fail::$id' in %spdo_025.php:%d
+Fatal error: Uncaught EngineException: 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_036.phpt b/ext/pdo/tests/pdo_036.phpt
index a9fdc9315d..61f0e49a1c 100644
--- a/ext/pdo/tests/pdo_036.phpt
+++ b/ext/pdo/tests/pdo_036.phpt
@@ -20,7 +20,7 @@ object(PDOStatement)#%d (1) {
NULL
}
-Fatal error: Uncaught exception 'PDOException' with message 'You may not create a PDORow manually' in %spdo_036.php:8
+Fatal error: Uncaught PDOException: You may not create a PDORow manually in %spdo_036.php:8
Stack trace:
#0 [internal function]: PDORow->__construct()
#1 %spdo_036.php(8): ReflectionClass->newInstance()
diff --git a/ext/pdo/tests/pdo_037.phpt b/ext/pdo/tests/pdo_037.phpt
index 2880a1b38a..3d9bc59dd0 100644
--- a/ext/pdo/tests/pdo_037.phpt
+++ b/ext/pdo/tests/pdo_037.phpt
@@ -16,7 +16,7 @@ var_dump($obj->foo());
?>
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method MyStatement::foo()' in %s:%d
+Fatal error: Uncaught EngineException: Call to undefined method MyStatement::foo() in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
diff --git a/ext/pdo/tests/pdorow.phpt b/ext/pdo/tests/pdorow.phpt
index 727f60f2c7..7cd1198838 100644
--- a/ext/pdo/tests/pdorow.phpt
+++ b/ext/pdo/tests/pdorow.phpt
@@ -9,7 +9,7 @@ new PDORow;
?>
--EXPECTF--
-Fatal error: Uncaught exception 'PDOException' with message 'You may not create a PDORow manually' in %spdorow.php:3
+Fatal error: Uncaught PDOException: You may not create a PDORow manually in %spdorow.php:3
Stack trace:
#0 %spdorow.php(3): PDORow->__construct()
#1 {main}
diff --git a/ext/pdo_mysql/tests/bug_37445.phpt b/ext/pdo_mysql/tests/bug_37445.phpt
index 20a73ce703..241c3f84e8 100644
--- a/ext/pdo_mysql/tests/bug_37445.phpt
+++ b/ext/pdo_mysql/tests/bug_37445.phpt
@@ -17,7 +17,7 @@ $stmt = $db->prepare("SELECT 1");
$stmt->bindParam(':a', 'b');
?>
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot pass parameter 2 by reference' in %sbug_37445.php:%d
+Fatal error: Uncaught EngineException: 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 aee3e901a0..b31ad352b4 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
@@ -152,7 +152,7 @@ array(1) {
}
}
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot instantiate abstract class mystatement6' in %s:%d
+Fatal error: Uncaught EngineException: Cannot instantiate abstract class mystatement6 in %s:%d
Stack trace:
#0 %s(%d): PDO->query('SELECT id, labe...')
#1 {main}
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 05f7de80e9..2076723344 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,7 +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: Uncaught exception 'EngineException' with message 'Call to a member function execute() on boolean' in %s:%d
+Fatal error: Uncaught EngineException: 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 d0201a1a76..66ee0eedc9 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,7 +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: Uncaught exception 'EngineException' with message 'Call to a member function execute() on boolean' in %s:%d
+Fatal error: Uncaught EngineException: 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 61a9702d52..06a6a418f9 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
@@ -56,7 +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: Uncaught exception 'EngineException' with message 'Call to a member function execute() on boolean' in %s:%d
+Fatal error: Uncaught EngineException: 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 0c2e75d2be..1caa875a32 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
@@ -99,7 +99,7 @@ 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: Uncaught exception 'EngineException' with message 'Call to a member function errorInfo() on boolean' in %s:%d
+Fatal error: Uncaught EngineException: 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}
diff --git a/ext/phar/tests/bug46032.phpt b/ext/phar/tests/bug46032.phpt
index 7700e9b6f8..a59ddadd43 100644
--- a/ext/phar/tests/bug46032.phpt
+++ b/ext/phar/tests/bug46032.phpt
@@ -27,7 +27,7 @@ new phardata('0000000000000000000');
%string|unicode%(%d) "%smytest"
%string|unicode%(%d) "%smytest"
-Fatal error: Uncaught exception 'UnexpectedValueException' with message 'Cannot create phar '0000000000000000000', file extension (or combination) not recognised or the directory does not exist' in %sbug46032.php:%d
+Fatal error: Uncaught UnexpectedValueException: Cannot create phar '0000000000000000000', file extension (or combination) not recognised or the directory does not exist in %sbug46032.php:%d
Stack trace:
#0 %sbug46032.php(%d): PharData->__construct('000000000000000...')
#1 {main}
diff --git a/ext/phar/tests/bug69441.phpt b/ext/phar/tests/bug69441.phpt
index 03c87e34ca..3e995e03c0 100644
--- a/ext/phar/tests/bug69441.phpt
+++ b/ext/phar/tests/bug69441.phpt
@@ -14,7 +14,7 @@ $r = new Phar($fname, 0);
==DONE==
--EXPECTF--
-exception 'UnexpectedValueException' with message 'phar error: corrupted central directory entry, no magic signature in zip-based phar "%s%ebug69441.phar"' in %s%ebug69441.php:%d
+UnexpectedValueException: phar error: corrupted central directory entry, no magic signature in zip-based phar "%s%ebug69441.phar" in %s%ebug69441.php:%d
Stack trace:
#0 %s%ebug69441.php(%d): Phar->__construct('%s', 0)
#1 {main}
diff --git a/ext/phar/tests/bug69453.phpt b/ext/phar/tests/bug69453.phpt
index 4a2a37f00a..12b437639a 100644
--- a/ext/phar/tests/bug69453.phpt
+++ b/ext/phar/tests/bug69453.phpt
@@ -14,7 +14,7 @@ $r = new Phar($fname, 0);
==DONE==
--EXPECTF--
-exception 'UnexpectedValueException' with message 'phar error: "%s/bug69453.tar.phar" is a corrupted tar file (checksum mismatch of file "")' in %s:%d
+UnexpectedValueException: phar error: "%s/bug69453.tar.phar" is a corrupted tar file (checksum mismatch of file "") in %s:%d
Stack trace:
#0 %s/bug69453.php(%d): Phar->__construct('%s', 0)
#1 {main}
diff --git a/ext/phar/tests/cache_list/frontcontroller11.phpt b/ext/phar/tests/cache_list/frontcontroller11.phpt
index 25b147e194..f5e4e2269f 100644
--- a/ext/phar/tests/cache_list/frontcontroller11.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller11.phpt
@@ -15,7 +15,7 @@ files/frontcontroller5.phar
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Key of MIME type overrides array must be a file extension, was "0"' in %sfrontcontroller11.php:2
+Fatal error: Uncaught PharException: Key of MIME type overrides array must be a file extension, was "0" in %sfrontcontroller11.php:2
Stack trace:
#0 %sfrontcontroller11.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
diff --git a/ext/phar/tests/cache_list/frontcontroller12.phpt b/ext/phar/tests/cache_list/frontcontroller12.phpt
index cfc7d0e43a..6d798f9f8a 100644
--- a/ext/phar/tests/cache_list/frontcontroller12.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller12.phpt
@@ -14,7 +14,7 @@ files/frontcontroller6.phar
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller12.php:2
+Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller12.php:2
Stack trace:
#0 %sfrontcontroller12.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
diff --git a/ext/phar/tests/cache_list/frontcontroller13.phpt b/ext/phar/tests/cache_list/frontcontroller13.phpt
index e6c9dee4ae..c81d0cfbd9 100644
--- a/ext/phar/tests/cache_list/frontcontroller13.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller13.phpt
@@ -14,7 +14,7 @@ files/frontcontroller7.phar
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller13.php:2
+Fatal error: Uncaught PharException: Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller13.php:2
Stack trace:
#0 %sfrontcontroller13.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
diff --git a/ext/phar/tests/cache_list/frontcontroller18.phpt b/ext/phar/tests/cache_list/frontcontroller18.phpt
index 5e94bf6ff5..77c0303d0c 100644
--- a/ext/phar/tests/cache_list/frontcontroller18.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller18.phpt
@@ -11,7 +11,7 @@ PATH_INFO=/fronk.gronk
--FILE_EXTERNAL--
files/frontcontroller9.phar
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'No values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller18.php:2
+Fatal error: Uncaught PharException: No values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller18.php:2
Stack trace:
#0 %sfrontcontroller18.php(2): Phar::mungServer(Array)
#1 {main}
diff --git a/ext/phar/tests/cache_list/frontcontroller19.phpt b/ext/phar/tests/cache_list/frontcontroller19.phpt
index bed0b1df31..548c6db479 100644
--- a/ext/phar/tests/cache_list/frontcontroller19.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller19.phpt
@@ -11,7 +11,7 @@ PATH_INFO=/
--FILE_EXTERNAL--
files/frontcontroller10.phar
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Too many values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller19.php:2
+Fatal error: Uncaught PharException: Too many values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller19.php:2
Stack trace:
#0 %sfrontcontroller19.php(2): Phar::mungServer(Array)
#1 {main}
diff --git a/ext/phar/tests/cache_list/frontcontroller20.phpt b/ext/phar/tests/cache_list/frontcontroller20.phpt
index bf333c773c..68591c962a 100644
--- a/ext/phar/tests/cache_list/frontcontroller20.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller20.phpt
@@ -11,7 +11,7 @@ PATH_INFO=/
--FILE_EXTERNAL--
files/frontcontroller11.phar
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller20.php:2
+Fatal error: Uncaught PharException: Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller20.php:2
Stack trace:
#0 %sfrontcontroller20.php(2): Phar::mungServer(Array)
#1 {main}
diff --git a/ext/phar/tests/cache_list/frontcontroller29.phpt b/ext/phar/tests/cache_list/frontcontroller29.phpt
index 4cfcd6489f..39c27fcdd7 100644
--- a/ext/phar/tests/cache_list/frontcontroller29.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller29.phpt
@@ -14,7 +14,7 @@ files/frontcontroller8.phar
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function oopsie_daisy()' in phar://%sfatalerror.phps:1
+Fatal error: Uncaught EngineException: 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)
diff --git a/ext/phar/tests/frontcontroller11.phpt b/ext/phar/tests/frontcontroller11.phpt
index 1e6f1a00ff..aa20e19e97 100644
--- a/ext/phar/tests/frontcontroller11.phpt
+++ b/ext/phar/tests/frontcontroller11.phpt
@@ -14,7 +14,7 @@ files/frontcontroller5.phar
--EXPECTHEADERS--
Content-type: text/html
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Key of MIME type overrides array must be a file extension, was "0"' in %sfrontcontroller11.php:2
+Fatal error: Uncaught PharException: Key of MIME type overrides array must be a file extension, was "0" in %sfrontcontroller11.php:2
Stack trace:
#0 %sfrontcontroller11.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
diff --git a/ext/phar/tests/frontcontroller12.phpt b/ext/phar/tests/frontcontroller12.phpt
index 956ea1c050..bad71d0ac5 100644
--- a/ext/phar/tests/frontcontroller12.phpt
+++ b/ext/phar/tests/frontcontroller12.phpt
@@ -13,7 +13,7 @@ files/frontcontroller6.phar
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller12.php:2
+Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller12.php:2
Stack trace:
#0 %sfrontcontroller12.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
diff --git a/ext/phar/tests/frontcontroller13.phpt b/ext/phar/tests/frontcontroller13.phpt
index 717e56996f..7d018a141a 100644
--- a/ext/phar/tests/frontcontroller13.phpt
+++ b/ext/phar/tests/frontcontroller13.phpt
@@ -13,7 +13,7 @@ files/frontcontroller7.phar
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller13.php:2
+Fatal error: Uncaught PharException: Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller13.php:2
Stack trace:
#0 %sfrontcontroller13.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
diff --git a/ext/phar/tests/frontcontroller18.phpt b/ext/phar/tests/frontcontroller18.phpt
index 19aea45563..d01886e6b0 100644
--- a/ext/phar/tests/frontcontroller18.phpt
+++ b/ext/phar/tests/frontcontroller18.phpt
@@ -9,7 +9,7 @@ PATH_INFO=/fronk.gronk
--FILE_EXTERNAL--
files/frontcontroller9.phar
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'No values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller18.php:2
+Fatal error: Uncaught PharException: No values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller18.php:2
Stack trace:
#0 %sfrontcontroller18.php(2): Phar::mungServer(Array)
#1 {main}
diff --git a/ext/phar/tests/frontcontroller19.phpt b/ext/phar/tests/frontcontroller19.phpt
index 9adafa2b30..e577ecb6a4 100644
--- a/ext/phar/tests/frontcontroller19.phpt
+++ b/ext/phar/tests/frontcontroller19.phpt
@@ -9,7 +9,7 @@ PATH_INFO=/
--FILE_EXTERNAL--
files/frontcontroller10.phar
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Too many values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller19.php:2
+Fatal error: Uncaught PharException: Too many values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller19.php:2
Stack trace:
#0 %sfrontcontroller19.php(2): Phar::mungServer(Array)
#1 {main}
diff --git a/ext/phar/tests/frontcontroller20.phpt b/ext/phar/tests/frontcontroller20.phpt
index 45e2bfc25e..e67ec06a5c 100644
--- a/ext/phar/tests/frontcontroller20.phpt
+++ b/ext/phar/tests/frontcontroller20.phpt
@@ -9,7 +9,7 @@ PATH_INFO=/
--FILE_EXTERNAL--
files/frontcontroller11.phar
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller20.php:2
+Fatal error: Uncaught PharException: Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller20.php:2
Stack trace:
#0 %sfrontcontroller20.php(2): Phar::mungServer(Array)
#1 {main}
diff --git a/ext/phar/tests/frontcontroller29.phpt b/ext/phar/tests/frontcontroller29.phpt
index b5f572d49c..5369a60845 100644
--- a/ext/phar/tests/frontcontroller29.phpt
+++ b/ext/phar/tests/frontcontroller29.phpt
@@ -13,7 +13,7 @@ files/frontcontroller8.phar
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function oopsie_daisy()' in phar://%sfatalerror.phps:1
+Fatal error: Uncaught EngineException: 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)
diff --git a/ext/phar/tests/tar/frontcontroller11.phar.phpt b/ext/phar/tests/tar/frontcontroller11.phar.phpt
index 2b0d15b603..4b8c29dd1b 100644
--- a/ext/phar/tests/tar/frontcontroller11.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller11.phar.phpt
@@ -14,7 +14,7 @@ files/frontcontroller5.phar.tar
--EXPECTHEADERS--
Content-type: text/html
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Key of MIME type overrides array must be a file extension, was "0"' in %sfrontcontroller11.phar.php:2
+Fatal error: Uncaught PharException: Key of MIME type overrides array must be a file extension, was "0" in %sfrontcontroller11.phar.php:2
Stack trace:
#0 %sfrontcontroller11.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
diff --git a/ext/phar/tests/tar/frontcontroller12.phar.phpt b/ext/phar/tests/tar/frontcontroller12.phar.phpt
index 2086856cf3..53804e476a 100644
--- a/ext/phar/tests/tar/frontcontroller12.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller12.phar.phpt
@@ -13,7 +13,7 @@ files/frontcontroller6.phar.tar
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller12.phar.php:2
+Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller12.phar.php:2
Stack trace:
#0 %sfrontcontroller12.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
diff --git a/ext/phar/tests/tar/frontcontroller13.phar.phpt b/ext/phar/tests/tar/frontcontroller13.phar.phpt
index ce7620a198..7fc0676aea 100644
--- a/ext/phar/tests/tar/frontcontroller13.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller13.phar.phpt
@@ -13,7 +13,7 @@ files/frontcontroller7.phar.tar
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller13.phar.php:2
+Fatal error: Uncaught PharException: Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller13.phar.php:2
Stack trace:
#0 %sfrontcontroller13.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
diff --git a/ext/phar/tests/tar/frontcontroller18.phar.phpt b/ext/phar/tests/tar/frontcontroller18.phar.phpt
index c52ce291c7..1dddcef069 100644
--- a/ext/phar/tests/tar/frontcontroller18.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller18.phar.phpt
@@ -9,7 +9,7 @@ PATH_INFO=/fronk.gronk
--FILE_EXTERNAL--
files/frontcontroller9.phar.tar
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'No values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller18.phar.php:2
+Fatal error: Uncaught PharException: No values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller18.phar.php:2
Stack trace:
#0 %sfrontcontroller18.phar.php(2): Phar::mungServer(Array)
#1 {main}
diff --git a/ext/phar/tests/tar/frontcontroller19.phar.phpt b/ext/phar/tests/tar/frontcontroller19.phar.phpt
index 6b07438787..21a173f9be 100644
--- a/ext/phar/tests/tar/frontcontroller19.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller19.phar.phpt
@@ -9,7 +9,7 @@ PATH_INFO=/
--FILE_EXTERNAL--
files/frontcontroller10.phar.tar
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Too many values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller19.phar.php:2
+Fatal error: Uncaught PharException: Too many values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller19.phar.php:2
Stack trace:
#0 %sfrontcontroller19.phar.php(2): Phar::mungServer(Array)
#1 {main}
diff --git a/ext/phar/tests/tar/frontcontroller20.phar.phpt b/ext/phar/tests/tar/frontcontroller20.phar.phpt
index 3cc470d41b..b88903eb53 100644
--- a/ext/phar/tests/tar/frontcontroller20.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller20.phar.phpt
@@ -9,7 +9,7 @@ PATH_INFO=/
--FILE_EXTERNAL--
files/frontcontroller11.phar.tar
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller20.phar.php:2
+Fatal error: Uncaught PharException: Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller20.phar.php:2
Stack trace:
#0 %sfrontcontroller20.phar.php(2): Phar::mungServer(Array)
#1 {main}
diff --git a/ext/phar/tests/zip/frontcontroller11.phar.phpt b/ext/phar/tests/zip/frontcontroller11.phar.phpt
index e4900cd3a5..c0c555a1a4 100644
--- a/ext/phar/tests/zip/frontcontroller11.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller11.phar.phpt
@@ -15,7 +15,7 @@ files/frontcontroller5.phar.zip
--EXPECTHEADERS--
Content-type: text/html
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Key of MIME type overrides array must be a file extension, was "0"' in %sfrontcontroller11.phar.php:2
+Fatal error: Uncaught PharException: Key of MIME type overrides array must be a file extension, was "0" in %sfrontcontroller11.phar.php:2
Stack trace:
#0 %sfrontcontroller11.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
diff --git a/ext/phar/tests/zip/frontcontroller12.phar.phpt b/ext/phar/tests/zip/frontcontroller12.phar.phpt
index 504d037177..a74a0d5d32 100644
--- a/ext/phar/tests/zip/frontcontroller12.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller12.phar.phpt
@@ -14,7 +14,7 @@ files/frontcontroller6.phar.zip
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller12.phar.php:2
+Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller12.phar.php:2
Stack trace:
#0 %sfrontcontroller12.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
diff --git a/ext/phar/tests/zip/frontcontroller13.phar.phpt b/ext/phar/tests/zip/frontcontroller13.phar.phpt
index 4b9e910a25..4ed1dc8670 100644
--- a/ext/phar/tests/zip/frontcontroller13.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller13.phar.phpt
@@ -14,7 +14,7 @@ files/frontcontroller7.phar.zip
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller13.phar.php:2
+Fatal error: Uncaught PharException: Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller13.phar.php:2
Stack trace:
#0 %sfrontcontroller13.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
diff --git a/ext/phar/tests/zip/frontcontroller18.phar.phpt b/ext/phar/tests/zip/frontcontroller18.phar.phpt
index dbd09cab15..3d01527122 100644
--- a/ext/phar/tests/zip/frontcontroller18.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller18.phar.phpt
@@ -10,7 +10,7 @@ PATH_INFO=/fronk.gronk
--FILE_EXTERNAL--
files/frontcontroller9.phar.zip
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'No values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller18.phar.php:2
+Fatal error: Uncaught PharException: No values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller18.phar.php:2
Stack trace:
#0 %sfrontcontroller18.phar.php(2): Phar::mungServer(Array)
#1 {main}
diff --git a/ext/phar/tests/zip/frontcontroller19.phar.phpt b/ext/phar/tests/zip/frontcontroller19.phar.phpt
index 0eb87bfa60..db66ea48b0 100644
--- a/ext/phar/tests/zip/frontcontroller19.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller19.phar.phpt
@@ -10,7 +10,7 @@ PATH_INFO=/
--FILE_EXTERNAL--
files/frontcontroller10.phar.zip
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Too many values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller19.phar.php:2
+Fatal error: Uncaught PharException: Too many values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller19.phar.php:2
Stack trace:
#0 %sfrontcontroller19.phar.php(2): Phar::mungServer(Array)
#1 {main}
diff --git a/ext/phar/tests/zip/frontcontroller20.phar.phpt b/ext/phar/tests/zip/frontcontroller20.phar.phpt
index b1caf52da8..3bab3bfd80 100644
--- a/ext/phar/tests/zip/frontcontroller20.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller20.phar.phpt
@@ -10,7 +10,7 @@ PATH_INFO=/
--FILE_EXTERNAL--
files/frontcontroller11.phar.zip
--EXPECTF--
-Fatal error: Uncaught exception 'PharException' with message 'Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller20.phar.php:2
+Fatal error: Uncaught PharException: Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller20.phar.php:2
Stack trace:
#0 %sfrontcontroller20.phar.php(2): Phar::mungServer(Array)
#1 {main}
diff --git a/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt b/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt
index a2eedf7c54..0d1ef20ad7 100644
--- a/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt
@@ -12,7 +12,7 @@ if (!extension_loaded('reflection)) print 'skip';
$rc = new ReflectionClass("stdClass");
$rc2 = clone($rc);
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class ReflectionClass' in %s:%d
+Fatal error: Uncaught EngineException: 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 4bffdf8473..e475688b6d 100644
--- a/ext/reflection/tests/ReflectionClass_getName_error1.phpt
+++ b/ext/reflection/tests/ReflectionClass_getName_error1.phpt
@@ -5,7 +5,7 @@ ReflectionClass::getName - forbid static invocation
ReflectionClass::getName();
?>
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Non-static method ReflectionClass::getName() cannot be called statically' in %s:2
+Fatal error: Uncaught EngineException: 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_getStaticPropertyValue_001_2_4.phpt b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt
index 8bb62d95f1..02f7595cb4 100644
--- a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt
+++ b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt
@@ -54,7 +54,7 @@ try {
Retrieving static values from A:
string(13) "default value"
-Fatal error: Uncaught exception 'ReflectionException' with message 'Class A does not have a property named ' in %sReflectionClass_getStaticPropertyValue_001_2_4.php:%d
+Fatal error: Uncaught ReflectionException: Class A does not have a property named in %sReflectionClass_getStaticPropertyValue_001_2_4.php:%d
Stack trace:
#0 %sReflectionClass_getStaticPropertyValue_001_2_4.php(%d): ReflectionClass->getStaticPropertyValue('\x00A\x00privateOverr...')
#1 {main}
diff --git a/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt b/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt
index c47859e428..e261855088 100644
--- a/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt
@@ -68,7 +68,7 @@ Internal class - XMLWriter
bool(false)
bool(false)
-Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class XMLWriter' in %s:%d
+Fatal error: Uncaught EngineException: 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 d83f9acce0..47dba9b6ec 100644
--- a/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt
@@ -86,7 +86,7 @@ NULL
Test static invocation:
-Fatal error: Uncaught exception 'EngineException' with message 'Non-static method ReflectionClass::isIterateable() cannot be called statically' in %s:43
+Fatal error: Uncaught EngineException: 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/ReflectionClass_isSubclassOf_error1.phpt b/ext/reflection/tests/ReflectionClass_isSubclassOf_error1.phpt
index 2fabd023e6..bb4f96818a 100644
--- a/ext/reflection/tests/ReflectionClass_isSubclassOf_error1.phpt
+++ b/ext/reflection/tests/ReflectionClass_isSubclassOf_error1.phpt
@@ -9,7 +9,7 @@ var_dump($rc->isSubclassOf('X'));
?>
--EXPECTF--
-Fatal error: Uncaught exception 'ReflectionException' with message 'Class X does not exist' in %s:5
+Fatal error: Uncaught ReflectionException: Class X does not exist in %s:5
Stack trace:
#0 %s(5): ReflectionClass->isSubclassOf('X')
#1 {main}
diff --git a/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt b/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt
index dfe3e7f8f7..334efc3a50 100644
--- a/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt
+++ b/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt
@@ -31,7 +31,7 @@ object(stdClass)#%d (0) {
object(DateTime)#%d (0) {
}
-Fatal error: Uncaught exception 'ReflectionException' with message 'Class Generator is an internal class marked as final that cannot be instantiated without invoking its constructor' in %sReflectionClass_newInstanceWithoutConstructor.php:%d
+Fatal error: Uncaught ReflectionException: Class Generator is an internal class marked as final that cannot be instantiated without invoking its constructor in %sReflectionClass_newInstanceWithoutConstructor.php:%d
Stack trace:
#0 %sReflectionClass_newInstanceWithoutConstructor.php(%d): ReflectionClass->newInstanceWithoutConstructor()
#1 {main}
diff --git a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt
index dc13bf562d..6720d2daa2 100644
--- a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt
+++ b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt
@@ -54,7 +54,7 @@ try {
--EXPECTF--
Set static values in A:
-Fatal error: Uncaught exception 'ReflectionException' with message 'Class A does not have a property named ' in %sReflectionClass_setStaticPropertyValue_001_2_4.php:%d
+Fatal error: Uncaught ReflectionException: Class A does not have a property named in %sReflectionClass_setStaticPropertyValue_001_2_4.php:%d
Stack trace:
#0 %sReflectionClass_setStaticPropertyValue_001_2_4.php(%d): ReflectionClass->setStaticPropertyValue('\x00A\x00privateOverr...', 'new value 1')
#1 {main}
diff --git a/ext/reflection/tests/ReflectionMethod_constructor_error1.phpt b/ext/reflection/tests/ReflectionMethod_constructor_error1.phpt
index 70528255e7..f7beea67a6 100644
--- a/ext/reflection/tests/ReflectionMethod_constructor_error1.phpt
+++ b/ext/reflection/tests/ReflectionMethod_constructor_error1.phpt
@@ -65,37 +65,37 @@ try {
?>
--EXPECTF--
Wrong type of argument (bool):
-exception 'ReflectionException' with message 'Invalid method name 1' in %s
+ReflectionException: Invalid method name 1 in %s
Stack trace:
#0 %s ReflectionMethod->__construct('1')
#1 {main}
Wrong type of argument (int):
-exception 'ReflectionException' with message 'Invalid method name 3' in %s
+ReflectionException: Invalid method name 3 in %s
Stack trace:
#0 %s ReflectionMethod->__construct('3')
#1 {main}
Wrong type of argument (bool, string):
-exception 'ReflectionException' with message 'The parameter class is expected to be either a string or an object' in %s
+ReflectionException: The parameter class is expected to be either a string or an object in %s
Stack trace:
#0 %s ReflectionMethod->__construct(true, 'foo')
#1 {main}
Wrong type of argument (string, bool):
-exception 'ReflectionException' with message 'Method TestClass::1() does not exist' in %s
+ReflectionException: Method TestClass::1() does not exist in %s
Stack trace:
#0 %s ReflectionMethod->__construct('TestClass', '1')
#1 {main}
No method given:
-exception 'ReflectionException' with message 'Invalid method name TestClass' in %s
+ReflectionException: Invalid method name TestClass in %s
Stack trace:
#0 %s ReflectionMethod->__construct('TestClass')
#1 {main}
Class and Method in same string, bad method name:
-exception 'ReflectionException' with message 'Method TestClass::foop::dedoop() does not exist' in %s
+ReflectionException: Method TestClass::foop::dedoop() does not exist in %s
Stack trace:
#0 %s ReflectionMethod->__construct('TestClass::foop...')
#1 {main}
Class and Method in same string, bad class name:
-exception 'ReflectionException' with message 'Class TestCla does not exist' in %s
+ReflectionException: Class TestCla does not exist in %s
Stack trace:
#0 %s ReflectionMethod->__construct('TestCla::foo')
#1 {main}
diff --git a/ext/reflection/tests/ReflectionObject_getName_error1.phpt b/ext/reflection/tests/ReflectionObject_getName_error1.phpt
index c846e27422..32132f52e8 100644
--- a/ext/reflection/tests/ReflectionObject_getName_error1.phpt
+++ b/ext/reflection/tests/ReflectionObject_getName_error1.phpt
@@ -5,7 +5,7 @@ ReflectionObject::getName - forbid static invocation
ReflectionObject::getName();
?>
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Non-static method ReflectionClass::getName() cannot be called statically' in %s:2
+Fatal error: Uncaught EngineException: 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/ReflectionObject_isSubclassOf_error.phpt b/ext/reflection/tests/ReflectionObject_isSubclassOf_error.phpt
index 9387b7dcb3..11994ed705 100644
--- a/ext/reflection/tests/ReflectionObject_isSubclassOf_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_isSubclassOf_error.phpt
@@ -17,7 +17,7 @@ NULL
Warning: ReflectionClass::isSubclassOf() expects exactly 1 parameter, 2 given in %s on line 6
NULL
-Fatal error: Uncaught exception 'ReflectionException' with message 'Class X does not exist' in %s:7
+Fatal error: Uncaught ReflectionException: Class X does not exist in %s:7
Stack trace:
#0 %s(7): ReflectionClass->isSubclassOf('X')
#1 {main}
diff --git a/ext/reflection/tests/ReflectionParameter_export_error3.phpt b/ext/reflection/tests/ReflectionParameter_export_error3.phpt
index 2937853288..4e71f55d45 100644
--- a/ext/reflection/tests/ReflectionParameter_export_error3.phpt
+++ b/ext/reflection/tests/ReflectionParameter_export_error3.phpt
@@ -14,7 +14,7 @@ foreach($params as $key => $value) {
}
--EXPECTF--
-Fatal error: Uncaught exception 'ReflectionException' with message 'The parameter specified by its name could not be found' in %s.php:%d
+Fatal error: Uncaught ReflectionException: The parameter specified by its name could not be found in %s.php:%d
Stack trace:
#0 [internal function]: ReflectionParameter->__construct('ReflectionParam...', 'incorrect_param...')
#1 %s.php(%d): ReflectionParameter::export('ReflectionParam...', 'incorrect_param...')
diff --git a/ext/reflection/tests/bug64007.phpt b/ext/reflection/tests/bug64007.phpt
index 8ee07bf555..91b7fa6885 100644
--- a/ext/reflection/tests/bug64007.phpt
+++ b/ext/reflection/tests/bug64007.phpt
@@ -16,7 +16,7 @@ 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: Uncaught exception 'EngineException' with message 'The "Generator" class is reserved for internal use and cannot be manually instantiated' in %sbug64007.php:%d
+Fatal error: Uncaught EngineException: 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}
diff --git a/ext/session/tests/bug60634_error_1.phpt b/ext/session/tests/bug60634_error_1.phpt
index 80d7c13bb0..90983c6f85 100644
--- a/ext/session/tests/bug60634_error_1.phpt
+++ b/ext/session/tests/bug60634_error_1.phpt
@@ -45,7 +45,7 @@ echo "um, hi\n";
--EXPECTF--
write: goodbye cruel world
-Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function undefined_function()' in %s:%d
+Fatal error: Uncaught EngineException: Call to undefined function undefined_function() in %s:%d
Stack trace:
#0 [internal function]: write(%s, '')
#1 %s(%d): session_write_close()
diff --git a/ext/session/tests/bug60634_error_2.phpt b/ext/session/tests/bug60634_error_2.phpt
index 96c8eb61e5..045b3f5385 100644
--- a/ext/session/tests/bug60634_error_2.phpt
+++ b/ext/session/tests/bug60634_error_2.phpt
@@ -45,7 +45,7 @@ echo "um, hi\n";
--EXPECTF--
write: goodbye cruel world
-Fatal error: Uncaught exception 'Exception' in %s
+Fatal error: Uncaught Exception in %s
Stack trace:
#0 [internal function]: write('%s', '')
#1 %s(%d): session_write_close()
diff --git a/ext/session/tests/bug60634_error_3.phpt b/ext/session/tests/bug60634_error_3.phpt
index a930982743..d756644f76 100644
--- a/ext/session/tests/bug60634_error_3.phpt
+++ b/ext/session/tests/bug60634_error_3.phpt
@@ -43,7 +43,7 @@ session_start();
--EXPECTF--
write: goodbye cruel world
-Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function undefined_function()' in %s:%d
+Fatal error: Uncaught EngineException: Call to undefined function undefined_function() in %s:%d
Stack trace:
#0 [internal function]: write(%s, '')
#1 {main}
diff --git a/ext/session/tests/bug60634_error_4.phpt b/ext/session/tests/bug60634_error_4.phpt
index d0b5786af9..7970b35c7a 100644
--- a/ext/session/tests/bug60634_error_4.phpt
+++ b/ext/session/tests/bug60634_error_4.phpt
@@ -43,7 +43,7 @@ session_start();
--EXPECTF--
write: goodbye cruel world
-Fatal error: Uncaught exception 'Exception' in %s
+Fatal error: Uncaught Exception in %s
Stack trace:
#0 [internal function]: write('%s', '')
#1 {main}
diff --git a/ext/session/tests/bug60634_error_5.phpt b/ext/session/tests/bug60634_error_5.phpt
index da8de1117e..018cf17538 100644
--- a/ext/session/tests/bug60634_error_5.phpt
+++ b/ext/session/tests/bug60634_error_5.phpt
@@ -44,7 +44,7 @@ echo "um, hi\n";
--EXPECTF--
close: goodbye cruel world
-Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function undefined_function()' in %s:%d
+Fatal error: Uncaught EngineException: Call to undefined function undefined_function() in %s:%d
Stack trace:
#0 [internal function]: close()
#1 %s(%d): session_write_close()
diff --git a/ext/session/tests/session_module_name_variation3.phpt b/ext/session/tests/session_module_name_variation3.phpt
index b282b4025d..de49195fe8 100644
--- a/ext/session/tests/session_module_name_variation3.phpt
+++ b/ext/session/tests/session_module_name_variation3.phpt
@@ -41,7 +41,7 @@ ob_end_flush();
string(%d) "%s"
string(4) "user"
-Warning: Uncaught exception 'Exception' with message 'Stop...!' in %s:%d
+Warning: Uncaught Exception: Stop...! in %s:%d
Stack trace:
#0 [internal function]: open('', 'PHPSESSID')
#1 %s(%d): session_start()
diff --git a/ext/session/tests/session_set_save_handler_error3.phpt b/ext/session/tests/session_set_save_handler_error3.phpt
index 859ba11ad5..fdf306a4a5 100644
--- a/ext/session/tests/session_set_save_handler_error3.phpt
+++ b/ext/session/tests/session_set_save_handler_error3.phpt
@@ -34,7 +34,7 @@ ob_end_flush();
--EXPECTF--
*** Testing session_set_save_handler() : error functionality ***
-Warning: Uncaught exception 'Exception' with message 'Do something bad..!' in %s:%d
+Warning: Uncaught Exception: Do something bad..! in %s:%d
Stack trace:
#0 [internal function]: open('', 'PHPSESSID')
#1 %s(%d): session_start()
diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
index 77402270d2..7926ceb6e1 100644
--- a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
@@ -11,7 +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: Uncaught exception 'EngineException' with message 'Call to a member function xpath() on null' in %s:%d
+Fatal error: Uncaught EngineException: 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/DirectoryIterator_empty_constructor.phpt b/ext/spl/tests/DirectoryIterator_empty_constructor.phpt
index da5276ccdc..d0753fc33e 100644
--- a/ext/spl/tests/DirectoryIterator_empty_constructor.phpt
+++ b/ext/spl/tests/DirectoryIterator_empty_constructor.phpt
@@ -8,7 +8,7 @@ Havard Eide <nucleuz@gmail.com>
$it = new DirectoryIterator("");
?>
--EXPECTF--
-Fatal error: Uncaught exception 'RuntimeException' with message 'Directory name must not be empty.' in %s:%d
+Fatal error: Uncaught RuntimeException: Directory name must not be empty. in %s:%d
Stack trace:
#0 %s(%d): DirectoryIterator->__construct('')
#1 {main}
diff --git a/ext/spl/tests/DirectoryIterator_getInode_error.phpt b/ext/spl/tests/DirectoryIterator_getInode_error.phpt
index c3641f9d89..ba9014c690 100644
--- a/ext/spl/tests/DirectoryIterator_getInode_error.phpt
+++ b/ext/spl/tests/DirectoryIterator_getInode_error.phpt
@@ -21,7 +21,7 @@ var_dump($fileInfo->getInode());
?>
--EXPECTF--
-Fatal error: Uncaught exception 'RuntimeException' with message 'SplFileInfo::getInode(): stat failed for %s' in %s
+Fatal error: Uncaught RuntimeException: SplFileInfo::getInode(): stat failed for %s in %s
Stack trace:
#0 %s: SplFileInfo->getInode()
#1 {main}
diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt
index 5df4ab59a5..b2bc444550 100644
--- a/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt
@@ -11,7 +11,7 @@ $get = $array->offsetGet( array( 'fail' ) );
?>
--EXPECTF--
-Fatal error: Uncaught exception 'OutOfRangeException' with message 'Offset invalid or out of range' in %s
+Fatal error: Uncaught OutOfRangeException: Offset invalid or out of range in %s
Stack trace:
#0 %s
#1 {main}
diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt
index fcff762e6b..a387439d16 100644
--- a/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt
@@ -11,7 +11,7 @@ $get = $array->offsetGet( 'fail' );
?>
--EXPECTF--
-Fatal error: Uncaught exception 'OutOfRangeException' with message 'Offset invalid or out of range' in %s
+Fatal error: Uncaught OutOfRangeException: Offset invalid or out of range in %s
Stack trace:
#0 %s
#1 {main}
diff --git a/ext/spl/tests/SplFileInfo_getGroup_error.phpt b/ext/spl/tests/SplFileInfo_getGroup_error.phpt
index f0db00d9ed..acfa6b99c5 100644
--- a/ext/spl/tests/SplFileInfo_getGroup_error.phpt
+++ b/ext/spl/tests/SplFileInfo_getGroup_error.phpt
@@ -21,7 +21,7 @@ var_dump($fileInfo->getGroup());
?>
--EXPECTF--
-Fatal error: Uncaught exception 'RuntimeException' with message 'SplFileInfo::getGroup(): stat failed for not_existing' in %s
+Fatal error: Uncaught RuntimeException: SplFileInfo::getGroup(): stat failed for not_existing in %s
Stack trace:
#0 %s: SplFileInfo->getGroup()
#1 {main}
diff --git a/ext/spl/tests/SplFileInfo_getInode_error.phpt b/ext/spl/tests/SplFileInfo_getInode_error.phpt
index bf8efae4c9..31b5382336 100644
--- a/ext/spl/tests/SplFileInfo_getInode_error.phpt
+++ b/ext/spl/tests/SplFileInfo_getInode_error.phpt
@@ -21,7 +21,7 @@ var_dump($fileInfo->getInode());
?>
--EXPECTF--
-Fatal error: Uncaught exception 'RuntimeException' with message 'SplFileInfo::getInode(): stat failed for not_existing' in %s
+Fatal error: Uncaught RuntimeException: SplFileInfo::getInode(): stat failed for not_existing in %s
Stack trace:
#0 %s: SplFileInfo->getInode()
#1 {main}
diff --git a/ext/spl/tests/SplFileInfo_getOwner_error.phpt b/ext/spl/tests/SplFileInfo_getOwner_error.phpt
index d5d46781cc..f6b4b29195 100644
--- a/ext/spl/tests/SplFileInfo_getOwner_error.phpt
+++ b/ext/spl/tests/SplFileInfo_getOwner_error.phpt
@@ -21,7 +21,7 @@ var_dump($fileInfo->getOwner());
?>
--EXPECTF--
-Fatal error: Uncaught exception 'RuntimeException' with message 'SplFileInfo::getOwner(): stat failed for not_existing' in %s
+Fatal error: Uncaught RuntimeException: SplFileInfo::getOwner(): stat failed for not_existing in %s
Stack trace:
#0 %s: SplFileInfo->getOwner()
#1 {main}
diff --git a/ext/spl/tests/SplFileInfo_getPerms_error.phpt b/ext/spl/tests/SplFileInfo_getPerms_error.phpt
index 8e05cdf8df..23b48de976 100644
--- a/ext/spl/tests/SplFileInfo_getPerms_error.phpt
+++ b/ext/spl/tests/SplFileInfo_getPerms_error.phpt
@@ -21,7 +21,7 @@ var_dump($fileInfo->getPerms() == 0100557);
?>
--EXPECTF--
-Fatal error: Uncaught exception 'RuntimeException' with message 'SplFileInfo::getPerms(): stat failed for %s' in %s
+Fatal error: Uncaught RuntimeException: SplFileInfo::getPerms(): stat failed for %s in %s
Stack trace:
#0 %s: SplFileInfo->getPerms()
#1 {main}
diff --git a/ext/spl/tests/arrayObject_setFlags_basic2.phpt b/ext/spl/tests/arrayObject_setFlags_basic2.phpt
index 534c755995..e1d816e158 100644
--- a/ext/spl/tests/arrayObject_setFlags_basic2.phpt
+++ b/ext/spl/tests/arrayObject_setFlags_basic2.phpt
@@ -26,7 +26,7 @@ string(6) "secret"
string(6) "public"
string(6) "secret"
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot access private property C::$x' in %s:19
+Fatal error: Uncaught EngineException: 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 59bbb81f8b..1af4190d0a 100644
--- a/ext/spl/tests/bug48023.phpt
+++ b/ext/spl/tests/bug48023.phpt
@@ -9,7 +9,7 @@ new Foo;
?>
===DONE===
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Class 'Foo' not found' in %s:%d
+Fatal error: Uncaught EngineException: 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 dff469f625..cc0aff3bed 100644
--- a/ext/spl/tests/bug49972.phpt
+++ b/ext/spl/tests/bug49972.phpt
@@ -8,7 +8,7 @@ $iterator->undefined();
?>
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method AppendIterator::undefined()' in %s:%d
+Fatal error: Uncaught EngineException: 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/bug52238.phpt b/ext/spl/tests/bug52238.phpt
index 10da0b5fd9..667c0a497a 100644
--- a/ext/spl/tests/bug52238.phpt
+++ b/ext/spl/tests/bug52238.phpt
@@ -15,7 +15,7 @@ class Foo implements IteratorAggregate
var_dump(iterator_to_array(new Foo));
?>
--EXPECTF--
-Fatal error: Uncaught exception 'Exception' in %s
+Fatal error: Uncaught Exception in %s
Stack trace:
#0 %s: Foo->bar()
#1 [internal function]: Foo->getIterator()
diff --git a/ext/spl/tests/bug54281.phpt b/ext/spl/tests/bug54281.phpt
index 9a19a59ad8..1d83699e14 100644
--- a/ext/spl/tests/bug54281.phpt
+++ b/ext/spl/tests/bug54281.phpt
@@ -12,7 +12,7 @@ foreach($it as $k=>$v) { }
?>
--EXPECTF--
-Fatal error: Uncaught exception 'LogicException' with message 'The object is in an invalid state as the parent constructor was not called' in %s:%d
+Fatal error: Uncaught LogicException: The object is in an invalid state as the parent constructor was not called in %s:%d
Stack trace:
#0 %s%ebug54281.php(8): RecursiveIteratorIterator->rewind()
#1 {main}
diff --git a/ext/spl/tests/bug54291.phpt b/ext/spl/tests/bug54291.phpt
index 9314b6b9ff..c0119c4360 100644
--- a/ext/spl/tests/bug54291.phpt
+++ b/ext/spl/tests/bug54291.phpt
@@ -5,7 +5,7 @@ Bug #54291 (Crash iterating DirectoryIterator for dir name starting with \0)
$dir = new DirectoryIterator("\x00/abc");
$dir->isFile();
--EXPECTF--
-Fatal error: Uncaught exception 'UnexpectedValueException' with message 'Failed to open directory ""' in %s:%d
+Fatal error: Uncaught UnexpectedValueException: Failed to open directory "" in %s:%d
Stack trace:
#0 %s(%d): DirectoryIterator->__construct('\x00/abc')
#1 {main}
diff --git a/ext/spl/tests/iterator_035.phpt b/ext/spl/tests/iterator_035.phpt
index d166cfdba7..bedb7684d5 100644
--- a/ext/spl/tests/iterator_035.phpt
+++ b/ext/spl/tests/iterator_035.phpt
@@ -14,7 +14,7 @@ echo "Done\n";
--EXPECTF--
Notice: Indirect modification of overloaded element of ArrayIterator has no effect in %s on line %d
-Fatal error: Uncaught exception 'EngineException' with message 'Cannot assign by reference to overloaded object' in %s:%d
+Fatal error: Uncaught EngineException: 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/recursiveIteratorIterator_beginchildren_error.phpt b/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt
index f5430725d4..c9e21b260e 100644
--- a/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt
+++ b/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt
@@ -28,7 +28,7 @@ var_dump($recItIt2->next());
--EXPECTF--
NULL
-Fatal error: Uncaught exception 'Exception' in %s
+Fatal error: Uncaught Exception in %s
Stack trace:
#0 [internal function]: MyRecursiveIteratorIterator->beginchildren()
#1 %s: RecursiveIteratorIterator->next()
diff --git a/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt b/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt
index 88f03fbd81..cbf8136ab6 100644
--- a/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt
+++ b/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt
@@ -28,7 +28,7 @@ var_dump($recItIt2->next());
--EXPECTF--
NULL
-Fatal error: Uncaught exception 'Exception' in %s
+Fatal error: Uncaught Exception in %s
Stack trace:
#0 [internal function]: MyRecursiveIteratorIterator->callHasChildren()
#1 %s: RecursiveIteratorIterator->next()
diff --git a/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt b/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt
index e25d3edc80..82d55cf0ce 100644
--- a/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt
+++ b/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt
@@ -34,7 +34,7 @@ foreach ($recItIt2 as $val) echo "$val\n";
1
2
-Fatal error: Uncaught exception 'Exception' in %s
+Fatal error: Uncaught Exception in %s
Stack trace:
#0 [internal function]: MyRecursiveIteratorIterator->endchildren()
#1 %s: RecursiveIteratorIterator->next()
diff --git a/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt b/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt
index 3a91ed5b27..bb020fdff0 100644
--- a/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt
+++ b/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt
@@ -28,7 +28,7 @@ var_dump($recItIt->next());
--EXPECTF--
NULL
-Fatal error: Uncaught exception 'Exception' in %s
+Fatal error: Uncaught Exception in %s
Stack trace:
#0 [internal function]: MyRecursiveIteratorIterator->nextelement()
#1 %s: RecursiveIteratorIterator->next()
diff --git a/ext/spl/tests/spl_autoload_012.phpt b/ext/spl/tests/spl_autoload_012.phpt
index e07f0e4fe5..16389fa4fa 100644
--- a/ext/spl/tests/spl_autoload_012.phpt
+++ b/ext/spl/tests/spl_autoload_012.phpt
@@ -49,14 +49,14 @@ first
autoload_first
autoload_second
-Fatal error: Uncaught exception 'Exception' with message 'first' in %sspl_autoload_012.php:%d
+Fatal error: Uncaught Exception: first in %sspl_autoload_012.php:%d
Stack trace:
#0 [internal function]: autoload_first('ThisClassDoesNo...')
#1 [internal function]: spl_autoload_call('ThisClassDoesNo...')
#2 %sspl_autoload_012.php(%d): class_exists('ThisClassDoesNo...')
#3 {main}
-Next exception 'Exception' with message 'second' in %sspl_autoload_012.php:%d
+Next Exception: second in %sspl_autoload_012.php:%d
Stack trace:
#0 [internal function]: autoload_second('ThisClassDoesNo...')
#1 [internal function]: spl_autoload_call('ThisClassDoesNo...')
diff --git a/ext/spl/tests/spl_heap_count_basic.phpt b/ext/spl/tests/spl_heap_count_basic.phpt
index 6e6baf6c9b..a14133e873 100644
--- a/ext/spl/tests/spl_heap_count_basic.phpt
+++ b/ext/spl/tests/spl_heap_count_basic.phpt
@@ -27,7 +27,7 @@ count($heap);// refers to MyHeap->count() method
?>
--EXPECTF--
-Fatal error: Uncaught exception 'Exception' with message 'Cause count to fail' in %s
+Fatal error: Uncaught Exception: Cause count to fail in %s
Stack trace:
#0 [internal function]: MyHeap->count()
#1 %s count(Object(MyHeap))
diff --git a/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt b/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt
index 9fee08b9f4..6fbcec9dff 100644
--- a/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt
+++ b/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt
@@ -13,7 +13,7 @@ function p ($i) {
}
?>
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'An iterator cannot be used with foreach by reference' in %s:%d
+Fatal error: Uncaught EngineException: An iterator cannot be used with foreach by reference in %s:%d
Stack trace:
#0 %s(%d): p(Object(IteratorIterator))
#1 {main}
diff --git a/ext/sqlite3/tests/sqlite3_15_open_error-win.phpt b/ext/sqlite3/tests/sqlite3_15_open_error-win.phpt
index 6289fac849..d9c7e2fa41 100644
--- a/ext/sqlite3/tests/sqlite3_15_open_error-win.phpt
+++ b/ext/sqlite3/tests/sqlite3_15_open_error-win.phpt
@@ -30,7 +30,7 @@ exec($cmd);
unlink($unreadable);
?>
--EXPECTF--
-exception 'Exception' with message 'Unable to open database: %s' in %ssqlite3_15_open_error-win.php:%d
+Exception: Unable to open database: %s in %ssqlite3_15_open_error-win.php:%d
Stack trace:
#0 %ssqlite3_15_open_error-win.php(%d): SQLite3->__construct('%s')
#1 {main}
diff --git a/ext/sqlite3/tests/sqlite3_15_open_error.phpt b/ext/sqlite3/tests/sqlite3_15_open_error.phpt
index fc05b87802..74bcc920d0 100644
--- a/ext/sqlite3/tests/sqlite3_15_open_error.phpt
+++ b/ext/sqlite3/tests/sqlite3_15_open_error.phpt
@@ -24,7 +24,7 @@ echo "Done\n";
unlink($unreadable);
?>
--EXPECTF--
-exception 'Exception' with message 'Unable to open database: %s' in %ssqlite3_15_open_error.php:%d
+Exception: Unable to open database: %s in %ssqlite3_15_open_error.php:%d
Stack trace:
#0 %ssqlite3_15_open_error.php(%d): SQLite3->__construct('%s')
#1 {main}
diff --git a/ext/sqlite3/tests/sqlite3_21_security.phpt b/ext/sqlite3/tests/sqlite3_21_security.phpt
index 7e83bb23e1..f28c7369dd 100644
--- a/ext/sqlite3/tests/sqlite3_21_security.phpt
+++ b/ext/sqlite3/tests/sqlite3_21_security.phpt
@@ -32,7 +32,7 @@ bool(true)
Above test directory
Warning: SQLite3::__construct(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %ssqlite3_21_security.php on line %d
-exception 'Exception' with message 'open_basedir prohibits opening %s' in %ssqlite3_21_security.php:%d
+Exception: open_basedir prohibits opening %s in %ssqlite3_21_security.php:%d
Stack trace:
#0 %ssqlite3_21_security.php(%d): SQLite3->__construct('%s')
#1 {main}
diff --git a/ext/standard/tests/array/arsort_object1.phpt b/ext/standard/tests/array/arsort_object1.phpt
index e7c5bf8035..75be19b52e 100644
--- a/ext/standard/tests/array/arsort_object1.phpt
+++ b/ext/standard/tests/array/arsort_object1.phpt
@@ -87,7 +87,7 @@ echo "Done\n";
--EXPECTF--
*** Testing arsort() : object functionality ***
-Fatal error: Uncaught exception 'EngineException' with message 'Class 'for_integer_asort' not found' in %sarsort_object1.php:%d
+Fatal error: Uncaught EngineException: 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 b21982e6f3..077e2ced16 100644
--- a/ext/standard/tests/array/arsort_object2.phpt
+++ b/ext/standard/tests/array/arsort_object2.phpt
@@ -91,7 +91,7 @@ echo "Done\n";
--EXPECTF--
*** Testing arsort() : object functionality ***
-Fatal error: Uncaught exception 'EngineException' with message 'Class 'for_integer_asort' not found' in %sarsort_object2.php:%d
+Fatal error: Uncaught EngineException: 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/array/bug35821.phpt b/ext/standard/tests/array/bug35821.phpt
index 3411c340ad..d7abc7773b 100644
--- a/ext/standard/tests/array/bug35821.phpt
+++ b/ext/standard/tests/array/bug35821.phpt
@@ -23,7 +23,7 @@ echo "Done\n";
?>
--EXPECTF--
-Fatal error: Uncaught exception 'Exception' in %s:%d
+Fatal error: Uncaught Exception in %s:%d
Stack trace:
#0 %s(%d): Element->ThrowException()
#1 [internal function]: Element::CallBack(Object(Element))
diff --git a/ext/standard/tests/file/bug38450_2.phpt b/ext/standard/tests/file/bug38450_2.phpt
index 625fd7c5cc..7934bb40f5 100644
--- a/ext/standard/tests/file/bug38450_2.phpt
+++ b/ext/standard/tests/file/bug38450_2.phpt
@@ -106,7 +106,7 @@ Warning: Missing argument 1 for VariableStream::__construct() in %s on line %d
Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %s on line %d
-Fatal error: Uncaught exception 'Exception' with message 'constructor' in %s:%d
+Fatal error: Uncaught Exception: constructor in %s:%d
Stack trace:
#0 [internal function]: VariableStream->__construct()
#1 %s(%d): fopen('var://myvar', 'r+')
diff --git a/ext/standard/tests/general_functions/bug47857.phpt b/ext/standard/tests/general_functions/bug47857.phpt
index 98c1981841..a2b0dac5e4 100644
--- a/ext/standard/tests/general_functions/bug47857.phpt
+++ b/ext/standard/tests/general_functions/bug47857.phpt
@@ -19,7 +19,7 @@ Deprecated: Non-static method foo::bar() should not be called statically in %sbu
ok
bool(false)
-Fatal error: Uncaught exception 'EngineException' with message 'Non-static method BaseException::getMessage() cannot be called statically' in %sbug47857.php:%d
+Fatal error: Uncaught EngineException: 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/standard/tests/serialize/bug69152.phpt b/ext/standard/tests/serialize/bug69152.phpt
index eb3f34e21e..83d7ebfb52 100644
--- a/ext/standard/tests/serialize/bug69152.phpt
+++ b/ext/standard/tests/serialize/bug69152.phpt
@@ -9,7 +9,7 @@ $x->test();
?>
--EXPECTF--
-exception 'Exception' in %s:%d
+Exception in %s:%d
Stack trace:
#0 {main}
diff --git a/ext/tidy/tests/035.phpt b/ext/tidy/tests/035.phpt
index a7183e1921..8292755811 100644
--- a/ext/tidy/tests/035.phpt
+++ b/ext/tidy/tests/035.phpt
@@ -9,7 +9,7 @@ tidyNode::__construct()
new tidyNode;
?>
--EXPECTF--
-Fatal error: Uncaught exception 'EngineException' with message 'Call to private tidyNode::__construct() from invalid context' in %s:%d
+Fatal error: Uncaught EngineException: 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 619b9ec1d9..8748c1ff32 100644
--- a/ext/xmlreader/tests/bug51936.phpt
+++ b/ext/xmlreader/tests/bug51936.phpt
@@ -19,7 +19,7 @@ Done
--EXPECTF--
Test
-Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class XMLReader' in %s:%d
+Fatal error: Uncaught EngineException: Trying to clone an uncloneable object of class XMLReader in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
diff --git a/ext/xsl/tests/bug49634.phpt b/ext/xsl/tests/bug49634.phpt
index b009fd5fb8..61c39b488d 100644
--- a/ext/xsl/tests/bug49634.phpt
+++ b/ext/xsl/tests/bug49634.phpt
@@ -52,52 +52,52 @@ for ($i = 0; $i < 10; $i++)
?>
===DONE===
--EXPECTF--
-exception 'Exception' with message 'Test exception.' in %s:%d
+Exception: Test exception. in %s:%d
Stack trace:
#0 [internal function]: testFunction(Array)
#1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument))
#2 {main}
-exception 'Exception' with message 'Test exception.' in %s:%d
+Exception: Test exception. in %s:%d
Stack trace:
#0 [internal function]: testFunction(Array)
#1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument))
#2 {main}
-exception 'Exception' with message 'Test exception.' in %s:%d
+Exception: Test exception. in %s:%d
Stack trace:
#0 [internal function]: testFunction(Array)
#1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument))
#2 {main}
-exception 'Exception' with message 'Test exception.' in %s:%d
+Exception: Test exception. in %s:%d
Stack trace:
#0 [internal function]: testFunction(Array)
#1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument))
#2 {main}
-exception 'Exception' with message 'Test exception.' in %s:%d
+Exception: Test exception. in %s:%d
Stack trace:
#0 [internal function]: testFunction(Array)
#1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument))
#2 {main}
-exception 'Exception' with message 'Test exception.' in %s:%d
+Exception: Test exception. in %s:%d
Stack trace:
#0 [internal function]: testFunction(Array)
#1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument))
#2 {main}
-exception 'Exception' with message 'Test exception.' in %s:%d
+Exception: Test exception. in %s:%d
Stack trace:
#0 [internal function]: testFunction(Array)
#1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument))
#2 {main}
-exception 'Exception' with message 'Test exception.' in %s:%d
+Exception: Test exception. in %s:%d
Stack trace:
#0 [internal function]: testFunction(Array)
#1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument))
#2 {main}
-exception 'Exception' with message 'Test exception.' in %s:%d
+Exception: Test exception. in %s:%d
Stack trace:
#0 [internal function]: testFunction(Array)
#1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument))
#2 {main}
-exception 'Exception' with message 'Test exception.' in %s:%d
+Exception: Test exception. in %s:%d
Stack trace:
#0 [internal function]: testFunction(Array)
#1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument))