Fix GH-17469: UConverter::transcode() not hardcoding error handling. #17488
Conversation
ext/intl/converter/converter.c
Outdated
| php_error_docref(NULL, E_WARNING, "Ambiguous encoding specified, using %s", actual_encoding); | ||
| char *msg; | ||
| spprintf(&msg, 0, "Ambigious encoding specified, using %s", actual_encoding); | ||
| intl_error_set(NULL, error, msg, 1); |
There was a problem hiding this comment.
I think this one should remain a warning, as ucnv_open() was successful and the conversion is actually performed:
$str = "\x0a";
var_dump(bin2hex($str));
$str = UConverter::transcode("\x0a", 'UTF-16', 'UTF-8');
var_dump(bin2hex($str));
$str = UConverter::transcode($str, 'windows-1251', 'UTF-16');
var_dump(bin2hex($str));Result:
string(2) "0a"
string(8) "fffe0a00"
Warning: UConverter::transcode(): Ambiguous encoding specified, using ibm-5347_P100-1998 in test.php on line 8
string(2) "0a"
| php_error_docref(NULL, E_WARNING, "Error setting encoding: %d - %s", (int)error, u_errorName(error)); | ||
| char *msg; | ||
| spprintf(&msg, 0, "Error setting encoding: %d - %s", (int)error, u_errorName(error)); | ||
| intl_error_set(NULL, error, msg, 1); |
There was a problem hiding this comment.
Should we pass error to the code parameter here? This is exposed via intl_get_error_code() so it can be useful.
In the Ambigious encoding specified case above, if we convert it back to a warning, we could still expose the error code by calling intl_errors_set_code().
There was a problem hiding this comment.
well objval is null in that case, what do you suggest ?
There was a problem hiding this comment.
I was suggesting to pass error to the code parameter, but I'm noticing now that you are already doing exactly that, so please dismiss this comment :D
ext/intl/converter/converter.c
Outdated
| @@ -376,25 +376,28 @@ static bool php_converter_set_encoding(php_converter_object *objval, | |||
| /* Should never happen */ | |||
| actual_encoding = "(unknown)"; | |||
| } | |||
| php_error_docref(NULL, E_WARNING, "Ambiguous encoding specified, using %s", actual_encoding); | |||
| php_error_docref(NULL, E_WARNING, "Ambigious encoding specified, using %s", actual_encoding); | |||
Respecting instead intl.use_exceptions/intl.error_level. close phpGH-17488
Respecting instead intl.use_exceptions/intl.error_level.