com php-src: Fix #72948: Uncatchable "Catchable" fatal error for class to string conversions: Zend/tests/bug72162.phpt Zend/tests/class
_properties_const.phpt Zend/tests/exception_009 .phpt Zend/tests/instanceof_001.phpt Zend/tests /objects_022.phpt ext/gmp/tests/cast.phpt ext/m
bstring/tests/common.inc ext/openssl/tests/bug3826 1.phpt ext/pcre/tests/preg_replace_error1.phpt ext/pcre/tests/preg_replace_error2.phpt
ext/phar/test s/open_for_write_existin

From: Date: Sat, 03 Sep 2016 11:05:37 +0000
Subject: com php-src: Fix #72948: Uncatchable "Catchable" fatal error for class to string conversions: Zend/tests/bug72162.phpt Zend/tests/class
_properties_const.phpt Zend/tests/exception_009 .phpt Zend/tests/instanceof_001.phpt Zend/tests /objects_022.phpt ext/gmp/tests/cast.phpt ext/m
bstring/tests/common.inc ext/openssl/tests/bug3826 1.phpt ext/pcre/tests/preg_replace_error1.phpt ext/pcre/tests/preg_replace_error2.phpt
ext/phar/test s/open_for_write_existin
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-94352@lists.php.net to get a copy of this message
Commit: 727b422ad91f0d767d8f0fb3951b89fa9da8668f Author: Christoph M. Becker <cmbecker69@gmx.de> Sat, 3 Sep 2016 13:05:37 +0200 Parents: 5bdf2fa3456e4b2fca53b9eff24c81e724e93170 Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=727b422ad91f0d767d8f0fb3951b89fa9da8668f Log: Fix #72948: Uncatchable "Catchable" fatal error for class to string conversions E_RECOVERABLE errors are reported as "Catchable fatal error". This is misleading, because they actually can't be caught via try-catch statements. Therefore we change the wording to "Recoverable fatal error" as suggested by Nikita. Bugs: https://bugs.php.net/72948 Changed paths: M Zend/tests/bug72162.phpt M Zend/tests/class_properties_const.phpt M Zend/tests/exception_009.phpt M Zend/tests/instanceof_001.phpt M Zend/tests/objects_022.phpt M ext/gmp/tests/cast.phpt M ext/mbstring/tests/common.inc M ext/openssl/tests/bug38261.phpt M ext/pcre/tests/preg_replace_error1.phpt M ext/pcre/tests/preg_replace_error2.phpt M ext/phar/tests/open_for_write_existing_b.phpt M ext/phar/tests/open_for_write_existing_b_5_2.phpt M ext/phar/tests/open_for_write_newfile_b.phpt M ext/phar/tests/open_for_write_newfile_b_5_2.phpt M ext/phar/tests/tar/open_for_write_existing_b.phpt M ext/phar/tests/tar/open_for_write_existing_b_5_2.phpt M ext/phar/tests/tar/open_for_write_newfile_b.phpt M ext/phar/tests/tar/open_for_write_newfile_b_5_2.phpt M ext/phar/tests/zip/open_for_write_existing_b.phpt M ext/phar/tests/zip/open_for_write_existing_b_5_2.phpt M ext/phar/tests/zip/open_for_write_newfile_b.phpt M ext/phar/tests/zip/open_for_write_newfile_b_5_2.phpt M ext/posix/tests/posix_getgrgid_variation.phpt M ext/posix/tests/posix_getpgid_variation.phpt M ext/posix/tests/posix_getpwuid_variation.phpt M ext/posix/tests/posix_kill_variation1.phpt M ext/posix/tests/posix_kill_variation2.phpt M ext/posix/tests/posix_strerror_variation1.phpt M ext/standard/tests/math/base_convert_error.phpt M ext/standard/tests/math/bindec_error.phpt M ext/standard/tests/math/hexdec_error.phpt M ext/standard/tests/math/octdec_error.phpt M ext/standard/tests/streams/bug61115.phpt M ext/standard/tests/strings/lcfirst.phpt M ext/standard/tests/strings/str_replace.phpt M ext/standard/tests/strings/str_replace_variation3.phpt M ext/standard/tests/strings/strcasecmp.phpt M ext/standard/tests/strings/strcmp.phpt M ext/standard/tests/strings/strlen.phpt M ext/standard/tests/strings/strpos.phpt M ext/standard/tests/strings/strstr.phpt M ext/standard/tests/strings/strval_error.phpt M ext/standard/tests/strings/ucfirst.phpt M main/main.c

