Nits

Author: Girgias

ext/mysqli/mysqli.stub.php

@@ -682,7 +682,7 @@ function mysqli_stmt_bind_result(mysqli_stmt $mysql_stmt, mixed &...$vars): bool
 
 function mysqli_stmt_close(mysqli_stmt $mysql_stmt): bool {}
 
-function mysqli_stmt_data_seek(mysqli_stmt $mysql_stmt, int $offset): ?bool {}
+function mysqli_stmt_data_seek(mysqli_stmt $mysql_stmt, int $offset): void {}
 
 function mysqli_stmt_errno(mysqli_stmt $mysql_stmt): int {}
 

ext/mysqli/mysqli_api.c

@@ -739,7 +739,11 @@ PHP_FUNCTION(mysqli_data_seek)
 	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
 
 	if (mysqli_result_is_unbuffered(result)) {
-		zend_throw_error(NULL, "Function cannot be used with MYSQL_USE_RESULT");
+		if (getThis()) {
+			zend_throw_error(NULL, "mysqli_result::data_seek() cannot be used with MYSQL_USE_RESULT");
+		} else {
+			zend_throw_error(NULL, "mysqli_data_seek() cannot be used with MYSQL_USE_RESULT");
+		}
 		RETURN_THROWS();
 	}
 
@@ -1622,7 +1626,7 @@ PHP_FUNCTION(mysqli_num_rows)
 	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
 
 	if (mysqli_result_is_unbuffered_and_not_everything_is_fetched(result)) {
-		zend_throw_error(NULL, "Function cannot be used with MYSQL_USE_RESULT");
+		zend_throw_error(NULL, "mysqli_num_rows() cannot be used with MYSQL_USE_RESULT");
 		RETURN_THROWS();
 	}
 

ext/mysqli/mysqli_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: f2ff49a9cefcd31a990989b1c1ff525f9fb4d3de */
+ * Stub hash: beb821b6e0b26f798d88f7b726a39084d856251f */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
 	ZEND_ARG_OBJ_INFO(0, mysql_link, mysqli, 0)
@@ -309,7 +309,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_mysqli_stmt_close arginfo_mysqli_stmt_execute
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_stmt_data_seek, 0, 2, _IS_BOOL, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_stmt_data_seek, 0, 2, IS_VOID, 0)
 	ZEND_ARG_OBJ_INFO(0, mysql_stmt, mysqli_stmt, 0)
 	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
 ZEND_END_ARG_INFO()

ext/mysqli/mysqli_nonapi.c

@@ -640,7 +640,7 @@ PHP_FUNCTION(mysqli_query)
 	) {
 		zend_argument_value_error(ERROR_ARG_POS(3), "must be either MYSQLI_USE_RESULT, or MYSQLI_STORE_RESULT"
 			#ifdef MYSQLI_USE_MYSQLND
-				" with MYSQLI_ASYNC as an optional bitmask flags"
+				" with MYSQLI_ASYNC as an optional bitmask flag"
 			#endif
 		);
 		RETURN_THROWS();
@@ -1167,7 +1167,7 @@ PHP_FUNCTION(mysqli_begin_transaction)
 	}
 	MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 	if (flags < 0) {
-		zend_argument_value_error(ERROR_ARG_POS(2), "must be one of the MYSQLI_TRANS_* constant");
+		zend_argument_value_error(ERROR_ARG_POS(2), "must be one of the MYSQLI_TRANS_* constants");
 		RETURN_THROWS();
 	}
 	if (!name_len) {

ext/mysqli/tests/bug55582.phpt

@@ -34,12 +34,12 @@ require_once("connect.inc");
 ?>
 --EXPECT--
 bool(true)
-Function cannot be used with MYSQL_USE_RESULT
+mysqli_num_rows() cannot be used with MYSQL_USE_RESULT
 array(1) {
   [1]=>
   string(1) "1"
 }
-Function cannot be used with MYSQL_USE_RESULT
+mysqli_num_rows() cannot be used with MYSQL_USE_RESULT
 NULL
 int(1)
 done

ext/mysqli/tests/mysqli_begin_transaction.phpt

@@ -101,5 +101,5 @@ if (!have_innodb($link))
 ?>
 --EXPECT--
 NULL
-mysqli_begin_transaction(): Argument #2 ($flags) must be one of the MYSQLI_TRANS_* constant
+mysqli_begin_transaction(): Argument #2 ($flags) must be one of the MYSQLI_TRANS_* constants
 done!

ext/mysqli/tests/mysqli_data_seek.phpt

@@ -66,6 +66,6 @@ require_once('skipifconnectfailure.inc');
 ?>
 --EXPECT--
 mysqli_data_seek(): Argument #2 ($offset) must be greater than or equal to 0
-Function cannot be used with MYSQL_USE_RESULT
+mysqli_data_seek() cannot be used with MYSQL_USE_RESULT
 mysqli_result object is already closed
 done!

ext/mysqli/tests/mysqli_data_seek_oo.phpt

@@ -78,6 +78,6 @@ require_once('skipifconnectfailure.inc');
 --EXPECT--
 mysqli_result object is already closed
 mysqli_result::data_seek(): Argument #1 ($offset) must be greater than or equal to 0
-Function cannot be used with MYSQL_USE_RESULT
+mysqli_result::data_seek() cannot be used with MYSQL_USE_RESULT
 mysqli_result object is already closed
 done!

ext/mysqli/tests/mysqli_num_rows.phpt

@@ -80,5 +80,5 @@ mysqli_result object is already closed
 mysqli_result object is already closed
 mysqli_result object is already closed
 run_tests.php don't fool me with your 'ungreedy' expression '.+?'!
-Function cannot be used with MYSQL_USE_RESULT
+mysqli_num_rows() cannot be used with MYSQL_USE_RESULT
 done!

ext/mysqli/tests/mysqli_query.phpt

@@ -126,6 +126,6 @@ array(1) {
   string(1) "a"
 }
 string(1) "a"
-mysqli_query(): Argument #3 ($result_mode) must be either MYSQLI_USE_RESULT, or MYSQLI_STORE_RESULT with MYSQLI_ASYNC as an optional bitmask flags
+mysqli_query(): Argument #3 ($result_mode) must be either MYSQLI_USE_RESULT, or MYSQLI_STORE_RESULT with MYSQLI_ASYNC as an optional bitmask flag
 mysqli object is already closed
 done!

ext/mysqli/tests/mysqli_use_result.phpt

@@ -56,6 +56,6 @@ require_once('skipifconnectfailure.inc');
 	require_once("clean_table.inc");
 ?>
 --EXPECT--
-Function cannot be used with MYSQL_USE_RESULT
+mysqli_data_seek() cannot be used with MYSQL_USE_RESULT
 mysqli object is already closed
 done!