Skip to content

Commit 19dd7af

Browse files
committed
Rename mysqli parameters to be more logical.
1 parent 0741858 commit 19dd7af

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

ext/mysqli/mysqli.stub.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function __construct(
2121
* @return bool
2222
* @alias mysqli_autocommit
2323
*/
24-
public function autocommit(bool $mode) {}
24+
public function autocommit(bool $autocommit) {}
2525

2626
/**
2727
* @return bool
@@ -337,7 +337,7 @@ public function fetch_fields() {}
337337
* @return object|false
338338
* @alias mysqli_fetch_field_direct
339339
*/
340-
public function fetch_field_direct(int $field_nr) {}
340+
public function fetch_field_direct(int $field_num) {}
341341

342342
#if defined(MYSQLI_USE_MYSQLND)
343343
/**
@@ -375,7 +375,7 @@ public function fetch_row() {}
375375
* @return bool
376376
* @alias mysqli_field_seek
377377
*/
378-
public function field_seek(int $field_nr) {}
378+
public function field_seek(int $field_num) {}
379379

380380
/**
381381
* @return void
@@ -400,7 +400,7 @@ public function attr_get(int $attr) {}
400400
* @return bool
401401
* @alias mysqli_stmt_attr_set
402402
*/
403-
public function attr_set(int $attr, int $mode_in) {}
403+
public function attr_set(int $attr, int $mode) {}
404404

405405
/**
406406
* @return bool
@@ -474,7 +474,7 @@ public function num_rows() {}
474474
* @return bool
475475
* @alias mysqli_stmt_send_long_data
476476
*/
477-
public function send_long_data(int $param_nr, string $data) {}
477+
public function send_long_data(int $param_num, string $data) {}
478478

479479
/**
480480
* @return void
@@ -522,7 +522,7 @@ final class mysqli_sql_exception extends RuntimeException
522522

523523
function mysqli_affected_rows(mysqli $mysql_link): int|string {}
524524

525-
function mysqli_autocommit(mysqli $mysql_link, bool $mode): bool {}
525+
function mysqli_autocommit(mysqli $mysql_link, bool $autocommit): bool {}
526526

527527
function mysqli_begin_transaction(mysqli $mysql_link, int $flags = 0, ?string $name = null): bool {}
528528

@@ -586,7 +586,7 @@ function mysqli_fetch_row(mysqli_result $mysqli_result): ?array {}
586586

587587
function mysqli_field_count(mysqli $mysqli_link): int {}
588588

589-
function mysqli_field_seek(mysqli_result $mysqli_result, int $field_nr): bool {}
589+
function mysqli_field_seek(mysqli_result $mysqli_result, int $field_num): bool {}
590590

591591
function mysqli_field_tell(mysqli_result $mysqli_result): int {}
592592

@@ -682,7 +682,7 @@ function mysqli_stmt_affected_rows(mysqli_stmt $mysql_stmt): int|string {}
682682

683683
function mysqli_stmt_attr_get(mysqli_stmt $mysql_stmt, int $attr): int {}
684684

685-
function mysqli_stmt_attr_set(mysqli_stmt $mysql_stmt, int $attr, int $mode_in): bool {}
685+
function mysqli_stmt_attr_set(mysqli_stmt $mysql_stmt, int $attr, int $mode): bool {}
686686

687687
function mysqli_stmt_bind_param(mysqli_stmt $mysql_stmt, string $types, mixed &...$vars): bool {}
688688

@@ -730,7 +730,7 @@ function mysqli_stmt_reset(mysqli_stmt $mysql_stmt): bool {}
730730

731731
function mysqli_stmt_result_metadata(mysqli_stmt $mysql_stmt): mysqli_result|false {}
732732

733-
function mysqli_stmt_send_long_data(mysqli_stmt $mysql_stmt, int $param_nr, string $data): bool {}
733+
function mysqli_stmt_send_long_data(mysqli_stmt $mysql_stmt, int $param_num, string $data): bool {}
734734

735735
function mysqli_stmt_store_result(mysqli_stmt $mysql_stmt): bool {}
736736

ext/mysqli/mysqli_arginfo.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 7657a5373cc27d878b1ac1f11d371f77fe243a6a */
2+
* Stub hash: ec11721e215a3196ec438f4fd83ad50d7f2dec0f */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
55
ZEND_ARG_OBJ_INFO(0, mysql_link, mysqli, 0)
66
ZEND_END_ARG_INFO()
77

88
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_autocommit, 0, 2, _IS_BOOL, 0)
99
ZEND_ARG_OBJ_INFO(0, mysql_link, mysqli, 0)
10-
ZEND_ARG_TYPE_INFO(0, mode, _IS_BOOL, 0)
10+
ZEND_ARG_TYPE_INFO(0, autocommit, _IS_BOOL, 0)
1111
ZEND_END_ARG_INFO()
1212