diff --git a/Zend/tests/bug72162.phpt b/Zend/tests/bug72162.phpt index 5902c58..493342d 100644 --- a/Zend/tests/bug72162.phpt +++ b/Zend/tests/bug72162.phpt @@ -7,4 +7,4 @@ $var11 = new StdClass(); $var16 = error_reporting($var11); ?> --EXPECTF-- -Catchable fatal error: Object of class stdClass could not be converted to string in %sbug72162.php on line %d +Recoverable fatal error: Object of class stdClass could not be converted to string in %sbug72162.php on line %d diff --git a/Zend/tests/class_properties_const.phpt b/Zend/tests/class_properties_const.phpt index ac871b5..8f607bc 100644 --- a/Zend/tests/class_properties_const.phpt +++ b/Zend/tests/class_properties_const.phpt @@ -22,4 +22,4 @@ NULL Notice: Undefined property: A::$1 in %sclass_properties_const.php on line %d NULL -Catchable fatal error: Object of class Closure could not be converted to string in %sclass_properties_const.php on line %d +Recoverable fatal error: Object of class Closure could not be converted to string in %sclass_properties_const.php on line %d diff --git a/Zend/tests/exception_009.phpt b/Zend/tests/exception_009.phpt index b22b3aa..32b048c 100644 --- a/Zend/tests/exception_009.phpt +++ b/Zend/tests/exception_009.phpt @@ -25,4 +25,4 @@ throw new my_exception; ?> --EXPECT-- -Catchable fatal error: Object of class stdClass could not be converted to string in Unknown on line 0 +Recoverable fatal error: Object of class stdClass could not be converted to string in Unknown on line 0 diff --git a/Zend/tests/instanceof_001.phpt b/Zend/tests/instanceof_001.phpt index b88e174..95e43ba 100644 --- a/Zend/tests/instanceof_001.phpt +++ b/Zend/tests/instanceof_001.phpt @@ -26,4 +26,4 @@ bool(true) bool(true) bool(false) -Catchable fatal error: Object of class stdClass could not be converted to string in %s on line %d +Recoverable fatal error: Object of class stdClass could not be converted to string in %s on line %d diff --git a/Zend/tests/objects_022.phpt b/Zend/tests/objects_022.phpt index 01f961b..5f537fe 100644 --- a/Zend/tests/objects_022.phpt +++ b/Zend/tests/objects_022.phpt @@ -25,7 +25,7 @@ $foo = new foo; $foo->testFoo(new foo); $foo->testBar(new bar); $foo->testBaz(new baz); -$foo->testFoo(new stdClass); // Catchable fatal error +$foo->testFoo(new stdClass); // Recoverable fatal error ?> --EXPECTF-- diff --git a/ext/gmp/tests/cast.phpt b/ext/gmp/tests/cast.phpt index eb1832c..8606538 100644 --- a/ext/gmp/tests/cast.phpt +++ b/ext/gmp/tests/cast.phpt @@ -19,4 +19,4 @@ string(2) "42" int(42) float(42) -Catchable fatal error: Object of class GMP could not be converted to boolean in %s on line %d +Recoverable fatal error: Object of class GMP could not be converted to boolean in %s on line %d diff --git a/ext/mbstring/tests/common.inc b/ext/mbstring/tests/common.inc index a40dde0..4205cce 100644 --- a/ext/mbstring/tests/common.inc +++ b/ext/mbstring/tests/common.inc @@ -20,7 +20,7 @@ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { 512 => "User Warning", // E_USER_WARMING 1024=> "User Notice", // E_USER_NOTICE 2048=> "Strict Notice", // E_STRICT - 4096=> "Catchable fatal error", // E_RECOVERABLE_ERROR + 4096=> "Recoverable fatal error", // E_RECOVERABLE_ERROR ); if (!empty($debug)) { diff --git a/ext/openssl/tests/bug38261.phpt b/ext/openssl/tests/bug38261.phpt index b06fa4f..66de8b8 100644 --- a/ext/openssl/tests/bug38261.phpt +++ b/ext/openssl/tests/bug38261.phpt @@ -31,4 +31,4 @@ Warning: openssl_x509_parse() expects at least 1 parameter, 0 given in %sbug3826 NULL bool(false) -Catchable fatal error: Object of class stdClass could not be converted to string in %sbug38261.php on line %d +Recoverable fatal error: Object of class stdClass could not be converted to string in %sbug38261.php on line %d diff --git a/ext/pcre/tests/preg_replace_error1.phpt b/ext/pcre/tests/preg_replace_error1.phpt index ec573c7..04eef25 100644 --- a/ext/pcre/tests/preg_replace_error1.phpt +++ b/ext/pcre/tests/preg_replace_error1.phpt @@ -55,5 +55,5 @@ string(1) "a" Arg value is /[a-zA-Z]/ string(1) "1" -Catchable fatal error: Object of class stdClass could not be converted to string in %spreg_replace_error1.php on line %d +Recoverable fatal error: Object of class stdClass could not be converted to string in %spreg_replace_error1.php on line %d diff --git a/ext/pcre/tests/preg_replace_error2.phpt b/ext/pcre/tests/preg_replace_error2.phpt index bf5d3e0..79f4c60 100644 --- a/ext/pcre/tests/preg_replace_error2.phpt +++ b/ext/pcre/tests/preg_replace_error2.phpt @@ -33,5 +33,5 @@ Arg value is: Array Warning: preg_replace(): Parameter mismatch, pattern is a string while replacement is an array in %spreg_replace_error2.php on line %d bool(false) -Catchable fatal error: Object of class stdClass could not be converted to string in %spreg_replace_error2.php on line %d +Recoverable fatal error: Object of class stdClass could not be converted to string in %spreg_replace_error2.php on line %d diff --git a/ext/phar/tests/open_for_write_existing_b.phpt b/ext/phar/tests/open_for_write_existing_b.phpt index ef48906..448b3a3 100644 --- a/ext/phar/tests/open_for_write_existing_b.phpt +++ b/ext/phar/tests/open_for_write_existing_b.phpt @@ -21,7 +21,7 @@ $files['b/c.php'] = '<?php echo "This is b/c\n"; ?>'; include 'files/phar_test.inc'; function err_handler($errno, $errstr, $errfile, $errline) { - echo "Catchable fatal error: $errstr in $errfile on line $errline\n"; + echo "Recoverable fatal error: $errstr in $errfile on line $errline\n"; } set_error_handler("err_handler", E_RECOVERABLE_ERROR); diff --git a/ext/phar/tests/open_for_write_existing_b_5_2.phpt b/ext/phar/tests/open_for_write_existing_b_5_2.phpt index 03edd54..b72098c 100644 --- a/ext/phar/tests/open_for_write_existing_b_5_2.phpt +++ b/ext/phar/tests/open_for_write_existing_b_5_2.phpt @@ -19,7 +19,7 @@ $files['b/c.php'] = '<?php echo "This is b/c\n"; ?>'; include 'files/phar_test.inc'; function err_handler($errno, $errstr, $errfile, $errline) { - echo "Catchable fatal error: $errstr in $errfile on line $errline\n"; + echo "Recoverable fatal error: $errstr in $errfile on line $errline\n"; } set_error_handler("err_handler", E_RECOVERABLE_ERROR); diff --git a/ext/phar/tests/open_for_write_newfile_b.phpt b/ext/phar/tests/open_for_write_newfile_b.phpt index 45131c4..2926140 100644 --- a/ext/phar/tests/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/open_for_write_newfile_b.phpt @@ -21,7 +21,7 @@ $files['b/c.php'] = '<?php echo "This is b/c\n"; ?>'; include 'files/phar_test.inc'; function err_handler($errno, $errstr, $errfile, $errline) { - echo "Catchable fatal error: $errstr in $errfile on line $errline\n"; + echo "Recoverable fatal error: $errstr in $errfile on line $errline\n"; } set_error_handler("err_handler", E_RECOVERABLE_ERROR); diff --git a/ext/phar/tests/open_for_write_newfile_b_5_2.phpt b/ext/phar/tests/open_for_write_newfile_b_5_2.phpt index 7d43f1c..8d84379 100644 --- a/ext/phar/tests/open_for_write_newfile_b_5_2.phpt +++ b/ext/phar/tests/open_for_write_newfile_b_5_2.phpt @@ -19,7 +19,7 @@ $files['b/c.php'] = '<?php echo "This is b/c\n"; ?>'; include 'files/phar_test.inc'; function err_handler($errno, $errstr, $errfile, $errline) { - echo "Catchable fatal error: $errstr in $errfile on line $errline\n"; + echo "Recoverable fatal error: $errstr in $errfile on line $errline\n"; } set_error_handler("err_handler", E_RECOVERABLE_ERROR); diff --git a/ext/phar/tests/tar/open_for_write_existing_b.phpt b/ext/phar/tests/tar/open_for_write_existing_b.phpt index fa631e6..3c7c67e 100644 --- a/ext/phar/tests/tar/open_for_write_existing_b.phpt +++ b/ext/phar/tests/tar/open_for_write_existing_b.phpt @@ -31,7 +31,7 @@ $phar->stopBuffering(); ini_set('phar.readonly', 1); function err_handler($errno, $errstr, $errfile, $errline) { - echo "Catchable fatal error: $errstr in $errfile on line $errline\n"; + echo "Recoverable fatal error: $errstr in $errfile on line $errline\n"; } set_error_handler("err_handler", E_RECOVERABLE_ERROR); diff --git a/ext/phar/tests/tar/open_for_write_existing_b_5_2.phpt b/ext/phar/tests/tar/open_for_write_existing_b_5_2.phpt index a6fea06..19c2f40 100644 --- a/ext/phar/tests/tar/open_for_write_existing_b_5_2.phpt +++ b/ext/phar/tests/tar/open_for_write_existing_b_5_2.phpt @@ -29,7 +29,7 @@ $phar->stopBuffering(); ini_set('phar.readonly', 1); function err_handler($errno, $errstr, $errfile, $errline) { - echo "Catchable fatal error: $errstr in $errfile on line $errline\n"; + echo "Recoverable fatal error: $errstr in $errfile on line $errline\n"; } set_error_handler("err_handler", E_RECOVERABLE_ERROR); diff --git a/ext/phar/tests/tar/open_for_write_newfile_b.phpt b/ext/phar/tests/tar/open_for_write_newfile_b.phpt index 2ea557b..83a5104 100644 --- a/ext/phar/tests/tar/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile_b.phpt @@ -31,7 +31,7 @@ $phar->stopBuffering(); ini_set('phar.readonly', 1); function err_handler($errno, $errstr, $errfile, $errline) { - echo "Catchable fatal error: $errstr in $errfile on line $errline\n"; + echo "Recoverable fatal error: $errstr in $errfile on line $errline\n"; } set_error_handler("err_handler", E_RECOVERABLE_ERROR); diff --git a/ext/phar/tests/tar/open_for_write_newfile_b_5_2.phpt b/ext/phar/tests/tar/open_for_write_newfile_b_5_2.phpt index 1bb02a0..7906bc9 100644 --- a/ext/phar/tests/tar/open_for_write_newfile_b_5_2.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile_b_5_2.phpt @@ -29,7 +29,7 @@ $phar->stopBuffering(); ini_set('phar.readonly', 1); function err_handler($errno, $errstr, $errfile, $errline) { - echo "Catchable fatal error: $errstr in $errfile on line $errline\n"; + echo "Recoverable fatal error: $errstr in $errfile on line $errline\n"; } set_error_handler("err_handler", E_RECOVERABLE_ERROR); diff --git a/ext/phar/tests/zip/open_for_write_existing_b.phpt b/ext/phar/tests/zip/open_for_write_existing_b.phpt index b997c68..d1f963e 100644 --- a/ext/phar/tests/zip/open_for_write_existing_b.phpt +++ b/ext/phar/tests/zip/open_for_write_existing_b.phpt @@ -31,7 +31,7 @@ $phar->stopBuffering(); ini_set('phar.readonly', 1); function err_handler($errno, $errstr, $errfile, $errline) { - echo "Catchable fatal error: $errstr in $errfile on line $errline\n"; + echo "Recoverable fatal error: $errstr in $errfile on line $errline\n"; } set_error_handler("err_handler", E_RECOVERABLE_ERROR); diff --git a/ext/phar/tests/zip/open_for_write_existing_b_5_2.phpt b/ext/phar/tests/zip/open_for_write_existing_b_5_2.phpt index b88a496..522a1de 100644 --- a/ext/phar/tests/zip/open_for_write_existing_b_5_2.phpt +++ b/ext/phar/tests/zip/open_for_write_existing_b_5_2.phpt @@ -29,7 +29,7 @@ $phar->stopBuffering(); ini_set('phar.readonly', 1); function err_handler($errno, $errstr, $errfile, $errline) { - echo "Catchable fatal error: $errstr in $errfile on line $errline\n"; + echo "Recoverable fatal error: $errstr in $errfile on line $errline\n"; } set_error_handler("err_handler", E_RECOVERABLE_ERROR); diff --git a/ext/phar/tests/zip/open_for_write_newfile_b.phpt b/ext/phar/tests/zip/open_for_write_newfile_b.phpt index 96fd2e4..9f5328f 100644 --- a/ext/phar/tests/zip/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile_b.phpt @@ -31,7 +31,7 @@ $phar->stopBuffering(); ini_set('phar.readonly', 1); function err_handler($errno, $errstr, $errfile, $errline) { - echo "Catchable fatal error: $errstr in $errfile on line $errline\n"; + echo "Recoverable fatal error: $errstr in $errfile on line $errline\n"; } set_error_handler("err_handler", E_RECOVERABLE_ERROR); diff --git a/ext/phar/tests/zip/open_for_write_newfile_b_5_2.phpt b/ext/phar/tests/zip/open_for_write_newfile_b_5_2.phpt index 3032427..2575201 100644 --- a/ext/phar/tests/zip/open_for_write_newfile_b_5_2.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile_b_5_2.phpt @@ -29,7 +29,7 @@ $phar->stopBuffering(); ini_set('phar.readonly', 1); function err_handler($errno, $errstr, $errfile, $errline) { - echo "Catchable fatal error: $errstr in $errfile on line $errline\n"; + echo "Recoverable fatal error: $errstr in $errfile on line $errline\n"; } set_error_handler("err_handler", E_RECOVERABLE_ERROR); diff --git a/ext/posix/tests/posix_getgrgid_variation.phpt b/ext/posix/tests/posix_getgrgid_variation.phpt index 9b9bc25..7abd32b 100644 --- a/ext/posix/tests/posix_getgrgid_variation.phpt +++ b/ext/posix/tests/posix_getgrgid_variation.phpt @@ -185,4 +185,4 @@ valid output Arg value valid output -Catchable fatal error: Object of class stdClass could not be converted to string in %s on line %d +Recoverable fatal error: Object of class stdClass could not be converted to string in %s on line %d diff --git a/ext/posix/tests/posix_getpgid_variation.phpt b/ext/posix/tests/posix_getpgid_variation.phpt index 49ed890..478164c 100644 --- a/ext/posix/tests/posix_getpgid_variation.phpt +++ b/ext/posix/tests/posix_getpgid_variation.phpt @@ -185,4 +185,4 @@ valid output Arg value valid output -Catchable fatal error: Object of class stdClass could not be converted to string in %s on line %d +Recoverable fatal error: Object of class stdClass could not be converted to string in %s on line %d diff --git a/ext/posix/tests/posix_getpwuid_variation.phpt b/ext/posix/tests/posix_getpwuid_variation.phpt index 8a4b83b..fa000f5 100644 --- a/ext/posix/tests/posix_getpwuid_variation.phpt +++ b/ext/posix/tests/posix_getpwuid_variation.phpt @@ -185,4 +185,4 @@ valid output Arg value valid output -Catchable fatal error: Object of class stdClass could not be converted to string in %s on line %d +Recoverable fatal error: Object of class stdClass could not be converted to string in %s on line %d diff --git a/ext/posix/tests/posix_kill_variation1.phpt b/ext/posix/tests/posix_kill_variation1.phpt index 99bb8e0..d26f11d 100644 --- a/ext/posix/tests/posix_kill_variation1.phpt +++ b/ext/posix/tests/posix_kill_variation1.phpt @@ -179,4 +179,4 @@ bool(false) Arg value bool(false) -Catchable fatal error: Object of class stdClass could not be converted to string in %s on line %d +Recoverable fatal error: Object of class stdClass could not be converted to string in %s on line %d diff --git a/ext/posix/tests/posix_kill_variation2.phpt b/ext/posix/tests/posix_kill_variation2.phpt index 5eeaa1f..399151a 100644 --- a/ext/posix/tests/posix_kill_variation2.phpt +++ b/ext/posix/tests/posix_kill_variation2.phpt @@ -179,4 +179,4 @@ bool(false) Arg value bool(false) -Catchable fatal error: Object of class stdClass could not be converted to string in %s on line %d +Recoverable fatal error: Object of class stdClass could not be converted to string in %s on line %d diff --git a/ext/posix/tests/posix_strerror_variation1.phpt b/ext/posix/tests/posix_strerror_variation1.phpt index ed50492..40fff34 100644 --- a/ext/posix/tests/posix_strerror_variation1.phpt +++ b/ext/posix/tests/posix_strerror_variation1.phpt @@ -178,4 +178,4 @@ string Arg value string -Catchable fatal error: Object of class stdClass could not be converted to string in %s on line %d +Recoverable fatal error: Object of class stdClass could not be converted to string in %s on line %d diff --git a/ext/standard/tests/math/base_convert_error.phpt b/ext/standard/tests/math/base_convert_error.phpt index 4e35a81..a05268a 100644 --- a/ext/standard/tests/math/base_convert_error.phpt +++ b/ext/standard/tests/math/base_convert_error.phpt @@ -40,4 +40,4 @@ Warning: base_convert(): Invalid `from base' (1) in %s on line %d Warning: base_convert(): Invalid `to base' (37) in %s on line %s Incorrect input -Catchable fatal error: Object of class classA could not be converted to string in %s on line %d \ No newline at end of file +Recoverable fatal error: Object of class classA could not be converted to string in %s on line %d \ No newline at end of file diff --git a/ext/standard/tests/math/bindec_error.phpt b/ext/standard/tests/math/bindec_error.phpt index 8cf3cf7..aa6ac9c 100644 --- a/ext/standard/tests/math/bindec_error.phpt +++ b/ext/standard/tests/math/bindec_error.phpt @@ -34,4 +34,4 @@ Warning: bindec() expects exactly 1 parameter, 0 given in %s on line %d Warning: bindec() expects exactly 1 parameter, 2 given in %s on line %d Incorrect input -Catchable fatal error: Object of class classA could not be converted to string in %s on line %d \ No newline at end of file +Recoverable fatal error: Object of class classA could not be converted to string in %s on line %d \ No newline at end of file diff --git a/ext/standard/tests/math/hexdec_error.phpt b/ext/standard/tests/math/hexdec_error.phpt index e9ab9e5..c45c2aa 100644 --- a/ext/standard/tests/math/hexdec_error.phpt +++ b/ext/standard/tests/math/hexdec_error.phpt @@ -33,4 +33,4 @@ Warning: hexdec() expects exactly 1 parameter, 2 given in %s on line %d -- Incorrect input -- -Catchable fatal error: Object of class classA could not be converted to string in %s on line %d \ No newline at end of file +Recoverable fatal error: Object of class classA could not be converted to string in %s on line %d \ No newline at end of file diff --git a/ext/standard/tests/math/octdec_error.phpt b/ext/standard/tests/math/octdec_error.phpt index 5d21383..ba5f211 100644 --- a/ext/standard/tests/math/octdec_error.phpt +++ b/ext/standard/tests/math/octdec_error.phpt @@ -34,4 +34,4 @@ Warning: octdec() expects exactly 1 parameter, 2 given in %s on line %d -- Incorrect input -- -Catchable fatal error: Object of class classA could not be converted to string in %s on line %d \ No newline at end of file +Recoverable fatal error: Object of class classA could not be converted to string in %s on line %d \ No newline at end of file diff --git a/ext/standard/tests/streams/bug61115.phpt b/ext/standard/tests/streams/bug61115.phpt index 29dc7c1..5cfc9c2 100644 --- a/ext/standard/tests/streams/bug61115.phpt +++ b/ext/standard/tests/streams/bug61115.phpt @@ -10,4 +10,4 @@ stream_context_set_params($resourceFileTemp, array()); preg_replace('', function() {}, $resourceFileTemp); ?> --EXPECTF-- -Catchable fatal error: Object of class Closure could not be converted to string in %s on line %d +Recoverable fatal error: Object of class Closure could not be converted to string in %s on line %d diff --git a/ext/standard/tests/strings/lcfirst.phpt b/ext/standard/tests/strings/lcfirst.phpt index 6cbd213..5424c50 100644 Binary files a/ext/standard/tests/strings/lcfirst.phpt and b/ext/standard/tests/strings/lcfirst.phpt differ diff --git a/ext/standard/tests/strings/str_replace.phpt b/ext/standard/tests/strings/str_replace.phpt index 15c1c8e..b53ed66 100644 --- a/ext/standard/tests/strings/str_replace.phpt +++ b/ext/standard/tests/strings/str_replace.phpt @@ -118,7 +118,7 @@ var_dump($count); echo "\n-- Testing objects --\n"; -/* we get "Catchable fatal error: saying Object of class could not be converted +/* we get "Recoverable fatal error: saying Object of class could not be converted to string" by default, when an object is passed instead of string: The error can be avoided by choosing the __toString magix method as follows: */ diff --git a/ext/standard/tests/strings/str_replace_variation3.phpt b/ext/standard/tests/strings/str_replace_variation3.phpt index 7b46f8b..8f6f38f 100644 --- a/ext/standard/tests/strings/str_replace_variation3.phpt +++ b/ext/standard/tests/strings/str_replace_variation3.phpt @@ -31,7 +31,7 @@ var_dump($count); echo "\n-- Testing objects --\n"; -/* we get "Catchable fatal error: saying Object of class could not be converted +/* we get "Recoverable fatal error: saying Object of class could not be converted to string" by default, when an object is passed instead of string: The error can be avoided by choosing the __toString magix method as follows: */ diff --git a/ext/standard/tests/strings/strcasecmp.phpt b/ext/standard/tests/strings/strcasecmp.phpt index b3452cf..265b870 100644 Binary files a/ext/standard/tests/strings/strcasecmp.phpt and b/ext/standard/tests/strings/strcasecmp.phpt differ diff --git a/ext/standard/tests/strings/strcmp.phpt b/ext/standard/tests/strings/strcmp.phpt index e77ed6e..dea9464 100644 Binary files a/ext/standard/tests/strings/strcmp.phpt and b/ext/standard/tests/strings/strcmp.phpt differ diff --git a/ext/standard/tests/strings/strlen.phpt b/ext/standard/tests/strings/strlen.phpt index ab54445..52e0200 100644 Binary files a/ext/standard/tests/strings/strlen.phpt and b/ext/standard/tests/strings/strlen.phpt differ diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt index f5d60a6..a2237fe 100644 Binary files a/ext/standard/tests/strings/strpos.phpt and b/ext/standard/tests/strings/strpos.phpt differ diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt index fd7f58e..a16cda9 100644 Binary files a/ext/standard/tests/strings/strstr.phpt and b/ext/standard/tests/strings/strstr.phpt differ diff --git a/ext/standard/tests/strings/strval_error.phpt b/ext/standard/tests/strings/strval_error.phpt index c31a2ab..629c003 100644 --- a/ext/standard/tests/strings/strval_error.phpt +++ b/ext/standard/tests/strings/strval_error.phpt @@ -48,4 +48,4 @@ NULL -- Testing strval() function with object which has not toString() method -- -Catchable fatal error: Object of class MyClass could not be converted to string in %s on line %d \ No newline at end of file +Recoverable fatal error: Object of class MyClass could not be converted to string in %s on line %d \ No newline at end of file diff --git a/ext/standard/tests/strings/ucfirst.phpt b/ext/standard/tests/strings/ucfirst.phpt index 8fb1a15..143c4bd 100644 Binary files a/ext/standard/tests/strings/ucfirst.phpt and b/ext/standard/tests/strings/ucfirst.phpt differ diff --git a/main/main.c b/main/main.c index 0a11271..dd69734 100644 --- a/main/main.c +++ b/main/main.c @@ -1094,7 +1094,7 @@ static ZEND_COLD void php_error_cb(int type, const char *error_filename, const u syslog_type_int = LOG_ERR; break; case E_RECOVERABLE_ERROR: - error_type_str = "Catchable fatal error"; + error_type_str = "Recoverable fatal error"; syslog_type_int = LOG_ERR; break; case E_WARNING:
« previous php.cvs (#94352) next »