From 64b167d201e567ec213b5aa37c66536621835331 Mon Sep 17 00:00:00 2001 From: Aaron Piotrowski Date: Sat, 16 May 2015 16:49:14 -0500 Subject: Updated tests to reflect exception class changes. --- ext/date/tests/DateTimeZone_construct_error.phpt | 2 +- .../tests/DateTimeZone_construct_variation1.phpt | 2 +- ext/date/tests/DateTime_construct_error.phpt | 2 +- ext/date/tests/DateTime_construct_variation1.phpt | 4 ++-- ext/date/tests/DateTime_construct_variation2.phpt | 2 +- ext/date/tests/timezone_offset_get_error.phpt | 18 ++++++++-------- ext/date/tests/timezone_offset_get_variation1.phpt | 2 +- ext/date/tests/timezone_offset_get_variation2.phpt | 2 +- ext/dom/tests/DOMAttr_construct_error_001.phpt | 2 +- .../tests/DOMCDATASection_construct_error_001.phpt | 2 +- ext/dom/tests/DOMComment_construct_error_001.phpt | 2 +- .../DOMDocumentFragment_construct_error_001.phpt | 2 +- ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt | 2 +- ext/dom/tests/DOMDocument_saveHTML_error2.phpt | 2 +- ext/dom/tests/DOMDocument_validate_error2.phpt | 2 +- ext/dom/tests/dom003.phpt | 6 +++--- ext/dom/tests/dom_set_attr_node.phpt | 6 +++--- ext/dom/tests/regsiter_node_class.phpt | 2 +- ext/fileinfo/tests/bug61173.phpt | 2 +- ext/fileinfo/tests/finfo_open_error.phpt | 2 +- ext/intl/tests/badargs.phpt | 2 +- ext/intl/tests/breakiter___construct.phpt | 2 +- ext/intl/tests/breakiter___construct_error.phpt | 6 +++--- ext/intl/tests/calendar_before_after_error.phpt | 16 +++++++-------- ext/intl/tests/calendar_equals_error.phpt | 10 ++++----- ...r_get_Least_Greatest_Minimum_Maximum_error.phpt | 8 ++++---- ...lendar_get_getActualMaximum_Minumum_error2.phpt | 24 +++++++++++----------- ext/intl/tests/calendar_isEquivalentTo_error.phpt | 12 +++++------ ext/intl/tests/calendar_setTimeZone_error.phpt | 8 ++++---- ext/intl/tests/formatter_fail.phpt | 6 +++--- .../tests/gregoriancalendar___construct_error.phpt | 2 +- ext/intl/tests/msgfmt_fail.phpt | 10 ++++----- ext/intl/tests/msgfmt_fail2.phpt | 10 ++++----- ext/intl/tests/timezone_getCanonicalID_error.phpt | 2 +- ext/intl/tests/timezone_hasSameRules_error.phpt | 4 ++-- ext/mysqli/tests/bug33491.phpt | 2 +- ext/mysqli/tests/bug38003.phpt | 2 +- ext/mysqli/tests/mysqli_driver_unclonable.phpt | 2 +- ext/mysqli/tests/mysqli_fetch_object.phpt | 2 +- .../tests/mysqli_fetch_object_no_constructor.phpt | 2 +- ext/mysqli/tests/mysqli_fetch_object_oo.phpt | 6 +++--- ext/mysqli/tests/mysqli_result_unclonable.phpt | 2 +- ext/mysqli/tests/mysqli_stmt_unclonable.phpt | 2 +- ext/mysqli/tests/mysqli_unclonable.phpt | 2 +- ext/pdo/tests/bug47769.phpt | 2 +- ext/pdo/tests/pdo_025.phpt | 2 +- ext/pdo/tests/pdo_037.phpt | 2 +- ext/pdo_mysql/tests/bug_37445.phpt | 2 +- ext/pdo_mysql/tests/pdo_mysql___construct.phpt | 2 +- .../tests/pdo_mysql___construct_options.phpt | 2 +- .../tests/pdo_mysql_attr_statement_class.phpt | 2 +- .../pdo_mysql_prepare_native_clear_error.phpt | 2 +- .../pdo_mysql_prepare_native_mixed_style.phpt | 2 +- ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt | 2 +- ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt | 2 +- ext/phar/tests/badparameters.phpt | 2 +- ext/phar/tests/bug60261.phpt | 2 +- ext/phar/tests/cache_list/frontcontroller29.phpt | 2 +- ext/phar/tests/frontcontroller29.phpt | 2 +- ext/phar/tests/pharfileinfo_construct.phpt | 2 +- .../tests/ReflectionClass_CannotClone_basic.phpt | 2 +- .../tests/ReflectionClass_getName_error1.phpt | 2 +- .../tests/ReflectionClass_isCloneable_001.phpt | 2 +- .../tests/ReflectionClass_isIterateable_001.phpt | 2 +- .../ReflectionExtension_constructor_error.phpt | 6 +++--- .../tests/ReflectionFunction_construct.001.phpt | 8 ++++---- ext/reflection/tests/ReflectionMethod_006.phpt | 4 ++-- .../tests/ReflectionMethod_constructor_error2.phpt | 6 +++--- .../tests/ReflectionMethod_invokeArgs_error2.phpt | 2 +- .../tests/ReflectionObject_getName_error1.phpt | 2 +- ...ectionParameter_invalidMethodInConstructor.phpt | 2 +- ext/reflection/tests/ReflectionProperty_error.phpt | 6 +++--- ext/reflection/tests/bug64007.phpt | 2 +- ext/session/tests/bug60634_error_1.phpt | 2 +- ext/session/tests/bug60634_error_3.phpt | 2 +- ext/session/tests/bug60634_error_5.phpt | 2 +- ext/simplexml/tests/SimpleXMLElement_xpath.phpt | 2 +- ext/simplexml/tests/bug37565.phpt | 4 ++-- ext/snmp/tests/snmp-object-error.phpt | 6 +++--- ext/spl/tests/CallbackFilterIteratorTest-002.phpt | 8 ++++---- .../SplFixedArray__construct_param_array.phpt | 2 +- .../SplFixedArray__construct_param_string.phpt | 2 +- ...plFixedArray_construct_param_SplFixedArray.phpt | 2 +- .../tests/SplTempFileObject_constructor_error.phpt | 2 +- ext/spl/tests/arrayObject___construct_error1.phpt | 4 ++-- ext/spl/tests/arrayObject___construct_error2.phpt | 2 +- ext/spl/tests/arrayObject_setFlags_basic2.phpt | 2 +- .../tests/arrayObject_setIteratorClass_error1.phpt | 4 ++-- ext/spl/tests/bug48023.phpt | 2 +- ext/spl/tests/bug49972.phpt | 2 +- ext/spl/tests/bug54292.phpt | 2 +- ext/spl/tests/fixedarray_005.phpt | 6 +++--- ext/spl/tests/fixedarray_009.phpt | 2 +- ext/spl/tests/fixedarray_015.phpt | 2 +- ext/spl/tests/iterator_035.phpt | 2 +- ext/spl/tests/iterator_042.phpt | 2 +- ext/spl/tests/iterator_056.phpt | 12 +++++------ ext/spl/tests/recursive_tree_iterator_003.phpt | 2 +- ext/spl/tests/spl_004.phpt | 2 +- .../tests/spl_iterator_iterator_constructor.phpt | 2 +- .../spl_iterator_recursive_getiterator_error.phpt | 2 +- ext/sqlite3/tests/sqlite3_02_open.phpt | 2 +- ext/standard/tests/array/arsort_object1.phpt | 2 +- ext/standard/tests/array/arsort_object2.phpt | 2 +- ext/standard/tests/general_functions/010.phpt | 2 +- ext/standard/tests/general_functions/bug47857.phpt | 2 +- ext/standard/tests/serialize/bug69152.phpt | 5 ----- ext/tidy/tests/035.phpt | 2 +- ext/tokenizer/tests/parse_errors.phpt | 2 +- ext/xmlreader/tests/bug51936.phpt | 2 +- 110 files changed, 195 insertions(+), 200 deletions(-) (limited to 'ext') diff --git a/ext/date/tests/DateTimeZone_construct_error.phpt b/ext/date/tests/DateTimeZone_construct_error.phpt index 6ff900d82f..8c8b14f12c 100644 --- a/ext/date/tests/DateTimeZone_construct_error.phpt +++ b/ext/date/tests/DateTimeZone_construct_error.phpt @@ -17,7 +17,7 @@ $timezone = "GMT"; $extra_arg = 99; try { new DateTimeZone($timezone, $extra_arg); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage(), "\n"; } diff --git a/ext/date/tests/DateTimeZone_construct_variation1.phpt b/ext/date/tests/DateTimeZone_construct_variation1.phpt index 96f5372611..d9625eedc0 100644 --- a/ext/date/tests/DateTimeZone_construct_variation1.phpt +++ b/ext/date/tests/DateTimeZone_construct_variation1.phpt @@ -97,7 +97,7 @@ foreach($inputs as $variation =>$timezone) { echo "\n-- $variation --\n"; try { var_dump( new DateTimezone($timezone) ); - } catch (BaseException $e) { + } catch (Throwable $e) { $msg = $e->getMessage(); echo "FAILED: " . $msg . "\n"; } diff --git a/ext/date/tests/DateTime_construct_error.phpt b/ext/date/tests/DateTime_construct_error.phpt index de42566961..d0a453fd9d 100644 --- a/ext/date/tests/DateTime_construct_error.phpt +++ b/ext/date/tests/DateTime_construct_error.phpt @@ -18,7 +18,7 @@ $timezone = timezone_open("GMT"); $extra_arg = 99; try { var_dump( new DateTime($time, $timezone, $extra_arg) ); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage(), "\n"; } diff --git a/ext/date/tests/DateTime_construct_variation1.phpt b/ext/date/tests/DateTime_construct_variation1.phpt index 6f149ae207..8ff7f7e89c 100644 --- a/ext/date/tests/DateTime_construct_variation1.phpt +++ b/ext/date/tests/DateTime_construct_variation1.phpt @@ -102,14 +102,14 @@ foreach($inputs as $variation =>$time) { try { var_dump( new DateTime($time) ); - } catch (BaseException $e) { + } catch (Throwable $e) { $msg = $e->getMessage(); echo "FAILED: " . $msg . "\n"; } try { var_dump( new DateTime($time, $timezone) ); - } catch (BaseException$e) { + } catch (Throwable $e) { $msg = $e->getMessage(); echo "FAILED: " . $msg . "\n"; } diff --git a/ext/date/tests/DateTime_construct_variation2.phpt b/ext/date/tests/DateTime_construct_variation2.phpt index d134d8f6cf..e75e14d8e3 100644 --- a/ext/date/tests/DateTime_construct_variation2.phpt +++ b/ext/date/tests/DateTime_construct_variation2.phpt @@ -102,7 +102,7 @@ foreach($inputs as $variation =>$timezone) { try { var_dump( new DateTime($time, $timezone) ); - } catch (BaseException $e) { + } catch (Throwable $e) { $msg = $e->getMessage(); echo "FAILED: " . $msg . "\n"; } diff --git a/ext/date/tests/timezone_offset_get_error.phpt b/ext/date/tests/timezone_offset_get_error.phpt index 653625dd34..7ce1ade30a 100644 --- a/ext/date/tests/timezone_offset_get_error.phpt +++ b/ext/date/tests/timezone_offset_get_error.phpt @@ -26,7 +26,7 @@ echo "*** Testing timezone_offset_get() : error conditions ***\n"; echo "\n-- Testing timezone_offset_get() function with zero arguments --\n"; try { var_dump( timezone_offset_get() ); -} catch (EngineException $ex) { +} catch (Error $ex) { var_dump($ex->getMessage()); echo "\n"; } @@ -34,7 +34,7 @@ try { echo "\n-- Testing timezone_offset_get() function with less than expected no. of arguments --\n"; try { var_dump( timezone_offset_get($tz) ); -} catch (EngineException $ex) { +} catch (Error $ex) { var_dump($ex->getMessage()); echo "\n"; } @@ -43,7 +43,7 @@ echo "\n-- Testing timezone_offset_get() function with more than expected no. of $extra_arg = 99; try { var_dump( timezone_offset_get($tz, $date, $extra_arg) ); -} catch (EngineException $ex) { +} catch (Error $ex) { var_dump($ex->getMessage()); echo "\n"; } @@ -52,21 +52,21 @@ echo "\n-- Testing timezone_offset_get() function with an invalid values for \$o $invalid_obj = new stdClass(); try { var_dump( timezone_offset_get($invalid_obj, $date) ); -} catch (EngineException $ex) { +} catch (Error $ex) { var_dump($ex->getMessage()); echo "\n"; } $invalid_obj = 10; try { var_dump( timezone_offset_get($invalid_obj, $date) ); -} catch (EngineException $ex) { +} catch (Error $ex) { var_dump($ex->getMessage()); echo "\n"; } $invalid_obj = null; try { var_dump( timezone_offset_get($invalid_obj, $date) ); -} catch (EngineException $ex) { +} catch (Error $ex) { var_dump($ex->getMessage()); echo "\n"; } @@ -75,21 +75,21 @@ echo "\n-- Testing timezone_offset_get() function with an invalid values for \$d $invalid_obj = new stdClass(); try { var_dump( timezone_offset_get($tz, $invalid_obj) ); -} catch (EngineException $ex) { +} catch (Error $ex) { var_dump($ex->getMessage()); echo "\n"; } $invalid_obj = 10; try { var_dump( timezone_offset_get($tz, $invalid_obj) ); -} catch (EngineException $ex) { +} catch (Error $ex) { var_dump($ex->getMessage()); echo "\n"; } $invalid_obj = null; try { var_dump( timezone_offset_get($tz, $invalid_obj) ); -} catch (EngineException $ex) { +} catch (Error $ex) { var_dump($ex->getMessage()); echo "\n"; } diff --git a/ext/date/tests/timezone_offset_get_variation1.phpt b/ext/date/tests/timezone_offset_get_variation1.phpt index d2cfeedaaf..edeeb7fea7 100644 --- a/ext/date/tests/timezone_offset_get_variation1.phpt +++ b/ext/date/tests/timezone_offset_get_variation1.phpt @@ -109,7 +109,7 @@ foreach($inputs as $variation =>$object) { echo "\n-- $variation --\n"; try { var_dump( timezone_offset_get($object, $datetime) ); - } catch (EngineException $ex) { + } catch (Error $ex) { echo $ex->getMessage()."\n"; } }; diff --git a/ext/date/tests/timezone_offset_get_variation2.phpt b/ext/date/tests/timezone_offset_get_variation2.phpt index 8191e18ee7..2d007d5e70 100644 --- a/ext/date/tests/timezone_offset_get_variation2.phpt +++ b/ext/date/tests/timezone_offset_get_variation2.phpt @@ -109,7 +109,7 @@ foreach($inputs as $variation =>$datetime) { echo "\n-- $variation --\n"; try { var_dump( timezone_offset_get($object, $datetime) ); - } catch (EngineException $ex) { + } catch (Error $ex) { echo $ex->getMessage()."\n"; } }; diff --git a/ext/dom/tests/DOMAttr_construct_error_001.phpt b/ext/dom/tests/DOMAttr_construct_error_001.phpt index 53780c3321..64e6835f96 100644 --- a/ext/dom/tests/DOMAttr_construct_error_001.phpt +++ b/ext/dom/tests/DOMAttr_construct_error_001.phpt @@ -9,7 +9,7 @@ Josh Sweeney getMessage(), "\n"; } ?> diff --git a/ext/dom/tests/DOMCDATASection_construct_error_001.phpt b/ext/dom/tests/DOMCDATASection_construct_error_001.phpt index 2be1e5204f..fbce3c7527 100644 --- a/ext/dom/tests/DOMCDATASection_construct_error_001.phpt +++ b/ext/dom/tests/DOMCDATASection_construct_error_001.phpt @@ -9,7 +9,7 @@ Nic Rosental nicrosental@gmail.com getMessage(); } ?> diff --git a/ext/dom/tests/DOMComment_construct_error_001.phpt b/ext/dom/tests/DOMComment_construct_error_001.phpt index e2f0b19a72..27424c35e4 100644 --- a/ext/dom/tests/DOMComment_construct_error_001.phpt +++ b/ext/dom/tests/DOMComment_construct_error_001.phpt @@ -9,7 +9,7 @@ Eric Lee Stewart getMessage(), "\n"; } ?> diff --git a/ext/dom/tests/DOMDocumentFragment_construct_error_001.phpt b/ext/dom/tests/DOMDocumentFragment_construct_error_001.phpt index d9376a3251..c84689ad8e 100644 --- a/ext/dom/tests/DOMDocumentFragment_construct_error_001.phpt +++ b/ext/dom/tests/DOMDocumentFragment_construct_error_001.phpt @@ -9,7 +9,7 @@ Eric Lee Stewart getMessage(), "\n"; } ?> diff --git a/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt b/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt index 2ef17926aa..5feac218cf 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 exception 'Error' 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 1f7c95c6ae..c7d2c6dda4 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 exception 'Error' 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 0ef15691de..24f39e3fb4 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 exception 'Error' 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/dom003.phpt b/ext/dom/tests/dom003.phpt index 37db1f7677..060a2c184e 100644 --- a/ext/dom/tests/dom003.phpt +++ b/ext/dom/tests/dom003.phpt @@ -28,13 +28,13 @@ $rootNode->appendChild($rootNode); object(DOMException)#%d (%d) { ["message":protected]=> string(23) "Hierarchy Request Error" - ["string":"BaseException":private]=> + ["string":"Exception":private]=> string(0) "" ["file":protected]=> string(%d) "%sdom003.php" ["line":protected]=> int(8) - ["trace":"BaseException":private]=> + ["trace":"Exception":private]=> array(1) { [0]=> array(6) { @@ -55,7 +55,7 @@ object(DOMException)#%d (%d) { } } } - ["previous":"BaseException":private]=> + ["previous":"Exception":private]=> NULL ["code"]=> int(3) diff --git a/ext/dom/tests/dom_set_attr_node.phpt b/ext/dom/tests/dom_set_attr_node.phpt index 1c4960615c..1916cd524a 100644 --- a/ext/dom/tests/dom_set_attr_node.phpt +++ b/ext/dom/tests/dom_set_attr_node.phpt @@ -40,13 +40,13 @@ ob_start(); object(DOMException)#%d (7) { ["message":protected]=> string(20) "Wrong Document Error" - ["string":"BaseException":private]=> + ["string":"Exception":private]=> string(0) "" ["file":protected]=> string(%d) "%sdom_set_attr_node.php" ["line":protected]=> int(%d) - ["trace":"BaseException":private]=> + ["trace":"Exception":private]=> array(1) { [0]=> array(6) { @@ -67,7 +67,7 @@ object(DOMException)#%d (7) { } } } - ["previous":"BaseException":private]=> + ["previous":"Exception":private]=> NULL ["code"]=> int(4) diff --git a/ext/dom/tests/regsiter_node_class.phpt b/ext/dom/tests/regsiter_node_class.phpt index 7fff3bfacf..91a5475ca2 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 exception 'Error' 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/fileinfo/tests/bug61173.phpt b/ext/fileinfo/tests/bug61173.phpt index 4b622c65ae..96eb3010e0 100644 --- a/ext/fileinfo/tests/bug61173.phpt +++ b/ext/fileinfo/tests/bug61173.phpt @@ -10,7 +10,7 @@ if (!class_exists('finfo')) try { $finfo = new finfo(1, '', false); var_dump($finfo); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage(), "\n"; } --EXPECTF-- diff --git a/ext/fileinfo/tests/finfo_open_error.phpt b/ext/fileinfo/tests/finfo_open_error.phpt index 1f6f935247..511df600c1 100644 --- a/ext/fileinfo/tests/finfo_open_error.phpt +++ b/ext/fileinfo/tests/finfo_open_error.phpt @@ -22,7 +22,7 @@ var_dump( finfo_open( 'foobar' ) ); try { var_dump( new finfo('foobar') ); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage(), "\n"; } diff --git a/ext/intl/tests/badargs.phpt b/ext/intl/tests/badargs.phpt index 300ac2653e..d6ce48317b 100644 --- a/ext/intl/tests/badargs.phpt +++ b/ext/intl/tests/badargs.phpt @@ -18,7 +18,7 @@ foreach($funcs as $func) { $res = $func($arg); } catch (Exception $e) { continue; - } catch (EngineException $e) { + } catch (Error $e) { continue; } if($res != false) { diff --git a/ext/intl/tests/breakiter___construct.phpt b/ext/intl/tests/breakiter___construct.phpt index a1e59ddf5d..6569c25a6f 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 exception 'Error' 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/breakiter___construct_error.phpt b/ext/intl/tests/breakiter___construct_error.phpt index 7e67fd7403..1e865cc9d9 100644 --- a/ext/intl/tests/breakiter___construct_error.phpt +++ b/ext/intl/tests/breakiter___construct_error.phpt @@ -19,17 +19,17 @@ try { } try { var_dump(new IntlRuleBasedBreakIterator()); -} catch (TypeException $e) { +} catch (TypeError $e) { print_exception($e); } try { var_dump(new IntlRuleBasedBreakIterator(1,2,3)); -} catch (TypeException $e) { +} catch (TypeError $e) { print_exception($e); } try { var_dump(new IntlRuleBasedBreakIterator('[\p{Letter}\uFFFD]+;[:number:]+;', array())); -} catch (TypeException $e) { +} catch (TypeError $e) { print_exception($e); } try { diff --git a/ext/intl/tests/calendar_before_after_error.phpt b/ext/intl/tests/calendar_before_after_error.phpt index b5f3c746c1..938c7a5fb7 100644 --- a/ext/intl/tests/calendar_before_after_error.phpt +++ b/ext/intl/tests/calendar_before_after_error.phpt @@ -19,45 +19,45 @@ set_error_handler('eh'); try { var_dump($c->after()); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump($c->before()); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump($c->after(1)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump($c->before(1)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try{ var_dump($c->after($c, 1)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump($c->before($c, 1)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_after($c)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_before($c)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } --EXPECT-- diff --git a/ext/intl/tests/calendar_equals_error.phpt b/ext/intl/tests/calendar_equals_error.phpt index 0293bd7bcb..8465541c87 100644 --- a/ext/intl/tests/calendar_equals_error.phpt +++ b/ext/intl/tests/calendar_equals_error.phpt @@ -19,29 +19,29 @@ set_error_handler('eh'); try { var_dump($c->equals()); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump($c->equals(new stdclass)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump($c->equals(1, 2)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_equals($c, array())); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_equals(1, $c)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } diff --git a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt index 0764fe267d..3d881a781d 100644 --- a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt +++ b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt @@ -34,22 +34,22 @@ set_error_handler('eh'); try { var_dump(intlcal_get_least_maximum(1, 1)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_get_maximum(1, 1)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_get_greatest_minimum(1, -1)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_get_minimum(1, -1)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } diff --git a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt index e117f03a57..b29e8ed0cb 100644 --- a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt +++ b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt @@ -19,65 +19,65 @@ set_error_handler('eh'); try { var_dump(intlcal_get($c)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_get_actual_maximum($c)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_get_actual_minimum($c)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_get($c, -1)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_get_actual_maximum($c, -1)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_get_actual_minimum($c, -1)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_get($c, "s")); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_get_actual_maximum($c, "s")); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_get_actual_minimum($c, "s")); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_get(1)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_get_actual_maximum(1)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_get_actual_minimum(1)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } --EXPECT-- diff --git a/ext/intl/tests/calendar_isEquivalentTo_error.phpt b/ext/intl/tests/calendar_isEquivalentTo_error.phpt index 740b07b1fe..ac19e1dd90 100644 --- a/ext/intl/tests/calendar_isEquivalentTo_error.phpt +++ b/ext/intl/tests/calendar_isEquivalentTo_error.phpt @@ -19,33 +19,33 @@ set_error_handler('eh'); try { var_dump($c->isEquivalentTo(0)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump($c->isEquivalentTo($c, 1)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump($c->isEquivalentTo(1)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_is_equivalent_to($c)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_is_equivalent_to($c, 1)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump(intlcal_is_equivalent_to(1, $c)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } diff --git a/ext/intl/tests/calendar_setTimeZone_error.phpt b/ext/intl/tests/calendar_setTimeZone_error.phpt index 6230efad8a..410dc86c60 100644 --- a/ext/intl/tests/calendar_setTimeZone_error.phpt +++ b/ext/intl/tests/calendar_setTimeZone_error.phpt @@ -21,23 +21,23 @@ set_error_handler('eh'); try { var_dump($c->setTimeZone($gmt, 2)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try { var_dump($c->setTimeZone()); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try{ var_dump(intlcal_set_time_zone($c, 1, 2)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } try{ var_dump(intlcal_set_time_zone(1, $gmt)); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n"; } diff --git a/ext/intl/tests/formatter_fail.phpt b/ext/intl/tests/formatter_fail.phpt index f7761173dd..2e3360f3c7 100644 --- a/ext/intl/tests/formatter_fail.phpt +++ b/ext/intl/tests/formatter_fail.phpt @@ -45,7 +45,7 @@ $args = array( try { $fmt = new NumberFormatter(); -} catch (TypeException $e) { +} catch (TypeError $e) { print_exception($e); $fmt = null; } @@ -66,7 +66,7 @@ foreach($args as $arg) { ?> --EXPECTF-- -TypeException: NumberFormatter::__construct() expects at least 2 parameters, 0 given in %s on line %d +TypeError: NumberFormatter::__construct() expects at least 2 parameters, 0 given in %s on line %d 'numfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' Warning: numfmt_create() expects at least 2 parameters, 0 given in %s on line %d @@ -80,7 +80,7 @@ IntlException: Constructor failed in %sformatter_fail.php on line %d 'numfmt_create: number formatter creation failed: U_UNSUPPORTED_ERROR' 'numfmt_create: number formatter creation failed: U_UNSUPPORTED_ERROR' -TypeException: NumberFormatter::__construct() expects parameter 1 to be string, array given in %s on line %d +TypeError: NumberFormatter::__construct() expects parameter 1 to be string, array given in %s on line %d 'numfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' Warning: NumberFormatter::create() expects parameter 1 to be string, array given in %s on line %d diff --git a/ext/intl/tests/gregoriancalendar___construct_error.phpt b/ext/intl/tests/gregoriancalendar___construct_error.phpt index 7383bdee88..ccc87d9703 100644 --- a/ext/intl/tests/gregoriancalendar___construct_error.phpt +++ b/ext/intl/tests/gregoriancalendar___construct_error.phpt @@ -22,7 +22,7 @@ try { } try { var_dump(new IntlGregorianCalendar(1,2,3,4,NULL,array())); -} catch (TypeException $e) { +} catch (TypeError $e) { print_exception($e); } --EXPECTF-- diff --git a/ext/intl/tests/msgfmt_fail.phpt b/ext/intl/tests/msgfmt_fail.phpt index d7ca83d442..8ee72d1ef5 100644 --- a/ext/intl/tests/msgfmt_fail.phpt +++ b/ext/intl/tests/msgfmt_fail.phpt @@ -47,7 +47,7 @@ $args = array( try { $fmt = new MessageFormatter(); -} catch (TypeException $e) { +} catch (TypeError $e) { print_exception($e); $fmt = null; } @@ -58,7 +58,7 @@ $fmt = MessageFormatter::create(); err($fmt); try { $fmt = new MessageFormatter('en'); -} catch (TypeException $e) { +} catch (TypeError $e) { print_exception($e); $fmt = null; } @@ -79,7 +79,7 @@ foreach($args as $arg) { ?> --EXPECTF-- -TypeException: MessageFormatter::__construct() expects exactly 2 parameters, 0 given in %s on line %d +TypeError: MessageFormatter::__construct() expects exactly 2 parameters, 0 given in %s on line %d 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' Warning: msgfmt_create() expects exactly 2 parameters, 0 given in %s on line %d @@ -88,7 +88,7 @@ Warning: msgfmt_create() expects exactly 2 parameters, 0 given in %s on line %d Warning: MessageFormatter::create() expects exactly 2 parameters, 0 given in %s on line %d 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -TypeException: MessageFormatter::__construct() expects exactly 2 parameters, 1 given in %s on line %d +TypeError: MessageFormatter::__construct() expects exactly 2 parameters, 1 given in %s on line %d 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' Warning: msgfmt_create() expects exactly 2 parameters, 1 given in %s on line %d @@ -107,7 +107,7 @@ IntlException: Constructor failed in %smsgfmt_fail2.php on line %d 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR' 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR' -TypeException: MessageFormatter::__construct() expects parameter 1 to be string, array given in %s on line %d +TypeError: MessageFormatter::__construct() expects parameter 1 to be string, array given in %s on line %d 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' Warning: MessageFormatter::create() expects parameter 1 to be string, array given in %s on line %d diff --git a/ext/intl/tests/msgfmt_fail2.phpt b/ext/intl/tests/msgfmt_fail2.phpt index 6e34bfde68..87c1edec75 100644 --- a/ext/intl/tests/msgfmt_fail2.phpt +++ b/ext/intl/tests/msgfmt_fail2.phpt @@ -47,7 +47,7 @@ $args = array( try { $fmt = new MessageFormatter(); -} catch (TypeException $e) { +} catch (TypeError $e) { print_exception($e); $fmt = null; } @@ -58,7 +58,7 @@ $fmt = MessageFormatter::create(); err($fmt); try { $fmt = new MessageFormatter('en'); -} catch (TypeException $e) { +} catch (TypeError $e) { print_exception($e); $fmt = null; } @@ -79,7 +79,7 @@ foreach($args as $arg) { ?> --EXPECTF-- -TypeException: MessageFormatter::__construct() expects exactly 2 parameters, 0 given in %s on line %d +TypeError: MessageFormatter::__construct() expects exactly 2 parameters, 0 given in %s on line %d 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' Warning: msgfmt_create() expects exactly 2 parameters, 0 given in %s on line %d @@ -88,7 +88,7 @@ Warning: msgfmt_create() expects exactly 2 parameters, 0 given in %s on line %d Warning: MessageFormatter::create() expects exactly 2 parameters, 0 given in %s on line %d 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -TypeException: MessageFormatter::__construct() expects exactly 2 parameters, 1 given in %s on line %d +TypeError: MessageFormatter::__construct() expects exactly 2 parameters, 1 given in %s on line %d 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' Warning: msgfmt_create() expects exactly 2 parameters, 1 given in %s on line %d @@ -107,7 +107,7 @@ IntlException: Constructor failed in %smsgfmt_fail2.php on line %d 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR' 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR' -TypeException: MessageFormatter::__construct() expects parameter 1 to be string, array given in %s on line %d +TypeError: MessageFormatter::__construct() expects parameter 1 to be string, array given in %s on line %d 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' Warning: MessageFormatter::create() expects parameter 1 to be string, array given in %s on line %d diff --git a/ext/intl/tests/timezone_getCanonicalID_error.phpt b/ext/intl/tests/timezone_getCanonicalID_error.phpt index 7fe2f61d51..07d3af1865 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 exception 'Error' 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/intl/tests/timezone_hasSameRules_error.phpt b/ext/intl/tests/timezone_hasSameRules_error.phpt index d3c25661e3..5fb5bdde7a 100644 --- a/ext/intl/tests/timezone_hasSameRules_error.phpt +++ b/ext/intl/tests/timezone_hasSameRules_error.phpt @@ -18,14 +18,14 @@ set_error_handler("error_handler"); $tz = IntlTimeZone::createTimeZone('Europe/Lisbon'); try { var_dump($tz->hasSameRules('foo')); -} catch (EngineException $ex) { +} catch (Error $ex) { var_dump($ex->getCode(), $ex->getMessage()); echo "\n"; } try { var_dump(intltz_has_same_rules(null, $tz)); -} catch (EngineException $ex) { +} catch (Error $ex) { var_dump($ex->getCode(), $ex->getMessage()); echo "\n"; } diff --git a/ext/mysqli/tests/bug33491.phpt b/ext/mysqli/tests/bug33491.phpt index dbb3b7218c..b282d567ec 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 exception 'Error' 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} diff --git a/ext/mysqli/tests/bug38003.phpt b/ext/mysqli/tests/bug38003.phpt index f1efa56b30..cde888920e 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 exception 'Error' 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 fe3a91af63..f9ce927abb 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 exception 'Error' 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.phpt b/ext/mysqli/tests/mysqli_fetch_object.phpt index 25457346d7..11dd0a5a4f 100644 --- a/ext/mysqli/tests/mysqli_fetch_object.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object.phpt @@ -101,7 +101,7 @@ require_once('skipifconnectfailure.inc'); try { if (false !== ($obj = @mysqli_fetch_object($res, 'mysqli_fetch_object_construct', 'a'))) printf("[011] Should have failed\n"); - } catch (EngineException $e) { + } catch (Error $e) { handle_catchable_fatal($e->getCode(), $e->getMessage(), $e->getFile(), $e->getLine()); } diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt index d0786f9e1a..1f6e9098fc 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 exception 'Error' 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_fetch_object_oo.phpt b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt index b5ebd110a4..2b3f76c993 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt @@ -34,7 +34,7 @@ require_once('skipifconnectfailure.inc'); try { if (!is_null($tmp = @$res->fetch_object($link, $link))) printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - } catch (EngineException $e) { + } catch (Error $e) { handle_catchable_fatal($e->getCode(), $e->getMessage(), $e->getFile(), $e->getLine()); } @@ -42,7 +42,7 @@ require_once('skipifconnectfailure.inc'); try { if (!is_null($tmp = @$res->fetch_object($link, $link, $link))) printf("[006] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - } catch (EngineException $e) { + } catch (Error $e) { handle_catchable_fatal($e->getCode(), $e->getMessage(), $e->getFile(), $e->getLine()); } @@ -84,7 +84,7 @@ require_once('skipifconnectfailure.inc'); printf("[009] Object seems wrong. [%d] %s\n", $mysqli->errno, $mysqli->error); var_dump($obj); } - } catch (EngineException $e) { + } catch (Error $e) { handle_catchable_fatal($e->getCode(), $e->getMessage(), $e->getFile(), $e->getLine()); mysqli_fetch_object($res); } diff --git a/ext/mysqli/tests/mysqli_result_unclonable.phpt b/ext/mysqli/tests/mysqli_result_unclonable.phpt index 0b400396c7..408dffa64d 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 exception 'Error' 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 efec3dbc08..1c6f961e98 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 exception 'Error' 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 7b54fe5e81..bf515bc0a0 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 exception 'Error' 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 f6f2749cc0..7e0ef83b95 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 exception 'Error' 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 4170cec88c..a34197d3ca 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 exception 'Error' 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 2880a1b38a..98effc7d2c 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 exception 'Error' 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 20a73ce703..f2bd290abc 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 exception 'Error' 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___construct.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct.phpt index f0048ff305..219678c671 100644 --- a/ext/pdo_mysql/tests/pdo_mysql___construct.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql___construct.phpt @@ -31,7 +31,7 @@ MySQLPDOTest::skip(); try { if (NULL !== ($db = @new PDO())) printf("[001] Too few parameters\n"); - } catch (TypeException $ex) { + } catch (TypeError $ex) { } print tryandcatch(2, '$db = new PDO(chr(0));'); diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt index 9a64f59fe2..62051d7ae2 100644 --- a/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt @@ -70,7 +70,7 @@ MySQLPDOTest::skip(); try { if (NULL !== ($db = @new PDO($dsn, $user, $pass, 'wrong type'))) printf("[001] Expecting NULL got %s/%s\n", gettype($db), $db); - } catch (TypeException $e) { + } catch (TypeError $e) { } if (!is_object($db = new PDO($dsn, $user, $pass, array()))) 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..03a3e63d42 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 exception 'Error' with message '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..a95a13ad14 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 exception 'Error' 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 d0201a1a76..5f1a6c1010 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 exception 'Error' 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 61a9702d52..0f774d97d1 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 exception 'Error' 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 0c2e75d2be..4bb83fddab 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 exception 'Error' 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} diff --git a/ext/phar/tests/badparameters.phpt b/ext/phar/tests/badparameters.phpt index 97faab427c..a1a9fb78a0 100644 --- a/ext/phar/tests/badparameters.phpt +++ b/ext/phar/tests/badparameters.phpt @@ -18,7 +18,7 @@ Phar::loadPhar(array()); Phar::canCompress('hi'); try { $a = new Phar(array()); -} catch (TypeException $e) { +} catch (TypeError $e) { print_exception($e); } try { diff --git a/ext/phar/tests/bug60261.phpt b/ext/phar/tests/bug60261.phpt index 2dd03b9517..84d4203e10 100644 --- a/ext/phar/tests/bug60261.phpt +++ b/ext/phar/tests/bug60261.phpt @@ -8,7 +8,7 @@ Bug #60261 (phar dos null pointer) try { $nx = new Phar(); $nx->getLinkTarget(); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage(), "\n"; } diff --git a/ext/phar/tests/cache_list/frontcontroller29.phpt b/ext/phar/tests/cache_list/frontcontroller29.phpt index 4cfcd6489f..bd2b33c913 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 exception 'Error' 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) diff --git a/ext/phar/tests/frontcontroller29.phpt b/ext/phar/tests/frontcontroller29.phpt index b5f572d49c..5978c2c06f 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 exception 'Error' 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) diff --git a/ext/phar/tests/pharfileinfo_construct.phpt b/ext/phar/tests/pharfileinfo_construct.phpt index abd0fac2e6..1f4f6177b0 100644 --- a/ext/phar/tests/pharfileinfo_construct.phpt +++ b/ext/phar/tests/pharfileinfo_construct.phpt @@ -19,7 +19,7 @@ unlink($fname); try { $a = new PharFileInfo(array()); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt b/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt index a2eedf7c54..a19a292e1e 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 exception 'Error' 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 4bffdf8473..4a46d6970e 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 exception 'Error' 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 c47859e428..3d0fcf90d8 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 exception 'Error' 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 d83f9acce0..0bf37b0e46 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 exception 'Error' 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/ReflectionExtension_constructor_error.phpt b/ext/reflection/tests/ReflectionExtension_constructor_error.phpt index 235c2ad768..94071de5ab 100644 --- a/ext/reflection/tests/ReflectionExtension_constructor_error.phpt +++ b/ext/reflection/tests/ReflectionExtension_constructor_error.phpt @@ -7,19 +7,19 @@ Leon Luijkx getMessage().PHP_EOL; } try { $obj = new ReflectionExtension('foo', 'bar'); -} catch (TypeException $re) { +} catch (TypeError $re) { echo "Ok - ".$re->getMessage().PHP_EOL; } try { $obj = new ReflectionExtension([]); -} catch (TypeException $re) { +} catch (TypeError $re) { echo "Ok - ".$re->getMessage().PHP_EOL; } diff --git a/ext/reflection/tests/ReflectionFunction_construct.001.phpt b/ext/reflection/tests/ReflectionFunction_construct.001.phpt index 52db7c654d..0e2e8a3681 100644 --- a/ext/reflection/tests/ReflectionFunction_construct.001.phpt +++ b/ext/reflection/tests/ReflectionFunction_construct.001.phpt @@ -9,7 +9,7 @@ Steve Seear try { $a = new ReflectionFunction(array(1, 2, 3)); echo "exception not thrown.".PHP_EOL; -} catch (TypeException $re) { +} catch (TypeError $re) { echo "Ok - ".$re->getMessage().PHP_EOL; } try { @@ -19,17 +19,17 @@ try { } try { $a = new ReflectionFunction(); -} catch (TypeException $re) { +} catch (TypeError $re) { echo "Ok - ".$re->getMessage().PHP_EOL; } try { $a = new ReflectionFunction(1, 2); -} catch (TypeException $re) { +} catch (TypeError $re) { echo "Ok - ".$re->getMessage().PHP_EOL; } try { $a = new ReflectionFunction([]); -} catch (TypeException $re) { +} catch (TypeError $re) { echo "Ok - ".$re->getMessage().PHP_EOL; } diff --git a/ext/reflection/tests/ReflectionMethod_006.phpt b/ext/reflection/tests/ReflectionMethod_006.phpt index b22a2acc6d..627dc96f32 100644 --- a/ext/reflection/tests/ReflectionMethod_006.phpt +++ b/ext/reflection/tests/ReflectionMethod_006.phpt @@ -8,12 +8,12 @@ Steve Seear try { new ReflectionMethod(); -} catch (TypeException $re) { +} catch (TypeError $re) { echo "Ok - ".$re->getMessage().PHP_EOL; } try { new ReflectionMethod('a', 'b', 'c'); -} catch (TypeException $re) { +} catch (TypeError $re) { echo "Ok - ".$re->getMessage().PHP_EOL; } diff --git a/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt b/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt index 3c521efc64..98125cba65 100644 --- a/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt +++ b/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt @@ -16,13 +16,13 @@ class TestClass try { echo "Too few arguments:\n"; $methodInfo = new ReflectionMethod(); -} catch (TypeException $re) { +} catch (TypeError $re) { echo "Ok - ".$re->getMessage().PHP_EOL; } try { echo "\nToo many arguments:\n"; $methodInfo = new ReflectionMethod("TestClass", "foo", true); -} catch (TypeException $re) { +} catch (TypeError $re) { echo "Ok - ".$re->getMessage().PHP_EOL; } @@ -45,7 +45,7 @@ try { try{ //invalid 2nd param $methodInfo = new ReflectionMethod("TestClass", []); -} catch (TypeException $re) { +} catch (TypeError $re) { echo "Ok - ".$re->getMessage().PHP_EOL; } diff --git a/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt b/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt index 0405df67e1..8bedbea0cb 100644 --- a/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt +++ b/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt @@ -18,7 +18,7 @@ $testClassInstance = new TestClass(); try { var_dump($foo->invokeArgs($testClassInstance, true)); -} catch (EngineException $e) { +} catch (Error $e) { var_dump($e->getMessage()); } diff --git a/ext/reflection/tests/ReflectionObject_getName_error1.phpt b/ext/reflection/tests/ReflectionObject_getName_error1.phpt index c846e27422..a8b30ba5d7 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 exception 'Error' 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/ReflectionParameter_invalidMethodInConstructor.phpt b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt index a884162fd2..6c154558e9 100644 --- a/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt +++ b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt @@ -25,7 +25,7 @@ class C { try { new ReflectionParameter(array ('A', 'b')); } -catch(TypeException $e) { +catch(TypeError $e) { printf( "Ok - %s\n", $e->getMessage()); } diff --git a/ext/reflection/tests/ReflectionProperty_error.phpt b/ext/reflection/tests/ReflectionProperty_error.phpt index ef051b5380..c8a2f11ee1 100644 --- a/ext/reflection/tests/ReflectionProperty_error.phpt +++ b/ext/reflection/tests/ReflectionProperty_error.phpt @@ -9,18 +9,18 @@ class C { try { new ReflectionProperty(); -} catch (TypeException $re) { +} catch (TypeError $re) { echo "Ok - ".$re->getMessage().PHP_EOL; } try { new ReflectionProperty('C::p'); -} catch (TypeException $re) { +} catch (TypeError $re) { echo "Ok - ".$re->getMessage().PHP_EOL; } try { new ReflectionProperty('C', 'p', 'x'); -} catch (TypeException $re) { +} catch (TypeError $re) { echo "Ok - ".$re->getMessage().PHP_EOL; } diff --git a/ext/reflection/tests/bug64007.phpt b/ext/reflection/tests/bug64007.phpt index 8ee07bf555..cf8ec1dfcc 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 exception 'Error' 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} diff --git a/ext/session/tests/bug60634_error_1.phpt b/ext/session/tests/bug60634_error_1.phpt index 80d7c13bb0..ec7f190b41 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 exception 'Error' with message '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_3.phpt b/ext/session/tests/bug60634_error_3.phpt index a930982743..9a32de7a19 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 exception 'Error' with message '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_5.phpt b/ext/session/tests/bug60634_error_5.phpt index da8de1117e..995917d0b4 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 exception 'Error' with message '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/simplexml/tests/SimpleXMLElement_xpath.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt index 77402270d2..d32be19208 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 exception 'Error' 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/simplexml/tests/bug37565.phpt b/ext/simplexml/tests/bug37565.phpt index cf5a3d8849..7d9675e3fd 100644 --- a/ext/simplexml/tests/bug37565.phpt +++ b/ext/simplexml/tests/bug37565.phpt @@ -17,13 +17,13 @@ class Setting extends ReflectionObject try { Reflection::export(simplexml_load_string('', 'Setting')); -} catch (EngineException $e) { +} catch (Error $e) { my_error_handler($e->getCode(), $e->getMessage(), $e->getFile(), $e->getLine()); } try { Reflection::export(simplexml_load_file('data:,', 'Setting')); -} catch (EngineException $e) { +} catch (Error $e) { my_error_handler($e->getCode(), $e->getMessage(), $e->getFile(), $e->getLine()); } diff --git a/ext/snmp/tests/snmp-object-error.phpt b/ext/snmp/tests/snmp-object-error.phpt index e2574872f4..2b81629d7e 100644 --- a/ext/snmp/tests/snmp-object-error.phpt +++ b/ext/snmp/tests/snmp-object-error.phpt @@ -16,17 +16,17 @@ snmp_set_valueretrieval(SNMP_VALUE_PLAIN); try { var_dump(new SNMP(SNMP::VERSION_1, $hostname)); -} catch (TypeException $e) { +} catch (TypeError $e) { print $e->getMessage() . "\n"; } try { var_dump(new SNMP(SNMP::VERSION_1, $hostname, $community, '')); -} catch (TypeException $e) { +} catch (TypeError $e) { print $e->getMessage() . "\n"; } try { var_dump(new SNMP(SNMP::VERSION_1, $hostname, $community, $timeout, '')); -} catch (TypeException $e) { +} catch (TypeError $e) { print $e->getMessage() . "\n"; } try { diff --git a/ext/spl/tests/CallbackFilterIteratorTest-002.phpt b/ext/spl/tests/CallbackFilterIteratorTest-002.phpt index 1f71d3032a..216a40bd6a 100644 --- a/ext/spl/tests/CallbackFilterIteratorTest-002.phpt +++ b/ext/spl/tests/CallbackFilterIteratorTest-002.phpt @@ -10,25 +10,25 @@ set_error_handler(function($errno, $errstr){ try { new CallbackFilterIterator(); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage() . "\n"; } try { new CallbackFilterIterator(null); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage() . "\n"; } try { new CallbackFilterIterator(new ArrayIterator(array()), null); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage() . "\n"; } try { new CallbackFilterIterator(new ArrayIterator(array()), array()); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage() . "\n"; } diff --git a/ext/spl/tests/SplFixedArray__construct_param_array.phpt b/ext/spl/tests/SplFixedArray__construct_param_array.phpt index e1515c4039..b15579edca 100644 --- a/ext/spl/tests/SplFixedArray__construct_param_array.phpt +++ b/ext/spl/tests/SplFixedArray__construct_param_array.phpt @@ -7,7 +7,7 @@ PHPNW Test Fest 2009 - Jordan Hatch try { $array = new SplFixedArray( array("string", 1) ); -} catch (TypeException $iae) { +} catch (TypeError $iae) { echo "Ok - ".$iae->getMessage().PHP_EOL; } diff --git a/ext/spl/tests/SplFixedArray__construct_param_string.phpt b/ext/spl/tests/SplFixedArray__construct_param_string.phpt index 66c7fe6a59..d30fc691c6 100644 --- a/ext/spl/tests/SplFixedArray__construct_param_string.phpt +++ b/ext/spl/tests/SplFixedArray__construct_param_string.phpt @@ -6,7 +6,7 @@ PHPNW Test Fest 2009 - Jordan Hatch getMessage().PHP_EOL; } diff --git a/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt index 20f4e7970c..4739d8c55d 100644 --- a/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt +++ b/ext/spl/tests/SplFixedArray_construct_param_SplFixedArray.phpt @@ -6,7 +6,7 @@ Philip Norton philipnorton42@gmail.com getMessage().PHP_EOL; } diff --git a/ext/spl/tests/SplTempFileObject_constructor_error.phpt b/ext/spl/tests/SplTempFileObject_constructor_error.phpt index 8eb306689d..fe47366987 100644 --- a/ext/spl/tests/SplTempFileObject_constructor_error.phpt +++ b/ext/spl/tests/SplTempFileObject_constructor_error.phpt @@ -4,7 +4,7 @@ SPL SplTempFileObject constructor sets correct defaults when pass 0 arguments getMessage(), "\n"; } ?> diff --git a/ext/spl/tests/arrayObject___construct_error1.phpt b/ext/spl/tests/arrayObject___construct_error1.phpt index cff0dd048d..f0e1107d51 100644 --- a/ext/spl/tests/arrayObject___construct_error1.phpt +++ b/ext/spl/tests/arrayObject___construct_error1.phpt @@ -7,14 +7,14 @@ $a = new stdClass; $a->p = 1; try { var_dump(new ArrayObject($a, 0, "Exception")); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage() . "(" . $e->getLine() . ")\n"; } echo "Non-existent class:\n"; try { var_dump(new ArrayObject(new stdClass, 0, "nonExistentClassName")); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage() . "(" . $e->getLine() . ")\n"; } ?> diff --git a/ext/spl/tests/arrayObject___construct_error2.phpt b/ext/spl/tests/arrayObject___construct_error2.phpt index d075516725..35ba83d09f 100644 --- a/ext/spl/tests/arrayObject___construct_error2.phpt +++ b/ext/spl/tests/arrayObject___construct_error2.phpt @@ -13,7 +13,7 @@ Class C implements Iterator { try { var_dump(new ArrayObject(new stdClass, 0, "C", "extra")); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage() . "(" . $e->getLine() . ")\n"; } ?> diff --git a/ext/spl/tests/arrayObject_setFlags_basic2.phpt b/ext/spl/tests/arrayObject_setFlags_basic2.phpt index 534c755995..89dfc7448d 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 exception 'Error' 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/arrayObject_setIteratorClass_error1.phpt b/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt index b4c3756cb5..89efdb6a9f 100644 --- a/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt +++ b/ext/spl/tests/arrayObject_setIteratorClass_error1.phpt @@ -28,7 +28,7 @@ try { foreach($ao as $key=>$value) { echo " $key=>$value\n"; } -} catch (TypeException $e) { +} catch (TypeError $e) { var_dump($e->getMessage()); } @@ -37,7 +37,7 @@ try { foreach($ao as $key=>$value) { echo " $key=>$value\n"; } -} catch (TypeException $e) { +} catch (TypeError $e) { var_dump($e->getMessage()); } diff --git a/ext/spl/tests/bug48023.phpt b/ext/spl/tests/bug48023.phpt index 59bbb81f8b..3bb29ca7e5 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 exception 'Error' 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 dff469f625..9c7807d9e1 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 exception 'Error' 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/bug54292.phpt b/ext/spl/tests/bug54292.phpt index 44d12ee242..288f49a4ec 100644 --- a/ext/spl/tests/bug54292.phpt +++ b/ext/spl/tests/bug54292.phpt @@ -5,7 +5,7 @@ Bug #54292 (Wrong parameter causes crash in SplFileObject::__construct()) try { new SplFileObject('foo', array()); -} catch (TypeException $e) { +} catch (TypeError $e) { var_dump($e->getMessage()); } diff --git a/ext/spl/tests/fixedarray_005.phpt b/ext/spl/tests/fixedarray_005.phpt index 83727a23b9..cc64fd01b0 100644 --- a/ext/spl/tests/fixedarray_005.phpt +++ b/ext/spl/tests/fixedarray_005.phpt @@ -5,19 +5,19 @@ SPL: FixedArray: Invalid arguments try { $a = new SplFixedArray(new stdClass); -} catch (TypeException $iae) { +} catch (TypeError $iae) { echo "Ok - ".$iae->getMessage().PHP_EOL; } try { $a = new SplFixedArray('FOO'); -} catch (TypeException $iae) { +} catch (TypeError $iae) { echo "Ok - ".$iae->getMessage().PHP_EOL; } try { $a = new SplFixedArray(''); -} catch (TypeException $iae) { +} catch (TypeError $iae) { echo "Ok - ".$iae->getMessage().PHP_EOL; } diff --git a/ext/spl/tests/fixedarray_009.phpt b/ext/spl/tests/fixedarray_009.phpt index f255ed299a..fe38883621 100644 --- a/ext/spl/tests/fixedarray_009.phpt +++ b/ext/spl/tests/fixedarray_009.phpt @@ -5,7 +5,7 @@ SPL: FixedArray: Trying to instantiate passing string to construtor parameter try { $a = new SplFixedArray('FOO'); -} catch (TypeException $iae) { +} catch (TypeError $iae) { echo "Ok - ".$iae->getMessage().PHP_EOL; } ?> diff --git a/ext/spl/tests/fixedarray_015.phpt b/ext/spl/tests/fixedarray_015.phpt index d189d41da3..b6f119ab1f 100644 --- a/ext/spl/tests/fixedarray_015.phpt +++ b/ext/spl/tests/fixedarray_015.phpt @@ -5,7 +5,7 @@ SPL: FixedArray: accessing uninitialized array try { $a = new SplFixedArray(''); -} catch (TypeException $iae) { +} catch (TypeError $iae) { echo "Ok - ".$iae->getMessage().PHP_EOL; } diff --git a/ext/spl/tests/iterator_035.phpt b/ext/spl/tests/iterator_035.phpt index d166cfdba7..8d5777f6ae 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 exception 'Error' 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/iterator_042.phpt b/ext/spl/tests/iterator_042.phpt index d654ede97a..a344d60e33 100644 --- a/ext/spl/tests/iterator_042.phpt +++ b/ext/spl/tests/iterator_042.phpt @@ -15,7 +15,7 @@ $it = new AppendIterator; try { $it->append(array()); -} catch (EngineException $e) { +} catch (Error $e) { test_error_handler($e->getCode(), $e->getMessage(), $e->getFile(), $e->getLine()); } $it->append(new ArrayIterator(array(1))); diff --git a/ext/spl/tests/iterator_056.phpt b/ext/spl/tests/iterator_056.phpt index ee98263638..b5213732c3 100644 --- a/ext/spl/tests/iterator_056.phpt +++ b/ext/spl/tests/iterator_056.phpt @@ -21,36 +21,36 @@ class myNoRewindIterator extends NoRewindIterator {} try { $it = new myFilterIterator(); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage(), "\n"; } try { $it = new myCachingIterator(); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage(), "\n"; } try { $it = new myRecursiveCachingIterator(); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage(), "\n"; } try { $it = new myParentIterator(); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage(), "\n"; } try { $it = new myLimitIterator(); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage(), "\n"; } try { $it = new myNoRewindIterator(); -} catch (TypeException $e) { +} catch (TypeError $e) { echo $e->getMessage(), "\n"; } diff --git a/ext/spl/tests/recursive_tree_iterator_003.phpt b/ext/spl/tests/recursive_tree_iterator_003.phpt index 4cc7000a19..721b67ac02 100644 --- a/ext/spl/tests/recursive_tree_iterator_003.phpt +++ b/ext/spl/tests/recursive_tree_iterator_003.phpt @@ -4,7 +4,7 @@ SPL: RecursiveTreeIterator(non-traversable) getMessage(), "\n"; } ?> diff --git a/ext/spl/tests/spl_004.phpt b/ext/spl/tests/spl_004.phpt index c321bab296..ac44b9d684 100644 --- a/ext/spl/tests/spl_004.phpt +++ b/ext/spl/tests/spl_004.phpt @@ -44,7 +44,7 @@ var_dump(iterator_apply($it, 'test')); echo "===ERRORS===\n"; try { var_dump(iterator_apply($it, 'test', 1)); -} catch (EngineException $e) { +} catch (Error $e) { my_error_handler($e->getCode(), $e->getMessage(), $e->getFile(), $e->getLine()); } var_dump(iterator_apply($it, 'non_existing_function')); diff --git a/ext/spl/tests/spl_iterator_iterator_constructor.phpt b/ext/spl/tests/spl_iterator_iterator_constructor.phpt index ec103f5c9c..4c3fae25a2 100644 --- a/ext/spl/tests/spl_iterator_iterator_constructor.phpt +++ b/ext/spl/tests/spl_iterator_iterator_constructor.phpt @@ -15,7 +15,7 @@ try { $test = new IteratorIterator($arrayIterator, 1, 1); $test = new IteratorIterator($arrayIterator, 1, 1, 1); $test = new IteratorIterator($arrayIterator, 1, 1, 1, 1); -} catch (TypeException $e){ +} catch (TypeError $e){ echo $e->getMessage() . "\n"; } diff --git a/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt b/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt index 9fee08b9f4..9e57cd8a11 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 exception 'Error' with message '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_02_open.phpt b/ext/sqlite3/tests/sqlite3_02_open.phpt index 985033b33e..b9b49530b3 100644 --- a/ext/sqlite3/tests/sqlite3_02_open.phpt +++ b/ext/sqlite3/tests/sqlite3_02_open.phpt @@ -10,7 +10,7 @@ Felix De Vliegher try { $db = new SQLite3(); -} catch (TypeException $e) { +} catch (TypeError $e) { var_dump($e->getMessage()); } diff --git a/ext/standard/tests/array/arsort_object1.phpt b/ext/standard/tests/array/arsort_object1.phpt index e7c5bf8035..3b72c64746 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 exception 'Error' 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 b21982e6f3..c906a36053 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 exception 'Error' 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/010.phpt b/ext/standard/tests/general_functions/010.phpt index a4802b0808..51132c6a15 100644 --- a/ext/standard/tests/general_functions/010.phpt +++ b/ext/standard/tests/general_functions/010.phpt @@ -13,7 +13,7 @@ class test { try { var_dump(register_shutdown_function(array("test","__call"))); -} catch (EngineException $e) { +} catch (Error $e) { echo "\nException: " . $e->getMessage() . "\n"; } diff --git a/ext/standard/tests/general_functions/bug47857.phpt b/ext/standard/tests/general_functions/bug47857.phpt index 98c1981841..54de8ba313 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 exception 'Error' with message 'Non-static method Exception::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..a91811a8a1 100644 --- a/ext/standard/tests/serialize/bug69152.phpt +++ b/ext/standard/tests/serialize/bug69152.phpt @@ -2,15 +2,10 @@ Bug #69152: Type Confusion Infoleak Vulnerability in unserialize() --FILE-- test(); ?> --EXPECTF-- -exception 'Exception' in %s:%d -Stack trace: -#0 {main} Fatal error: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "unknown" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide a __autoload() function to load the class definition in %s on line %d diff --git a/ext/tidy/tests/035.phpt b/ext/tidy/tests/035.phpt index a7183e1921..d63e4a085c 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 exception 'Error' 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/tokenizer/tests/parse_errors.phpt b/ext/tokenizer/tests/parse_errors.phpt index 3ee2cb081b..bfa6e07ac4 100644 --- a/ext/tokenizer/tests/parse_errors.phpt +++ b/ext/tokenizer/tests/parse_errors.phpt @@ -8,7 +8,7 @@ Parse errors during token_get_all() function test_parse_error($code) { try { var_dump(token_get_all($code)); - } catch (ParseException $e) { + } catch (ParseError $e) { echo $e->getMessage(), "\n"; } } diff --git a/ext/xmlreader/tests/bug51936.phpt b/ext/xmlreader/tests/bug51936.phpt index 619b9ec1d9..d3ce8c1f64 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 exception 'Error' with message 'Trying to clone an uncloneable object of class XMLReader' in %s:%d Stack trace: #0 {main} thrown in %s on line %d -- cgit v1.2.1