Skip to content

Commit d5afeef

Browse files
Fix MySQLi tests
1 parent 175844c commit d5afeef

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

ext/mysqli/tests/mysqli_field_seek.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ Warning: mysqli_field_seek(): Invalid field offset in %s on line %d
218218
bool(false)
219219
bool(false)
220220

221-
Warning: mysqli_field_seek(): Invalid field offset in %s on line %d
222-
bool(false)
221+
Warning: mysqli_field_seek() expects parameter 2 to be long, double given in %s on line %d
222+
NULL
223223
bool(true)
224224
object(stdClass)#%d (13) {
225225
[%u|b%"name"]=>

ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ if (!function_exists('mysqli_stmt_get_result'))
6767
if (false !== ($tmp = $res->data_seek($res->num_rows + 1)))
6868
printf("[012] Expecting boolean/false got %s/%s\n", gettype($tmp), $tmp);
6969

70-
if (false !== ($tmp = $res->data_seek(PHP_INT_MAX + 1)))
71-
printf("[013] Expecting boolean/false got %s/%s\n", gettype($tmp), $tmp);
70+
if (NULL !== ($tmp = $res->data_seek(PHP_INT_MAX + 1)))
71+
printf("[013] Expecting NULL got %s/%s\n", gettype($tmp), $tmp);
7272

7373
for ($i = 0; $i < 100; $i++) {
7474
/* intentionally out of range! */
@@ -118,6 +118,7 @@ if (!function_exists('mysqli_stmt_get_result'))
118118
require_once("clean_table.inc");
119119
?>
120120
--EXPECTF--
121+
Warning: mysqli_result::data_seek() expects parameter 1 to be long, double given in %s on line %d
121122

122123
Warning: mysqli_data_seek(): Couldn't fetch mysqli_result in %s on line %d
123124

@@ -126,4 +127,4 @@ Warning: mysqli_result::fetch_array(): Couldn't fetch mysqli_result in %s on lin
126127
Warning: mysqli_data_seek(): Couldn't fetch mysqli_result in %s on line %d
127128

128129
Warning: mysqli_result::fetch_array(): Couldn't fetch mysqli_result in %s on line %d
129-
done!
130+
done!

ext/mysqli/tests/mysqli_stmt_send_long_data.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ require_once('skipifconnectfailure.inc');
8080
printf("[012] Expecting boolean/false, got %s/%s. [%d] %s\n",
8181
gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
8282

83-
if (false !== ($tmp = @mysqli_stmt_send_long_data($stmt, PHP_INT_MAX + 1, $blob)))
84-
printf("[013] Expecting boolean/false, got %s/%s. [%d] %s\n",
83+
if (NULL !== ($tmp = @mysqli_stmt_send_long_data($stmt, PHP_INT_MAX + 1, $blob)))
84+
printf("[013] Expecting NULL, got %s/%s. [%d] %s\n",
8585
gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
8686

8787
if (false !== ($tmp = mysqli_stmt_send_long_data($stmt, 999, $blob)))
@@ -132,4 +132,4 @@ require_once('skipifconnectfailure.inc');
132132
?>
133133
--EXPECTF--
134134
Warning: mysqli_stmt_send_long_data(): Invalid parameter number in %s on line %d
135-
done!
135+
done!

0 commit comments

Comments
 (0)