Skip to content

Commit b16f994

Browse files
committed
mysqli: raise ValueError for invalid option in mysqli_options() respecting report_mode
1 parent e754b49 commit b16f994

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

ext/mysqli/tests/gh20968.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ try {
2323

2424
?>
2525
--EXPECTF--
26-
mysqli::options(): Argument #%d ($option) must be MYSQLI_INIT_COMMAND, MYSQLI_SET_CHARSET_NAME, MYSQLI_SERVER_PUBLIC_KEY, or one of the MYSQLI_OPT_* constants
26+
mysqli::options(): Argument #%d ($option) must be MYSQLI_INIT_COMMAND, MYSQLI_SET_CHARSET_NAME, MYSQLI_SERVER_PUBLIC_KEY, or one of the MYSQLI_OPT_* constants

ext/mysqli/tests/mysqli_options.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ bool(true)
113113
%s(19) "MYSQLI_INIT_COMMAND"
114114
bool(true)
115115
%s(17) "MYSQLI_CLIENT_SSL"
116-
mysqli_options(): Argument #%d ($option) must be MYSQLI_INIT_COMMAND, MYSQLI_SET_CHARSET_NAME, MYSQLI_SERVER_PUBLIC_KEY, or one of the MYSQLI_OPT_* constants
116+
mysqli_options(): Argument #%d ($option) must be MYSQLI_INIT_COMMAND, MYSQLI_SET_CHARSET_NAME, MYSQLI_SERVER_PUBLIC_KEY, or one of the MYSQLI_OPT_* constants
117117
Link closed
118118
mysqli object is already closed
119119
Unknown character set

ext/mysqli/tests/mysqli_set_opt.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ bool(true)
5353
bool(true)
5454
bool(true)
5555
bool(true)
56-
mysqli_set_opt(): Argument #2 ($option) must be MYSQLI_INIT_COMMAND, MYSQLI_SET_CHARSET_NAME, MYSQLI_SERVER_PUBLIC_KEY, or one of the MYSQLI_OPT_* constants
56+
mysqli_set_opt(): Argument #2 ($option) must be MYSQLI_INIT_COMMAND, MYSQLI_SET_CHARSET_NAME, MYSQLI_SERVER_PUBLIC_KEY, or one of the MYSQLI_OPT_* constants
5757
mysqli object is already closed
5858
done!

0 commit comments

Comments
 (0)