Skip to content

Commit 7a72e1c

Browse files
committed
Fix the default value of the $flags parameter of mysqli_begin_transaction()
1 parent 481c8c2 commit 7a72e1c

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

ext/mysqli/mysqli.stub.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function __construct(
1919
public function autocommit(bool $mode);
2020

2121
/** @return bool */
22-
public function begin_transaction(int $flags = -1, string $name = UNKNOWN);
22+
public function begin_transaction(int $flags = 0, string $name = UNKNOWN);
2323

2424
/** @return bool */
2525
public function change_user(string $user, string $password, ?string $database);
@@ -284,7 +284,7 @@ function mysqli_affected_rows(mysqli $mysql_link): int|string {}
284284

285285
function mysqli_autocommit(mysqli $mysql_link, bool $mode): bool {}
286286

287-
function mysqli_begin_transaction(mysqli $mysql_link, int $flags = -1, string $name = UNKNOWN): bool {}
287+
function mysqli_begin_transaction(mysqli $mysql_link, int $flags = 0, string $name = UNKNOWN): bool {}
288288

289289
function mysqli_change_user(mysqli $mysql_link, string $user, string $password, ?string $database): bool {}
290290

ext/mysqli/mysqli_arginfo.h

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ZEND_END_ARG_INFO()
1111

1212
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_begin_transaction, 0, 1, _IS_BOOL, 0)
1313
ZEND_ARG_OBJ_INFO(0, mysql_link, mysqli, 0)
14-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "-1")
14+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
1515
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
1616
ZEND_END_ARG_INFO()
1717

@@ -30,7 +30,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_close, 0, 1, _IS_BOOL, 0)
3030
ZEND_ARG_OBJ_INFO(0, mysql_link, mysqli, 0)
3131
ZEND_END_ARG_INFO()
3232

33-
#define arginfo_mysqli_commit arginfo_mysqli_begin_transaction
33+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_commit, 0, 1, _IS_BOOL, 0)
34+
ZEND_ARG_OBJ_INFO(0, mysql_link, mysqli, 0)
35+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "-1")
36+
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
37+
ZEND_END_ARG_INFO()
3438

3539
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_mysqli_connect, 0, 0, mysqli, MAY_BE_NULL|MAY_BE_FALSE)
3640
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, host, IS_STRING, 1, "null")
@@ -426,7 +430,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_autocommit, 0, 0, 1)
426430
ZEND_END_ARG_INFO()
427431

428432
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_begin_transaction, 0, 0, 0)
429-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "-1")
433+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
430434
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
431435
ZEND_END_ARG_INFO()
432436

@@ -441,7 +445,10 @@ ZEND_END_ARG_INFO()
441445

442446
#define arginfo_class_mysqli_close arginfo_class_mysqli_character_set_name
443447

444-
#define arginfo_class_mysqli_commit arginfo_class_mysqli_begin_transaction
448+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_commit, 0, 0, 0)
449+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "-1")
450+
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
451+
ZEND_END_ARG_INFO()
445452

446453
#define arginfo_class_mysqli_connect arginfo_class_mysqli___construct
447454

0 commit comments

Comments
 (0)