From 830d38535178920bfaae6e8e8d93fadcba4a1a7e Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Sun, 28 Mar 2021 20:36:17 +0100 Subject: [PATCH] Fix typos in fetch_all error message --- ext/mysqli/mysqli_nonapi.c | 3 +-- ext/mysqli/tests/mysqli_fetch_all.phpt | 2 +- ext/mysqli/tests/mysqli_fetch_all_oo.phpt | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 907b1e3fbc..10de4eee11 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -449,8 +449,7 @@ PHP_FUNCTION(mysqli_fetch_all) MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID); if (!mode || (mode & ~MYSQLI_BOTH)) { - zend_argument_value_error(ERROR_ARG_POS(2), "must be one of MYSQLI_FETCH_NUM, " - "MYSQLI_FETCH_ASSOC, or MYSQLI_FETCH_BOTH"); + zend_argument_value_error(ERROR_ARG_POS(2), "must be one of MYSQLI_NUM, MYSQLI_ASSOC, or MYSQLI_BOTH"); RETURN_THROWS(); } diff --git a/ext/mysqli/tests/mysqli_fetch_all.phpt b/ext/mysqli/tests/mysqli_fetch_all.phpt index fac34e3d88..9fc772d361 100644 --- a/ext/mysqli/tests/mysqli_fetch_all.phpt +++ b/ext/mysqli/tests/mysqli_fetch_all.phpt @@ -440,6 +440,6 @@ array(1) { string(1) "1" } } -mysqli_fetch_all(): Argument #2 ($mode) must be one of MYSQLI_FETCH_NUM, MYSQLI_FETCH_ASSOC, or MYSQLI_FETCH_BOTH +mysqli_fetch_all(): Argument #2 ($mode) must be one of MYSQLI_NUM, MYSQLI_ASSOC, or MYSQLI_BOTH mysqli_result object is already closed done! diff --git a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt index ebdc55443c..02b8803016 100644 --- a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt @@ -432,6 +432,6 @@ array(1) { string(1) "1" } } -mysqli_result::fetch_all(): Argument #1 ($mode) must be one of MYSQLI_FETCH_NUM, MYSQLI_FETCH_ASSOC, or MYSQLI_FETCH_BOTH +mysqli_result::fetch_all(): Argument #1 ($mode) must be one of MYSQLI_NUM, MYSQLI_ASSOC, or MYSQLI_BOTH mysqli_result object is already closed done! -- 2.50.1