Skip to content

Commit 20d7e40

Browse files
committed
Fix tests.
1 parent 4617aca commit 20d7e40

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

ext/mysqli/mysqli.stub.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public function init() {}
120120
* @return bool
121121
* @alias mysqli_kill
122122
*/
123-
public function kill(int $mysql_id) {}
123+
public function kill(int $process_id) {}
124124

125125
/**
126126
* @return bool
@@ -622,7 +622,7 @@ function mysqli_info(mysqli $mysql): ?string {}
622622

623623
function mysqli_insert_id(mysqli $mysql): int|string {}
624624

625-
function mysqli_kill(mysqli $mysql, int $mysql_id): bool {}
625+
function mysqli_kill(mysqli $mysql, int $process_id): bool {}
626626

627627
function mysqli_more_results(mysqli $mysql): bool {}
628628

ext/mysqli/mysqli_arginfo.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 01ca9d1c73615c31b8a1c77b1173fcad277b80f5 */
2+
* Stub hash: e3b177a829ccbc6b36d008530683ee2e33670eaf */
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, mysqli, 0)
@@ -182,7 +182,7 @@ ZEND_END_ARG_INFO()
182182

183183
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_kill, 0, 2, _IS_BOOL, 0)
184184
ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)
185-
ZEND_ARG_TYPE_INFO(0, mysql_id, IS_LONG, 0)
185+
ZEND_ARG_TYPE_INFO(0, process_id, IS_LONG, 0)
186186
ZEND_END_ARG_INFO()
187187

188188
#define arginfo_mysqli_more_results arginfo_mysqli_close
@@ -480,7 +480,7 @@ ZEND_END_ARG_INFO()
480480
#define arginfo_class_mysqli_init arginfo_class_mysqli_character_set_name
481481

482482
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_kill, 0, 0, 1)
483-
ZEND_ARG_TYPE_INFO(0, mysql_id, IS_LONG, 0)
483+
ZEND_ARG_TYPE_INFO(0, process_id, IS_LONG, 0)
484484
ZEND_END_ARG_INFO()
485485

486486
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_multi_query, 0, 0, 1)

ext/mysqli/tests/mysqli_kill.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ require_once('skipifconnectfailure.inc');
8080
require_once("clean_table.inc");
8181
?>
8282
--EXPECTF--
83-
mysqli_kill(): Argument #2 ($connection_id) must be greater than 0
83+
mysqli_kill(): Argument #2 ($process_id) must be greater than 0
8484
string(%d) "%s"
8585
bool(false)
8686
object(mysqli)#%d (%d) {
@@ -131,10 +131,10 @@ object(mysqli)#%d (%d) {
131131
["warning_count"]=>
132132
int(0)
133133
}
134-
mysqli_kill(): Argument #2 ($connection_id) must be greater than 0
134+
mysqli_kill(): Argument #2 ($process_id) must be greater than 0
135135
array(1) {
136136
["id"]=>
137137
string(1) "1"
138138
}
139-
mysqli_kill(): Argument #2 ($connection_id) must be greater than 0
139+
mysqli_kill(): Argument #2 ($process_id) must be greater than 0
140140
done!

ext/mysqli/tests/mysqli_poll.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ if (!$IS_MYSQLND)
114114
print "done!";
115115
?>
116116
--EXPECTF--
117-
mysqli_poll(): Argument #4 ($sec) must be greater than or equal to 0
118-
mysqli_poll(): Argument #5 ($usec) must be greater than or equal to 0
117+
mysqli_poll(): Argument #4 ($seconds) must be greater than or equal to 0
118+
mysqli_poll(): Argument #5 ($microseconds) must be greater than or equal to 0
119119
[012 + 6] Rejecting thread %d: 0/
120120
[013 + 6] Rejecting thread %d: 0/
121121
[014 + 6] Rejecting thread %d: 0/

ext/mysqli/tests/mysqli_report.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,12 @@ require_once('skipifconnectfailure.inc');
287287
Warning: mysqli_multi_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'BAR; FOO' at line 1 in %s on line %d
288288

289289
Warning: mysqli_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d
290-
mysqli_kill(): Argument #2 ($connection_id) must be greater than 0
290+
mysqli_kill(): Argument #2 ($process_id) must be greater than 0
291291

292292
Warning: mysqli_prepare(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d
293293

294294
Warning: mysqli_real_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d
295-
mysqli_kill(): Argument #2 ($connection_id) must be greater than 0
295+
mysqli_kill(): Argument #2 ($process_id) must be greater than 0
296296

297297
Warning: mysqli_stmt_prepare(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'FOO' at line 1 in %s on line %d
298298
[013] Access denied for user '%s'@'%s' (using password: YES)

0 commit comments

Comments
 (0)