From 727b422ad91f0d767d8f0fb3951b89fa9da8668f Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sat, 3 Sep 2016 13:05:37 +0200 Subject: [PATCH] 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. --- Zend/tests/bug72162.phpt | 2 +- Zend/tests/class_properties_const.phpt | 2 +- Zend/tests/exception_009.phpt | 2 +- Zend/tests/instanceof_001.phpt | 2 +- Zend/tests/objects_022.phpt | 2 +- ext/gmp/tests/cast.phpt | 2 +- ext/mbstring/tests/common.inc | 2 +- ext/openssl/tests/bug38261.phpt | 2 +- ext/pcre/tests/preg_replace_error1.phpt | 2 +- ext/pcre/tests/preg_replace_error2.phpt | 2 +- ext/phar/tests/open_for_write_existing_b.phpt | 2 +- .../tests/open_for_write_existing_b_5_2.phpt | 2 +- ext/phar/tests/open_for_write_newfile_b.phpt | 2 +- .../tests/open_for_write_newfile_b_5_2.phpt | 2 +- .../tests/tar/open_for_write_existing_b.phpt | 2 +- .../tar/open_for_write_existing_b_5_2.phpt | 2 +- .../tests/tar/open_for_write_newfile_b.phpt | 2 +- .../tar/open_for_write_newfile_b_5_2.phpt | 2 +- .../tests/zip/open_for_write_existing_b.phpt | 2 +- .../zip/open_for_write_existing_b_5_2.phpt | 2 +- .../tests/zip/open_for_write_newfile_b.phpt | 2 +- .../zip/open_for_write_newfile_b_5_2.phpt | 2 +- ext/posix/tests/posix_getgrgid_variation.phpt | 2 +- ext/posix/tests/posix_getpgid_variation.phpt | 2 +- ext/posix/tests/posix_getpwuid_variation.phpt | 2 +- ext/posix/tests/posix_kill_variation1.phpt | 2 +- ext/posix/tests/posix_kill_variation2.phpt | 2 +- .../tests/posix_strerror_variation1.phpt | 2 +- .../tests/math/base_convert_error.phpt | 2 +- ext/standard/tests/math/bindec_error.phpt | 2 +- ext/standard/tests/math/hexdec_error.phpt | 2 +- ext/standard/tests/math/octdec_error.phpt | 2 +- ext/standard/tests/streams/bug61115.phpt | 2 +- ext/standard/tests/strings/lcfirst.phpt | Bin 6906 -> 6908 bytes ext/standard/tests/strings/str_replace.phpt | 2 +- .../tests/strings/str_replace_variation3.phpt | 2 +- ext/standard/tests/strings/strcasecmp.phpt | Bin 22269 -> 22271 bytes ext/standard/tests/strings/strcmp.phpt | Bin 20035 -> 20037 bytes ext/standard/tests/strings/strlen.phpt | Bin 7099 -> 7101 bytes ext/standard/tests/strings/strpos.phpt | Bin 10239 -> 10241 bytes ext/standard/tests/strings/strstr.phpt | Bin 10539 -> 10541 bytes ext/standard/tests/strings/strval_error.phpt | 2 +- ext/standard/tests/strings/ucfirst.phpt | Bin 6130 -> 6132 bytes main/main.c | 2 +- 44 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Zend/tests/bug72162.phpt b/Zend/tests/bug72162.phpt index 5902c585d8..493342d838 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 ac871b5c2b..8f607bcfe2 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 b22b3aa66e..32b048c40b 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 b88e174c16..95e43ba506 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 01f961bae1..5f537feaf4 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 eb1832c4dd..8606538baf 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 a40dde0399..4205cce7bc 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 b06fa4f8fe..66de8b876c 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 ec573c77bf..04eef25e3d 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 bf5d3e072c..79f4c60d69 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 ef48906de1..448b3a3abc 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'] = ''; 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 03edd54e5f..b72098c773 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'] = ''; 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 45131c4892..2926140ff5 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'] = ''; 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 7d43f1c8ee..8d84379fba 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'] = ''; 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 fa631e6181..3c7c67e941 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 a6fea062ad..19c2f4023a 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 2ea557b8a0..83a510436a 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 1bb02a0bec..7906bc9ddf 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 b997c68291..d1f963e9af 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 b88a496326..522a1deda6 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 96fd2e426e..9f5328ff91 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 3032427bcc..2575201bd1 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 9b9bc25aab..7abd32b97f 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 49ed890e95..478164c210 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 8a4b83ba76..fa000f5b8a 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 99bb8e0151..d26f11df03 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 5eeaa1fc5a..399151a7ed 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 ed50492125..40fff34be8 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 4e35a81f36..a05268ab94 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 8cf3cf7028..aa6ac9cdd1 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 e9ab9e512d..c45c2aa92b 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 5d21383774..ba5f2116bb 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 29dc7c1ccc..5cfc9c2ac3 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 6cbd213fbeb6ea78249ea0b675d4f8332dfeb9d8..5424c5018d81b507e17b0619e39138e93040efbf 100644 GIT binary patch delta 20 bcmexm`p0y`Jr4Gu)a3lK)S}IgImCqkW(x?L delta 18 Zcmexk`pa~~Jq}jq#FFHU%}+VRg#c5&2dDr5 diff --git a/ext/standard/tests/strings/str_replace.phpt b/ext/standard/tests/strings/str_replace.phpt index 15c1c8e53d..b53ed665d4 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 7b46f8b286..8f6f38f1f9 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 b3452cfd7c0f6322844e435ebd00b43f78dc060e..265b8708ea2f0961c4b4943ffc3a6ad683df3bdf 100644 GIT binary patch delta 22 ecmeynmht~u#tpG7>_Mr?`DLj^o0C{(2LS+c^$AS? delta 20 ccmeyrmhtae#tpG7tj>ug$r+ndSY`(S0AR!jS^xk5 diff --git a/ext/standard/tests/strings/strcmp.phpt b/ext/standard/tests/strings/strcmp.phpt index e77ed6e46620eae96697c74a01fb13ab62ad0dc9..dea94644aa28219574fe93dd51a6b27c867c03dd 100644 GIT binary patch delta 22 ecmX>+hw_Mr?`DLj^n*&)sc>(}ub_nAD delta 20 ccmX>)hw<ug$r+o2Sw49J09BI*@Bjb+ diff --git a/ext/standard/tests/strings/strlen.phpt b/ext/standard/tests/strings/strlen.phpt index ab5444594363273df67215cea926876eeec02765..52e0200af16fce7b3afa11c0357df556473d513d 100644 GIT binary patch delta 20 bcmdmOzSn$%8XJ31YI1&AYSCtGwh5vDP$UN_ delta 18 ZcmdmMzT13*8XK!~Vo7qwW?i-kq5wcY1~vcy diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt index f5d60a69b58cdf45b3c525faaf9032e086d2fc88..a2237fe005abc99d09e7a7a77db1dea477dc6c28 100644 GIT binary patch delta 20 bcmezG-x#n#oRd8$H95a5wP>>p=VLhlRB{KV delta 18 ZcmZn+`0u|#oRif#u_QTTvmEDRIRHa72D1PF diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt index fd7f58ef1a51a4d6fcb7f585af339874148bf5e7..a16cda9c9367d1a4dc5483691adfd61f22ff5509 100644 GIT binary patch delta 20 bcmZ1-v^HpiCL4QDYI1&AYSCsrw!caMQm_ZV delta 18 ZcmZ1*v^r>mCL61BVo7qwW&^grN&rHc2Fw5e diff --git a/ext/standard/tests/strings/strval_error.phpt b/ext/standard/tests/strings/strval_error.phpt index c31a2ab35b..629c003679 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 8fb1a156b46a78c5fde89267972c0bfd5d4d5bb5..143c4bd426cc2e82431e9ddcf71b7daea8132153 100644 GIT binary patch delta 20 bcmeyQ|3!a;DjR!HYI1&AYSCsbwiAK?SBD3= delta 18 ZcmeyO|4Dy?DjTbFVo7qwW*xQ@f&fP72F3sY diff --git a/main/main.c b/main/main.c index 0a1127176e..dd69734aea 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: -- 2.50.1