Fix typos in fetch_all error message

kamil-tekiela · kamil-tekiela · commit 830d38535178 · 2021-03-28T20:36:17.000+01:00
diff --git 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
@@ -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
@@ -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!

Original file line number	Diff line number	Diff line change
`@@ -449,8 +449,7 @@ PHP_FUNCTION(mysqli_fetch_all)`
`449`	`449`	`MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);`
`450`	`450`
`451`	`451`	`if (!mode \|\| (mode & ~MYSQLI_BOTH)) {`
`452`		`- zend_argument_value_error(ERROR_ARG_POS(2), "must be one of MYSQLI_FETCH_NUM, "`
`453`		`- "MYSQLI_FETCH_ASSOC, or MYSQLI_FETCH_BOTH");`
	`452`	`+ zend_argument_value_error(ERROR_ARG_POS(2), "must be one of MYSQLI_NUM, MYSQLI_ASSOC, or MYSQLI_BOTH");`
`454`	`453`	`RETURN_THROWS();`
`455`	`454`	`}`
`456`	`455`
Original file line number	Diff line number	Diff line change
`@@ -440,6 +440,6 @@ array(1) {`
`440`	`440`	`string(1) "1"`
`441`	`441`	`}`
`442`	`442`	`}`
`443`		`-mysqli_fetch_all(): Argument #2 ($mode) must be one of MYSQLI_FETCH_NUM, MYSQLI_FETCH_ASSOC, or MYSQLI_FETCH_BOTH`
	`443`	`+mysqli_fetch_all(): Argument #2 ($mode) must be one of MYSQLI_NUM, MYSQLI_ASSOC, or MYSQLI_BOTH`
`444`	`444`	`mysqli_result object is already closed`
`445`	`445`	`done!`
Original file line number	Diff line number	Diff line change
`@@ -432,6 +432,6 @@ array(1) {`
`432`	`432`	`string(1) "1"`
`433`	`433`	`}`
`434`	`434`	`}`
`435`		`-mysqli_result::fetch_all(): Argument #1 ($mode) must be one of MYSQLI_FETCH_NUM, MYSQLI_FETCH_ASSOC, or MYSQLI_FETCH_BOTH`
	`435`	`+mysqli_result::fetch_all(): Argument #1 ($mode) must be one of MYSQLI_NUM, MYSQLI_ASSOC, or MYSQLI_BOTH`
`436`	`436`	`mysqli_result object is already closed`
`437`	`437`	`done!`