1313
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_begin_transaction, 0, 1, _IS_BOOL, 0)
@@ -128,7 +128,7 @@ ZEND_END_ARG_INFO()
128128

129129
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_field_seek, 0, 2, _IS_BOOL, 0)
130130
ZEND_ARG_OBJ_INFO(0, mysqli_result, mysqli_result, 0)
131-
ZEND_ARG_TYPE_INFO(0, field_nr, IS_LONG, 0)
131+
ZEND_ARG_TYPE_INFO(0, field_num, IS_LONG, 0)
132132
ZEND_END_ARG_INFO()
133133

134134
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_field_tell, 0, 1, IS_LONG, 0)
@@ -304,7 +304,7 @@ ZEND_END_ARG_INFO()
304304
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_stmt_attr_set, 0, 3, _IS_BOOL, 0)
305305
ZEND_ARG_OBJ_INFO(0, mysql_stmt, mysqli_stmt, 0)
306306
ZEND_ARG_TYPE_INFO(0, attr, IS_LONG, 0)
307-
ZEND_ARG_TYPE_INFO(0, mode_in, IS_LONG, 0)
307+
ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
308308
ZEND_END_ARG_INFO()
309309

310310
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_stmt_bind_param, 0, 2, _IS_BOOL, 0)
@@ -390,7 +390,7 @@ ZEND_END_ARG_INFO()
390390

391391
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_stmt_send_long_data, 0, 3, _IS_BOOL, 0)
392392
ZEND_ARG_OBJ_INFO(0, mysql_stmt, mysqli_stmt, 0)
393-
ZEND_ARG_TYPE_INFO(0, param_nr, IS_LONG, 0)
393+
ZEND_ARG_TYPE_INFO(0, param_num, IS_LONG, 0)
394394
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
395395
ZEND_END_ARG_INFO()
396396

@@ -448,7 +448,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli___construct, 0, 0, 0)
448448
ZEND_END_ARG_INFO()
449449

450450
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_autocommit, 0, 0, 1)
451-
ZEND_ARG_TYPE_INFO(0, mode, _IS_BOOL, 0)
451+
ZEND_ARG_TYPE_INFO(0, autocommit, _IS_BOOL, 0)
452452
ZEND_END_ARG_INFO()
453453

454454
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_begin_transaction, 0, 0, 0)
@@ -613,7 +613,7 @@ ZEND_END_ARG_INFO()
613613
#define arginfo_class_mysqli_result_fetch_fields arginfo_class_mysqli_character_set_name
614614

615615
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_result_fetch_field_direct, 0, 0, 1)
616-
ZEND_ARG_TYPE_INFO(0, field_nr, IS_LONG, 0)
616+
ZEND_ARG_TYPE_INFO(0, field_num, IS_LONG, 0)
617617
ZEND_END_ARG_INFO()
618618

619619
#if defined(MYSQLI_USE_MYSQLND)
@@ -653,7 +653,7 @@ ZEND_END_ARG_INFO()
653653

654654
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_stmt_attr_set, 0, 0, 2)
655655
ZEND_ARG_TYPE_INFO(0, attr, IS_LONG, 0)
656-
ZEND_ARG_TYPE_INFO(0, mode_in, IS_LONG, 0)
656+
ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
657657
ZEND_END_ARG_INFO()
658658

659659
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_stmt_bind_param, 0, 0, 1)
@@ -688,7 +688,7 @@ ZEND_END_ARG_INFO()
688688
#define arginfo_class_mysqli_stmt_num_rows arginfo_class_mysqli_character_set_name
689689

690690
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_stmt_send_long_data, 0, 0, 2)
691-
ZEND_ARG_TYPE_INFO(0, param_nr, IS_LONG, 0)
691+
ZEND_ARG_TYPE_INFO(0, param_num, IS_LONG, 0)
692692
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
693693
ZEND_END_ARG_INFO()
694694

0 commit comments

Comments
 (0)