Skip to content

Commit 56814d8

Browse files
tvlooytvlooy
committed
review
1 parent 1f389d2 commit 56814d8

File tree

2 files changed

+71
-78
lines changed

2 files changed

+71
-78
lines changed

‎ext/mysqli/mysqli.stub.php

Lines changed: 47 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function begin_transaction(int $flags = -1, string $name = UNKNOWN);
2525
/** @return bool */
2626
public function change_user(string $user, string $password, ?string $database);
2727

28-
/** @return string */
28+
/** @return string|null */
2929
public function character_set_name();
3030

3131
/** @return bool */
@@ -53,13 +53,13 @@ public function debug(string $debug_options);
5353
/** @return object|null */
5454
public function get_charset();
5555

56-
/** @return string */
56+
/** @return string|null */
5757
public function get_client_info();
5858

5959
/** @return array */
6060
public function get_connection_stats();
6161

62-
/** @return string */
62+
/** @return string|null */
6363
public function get_server_info();
6464

6565
/** @return mysqli_warning|false */
@@ -68,8 +68,8 @@ public function get_warnings();
6868
/** @return mysqli|false */
6969
public function init();
7070

71-
/** @return bool|null */
72-
public function kill(int $connection_id): bool|null;
71+
/** @return bool */
72+
public function kill(int $connection_id);
7373

7474
/** @return bool */
7575
public function multi_query(string $query);
@@ -86,13 +86,13 @@ public function ping();
8686
/** @return int|false */
8787
public static function poll(?array &$read, ?array &$write, array &$error, int $sec, int $usec = 0);
8888

89-
/** @return mysqli_stmt|null|false */
89+
/** @return mysqli_stmt|false */
9090
public function prepare(string $query);
9191

92-
/** @return mysqli_result|null|bool */
92+
/** @return mysqli_result|bool */
9393
public function query(string $query, int $resultmode = MYSQLI_STORE_RESULT);
9494

95-
/** @return mysqli|null|bool */
95+
/** @return mysqli|bool */
9696
public function real_connect(
9797
?string $host = null,
9898
?string $user = null,
@@ -103,48 +103,48 @@ public function real_connect(
103103
int $flags = 0
104104
);
105105

106-
/** @return string|null|bool */
106+
/** @return string */
107107
public function real_escape_string(string $string_to_escape);
108108

109109
/** @return mysqli_result|bool */
110110
public function reap_async_query();
111111

112-
/** @return string|null */
112+
/** @return string */
113113
public function escape_string(string $string_to_escape);
114114

115-
/** @return bool|null */
115+
/** @return bool */
116116
public function real_query(string $query);
117117

118-
/** @return bool|null */
118+
/** @return bool */
119119
public function release_savepoint(string $name);
120120

121121
/** @return bool */
122122
public function rollback(?int $flags = 0, ?string $name = '');
123123

124-
/** @return bool|null */
124+
/** @return bool */
125125
public function savepoint(string $name);
126126

127-
/** @return bool|null */
127+
/** @return bool */
128128
public function select_db(string $database);
129129

130-
/** @return bool|null */
130+
/** @return bool */
131131
public function set_charset(string $charset);
132132

133133
/**
134134
* @param mixed $value
135135
*
136-
* @return bool|null
136+
* @return bool
137137
*/
138138
public function options(int $option, $value);
139139

140140
/**
141141
* @param mixed $value
142142
*
143-
* @return bool|null
143+
* @return bool
144144
*/
145145
public function set_opt(int $option, $value);
146146

147-
/** @return bool|null */
147+
/** @return bool */
148148
public function ssl_set(
149149
string $key,
150150
string $cert,
@@ -168,7 +168,7 @@ public function thread_safe();
168168
/** @return mysqli_result|false */
169169
public function use_result();
170170

171-
/** @return bool|null */
171+
/** @return bool */
172172
public function refresh(int $options);
173173
}
174174

@@ -303,7 +303,7 @@ function mysqli_begin_transaction(mysqli $mysql_link, int $flags = -1, string $n
303303

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

306-
function mysqli_character_set_name(mysqli $mysql_link): string {}
306+
function mysqli_character_set_name(mysqli $mysql_link): string|null {}
307307

308308
function mysqli_close(mysqli $mysql_link): bool {}
309309

@@ -375,7 +375,7 @@ function mysqli_get_client_stats(): array {}
375375

376376
function mysqli_get_charset(mysqli $mysqli_link): object|null {}
377377

378-
function mysqli_get_client_info(?mysqli $mysqli_link = null): string {}
378+
function mysqli_get_client_info(?mysqli $mysqli_link = null): string|null {}
379379

380380
function mysqli_get_client_version(): int {}
381381

@@ -385,46 +385,42 @@ function mysqli_get_host_info(mysqli $mysqli_link): string|bool {}
385385

386386
function mysqli_get_proto_info(mysqli $mysqli_link): int|bool {}
387387

388-
function mysqli_get_server_info(mysqli $mysqli_link): string {}
388+
function mysqli_get_server_info(mysqli $mysqli_link): string|null {}
389389

390390
function mysqli_get_server_version(mysqli $mysqli_link): int|bool {}
391391

392-
function mysqli_get_warnings(mysqli $mysqli_link): mysqli_warning|null|false {}
392+
function mysqli_get_warnings(mysqli $mysqli_link): mysqli_warning|false {}
393393

394394
function mysqli_init(): mysqli|false {}
395395

396396
function mysqli_info(mysqli $mysqli_link): string|bool|null {}
397397

398398
function mysqli_insert_id(mysqli $mysqli_link): int|bool|string {}
399399

400-
function mysqli_kill(mysqli $mysqli_link, int $connection_id): bool|null {}
400+
function mysqli_kill(mysqli $mysqli_link, int $connection_id): bool {}
401401

402-
function mysqli_more_results(mysqli $mysqli_link): bool|null {}
402+
function mysqli_more_results(mysqli $mysqli_link): bool {}
403403

404-
function mysqli_multi_query(mysqli $mysqli_link, string $query): bool|null {}
404+
function mysqli_multi_query(mysqli $mysqli_link, string $query): bool {}
405405

406-
function mysqli_next_result(mysqli $mysqli_link): bool|null {}
406+
function mysqli_next_result(mysqli $mysqli_link): bool {}
407407

408408
function mysqli_num_fields(mysqli_result $mysql_result): int|bool {}
409409

410410
function mysqli_num_rows(mysqli_result $mysqli_result): int|string|bool {}
411411

412412
/** @param mixed $value */
413-
function mysqli_options(mysqli $mysqli_link, int $option, $value): bool|null {}
413+
function mysqli_options(mysqli $mysqli_link, int $option, $value): bool {}
414414

415-
function mysqli_ping(mysqli $mysqli_link): bool|null {}
415+
function mysqli_ping(mysqli $mysqli_link): bool {}
416416

417417
function mysqli_poll(?array &$read, ?array &$write, array &$error, int $sec, int $usec = 0): int|false {}
418418

419-
function mysqli_prepare(mysqli $mysqli_link, string $query): mysqli_stmt|null|false {}
419+
function mysqli_prepare(mysqli $mysqli_link, string $query): mysqli_stmt|false {}
420420

421421
function mysqli_report(int $flags): bool {}
422422

423-
function mysqli_query(
424-
mysqli $mysqli_link,
425-
string $query,
426-
int $resultmode = MYSQLI_STORE_RESULT
427-
): mysqli_result|null|bool {}
423+
function mysqli_query(mysqli $mysqli_link, string $query, int $resultmode = MYSQLI_STORE_RESULT): mysqli_result|bool {}
428424

429425
function mysqli_real_connect(
430426
mysqli $mysqli_link,
@@ -434,23 +430,23 @@ function mysqli_real_connect(
434430
?string $database = null,
435431
?int $port = null,
436432
int $flags = 0
437-
): mysqli|null|bool {}
433+
): mysqli|bool {}
438434

439-
function mysqli_real_escape_string(mysqli $mysqli_link, string $string_to_escape): string|null|bool {}
435+
function mysqli_real_escape_string(mysqli $mysqli_link, string $string_to_escape): string {}
440436

441-
function mysqli_real_query(mysqli $mysqli_link, string $query): bool|null {}
437+
function mysqli_real_query(mysqli $mysqli_link, string $query): bool {}
442438

443-
function mysqli_reap_async_query(mysqli $mysqli_link): mysqli_result|null|bool {}
439+
function mysqli_reap_async_query(mysqli $mysqli_link): mysqli_result|bool {}
444440

445-
function mysqli_release_savepoint(mysqli $mysqli_link, string $name): bool|null {}
441+
function mysqli_release_savepoint(mysqli $mysqli_link, string $name): bool {}
446442

447-
function mysqli_rollback(mysqli $mysqli_link, ?int $flags = 0, ?string $name = ''): bool|null {}
443+
function mysqli_rollback(mysqli $mysqli_link, ?int $flags = 0, ?string $name = ''): bool {}
448444

449-
function mysqli_savepoint(mysqli $mysqli_link, string $name): bool|null {}
445+
function mysqli_savepoint(mysqli $mysqli_link, string $name): bool {}
450446

451-
function mysqli_select_db(mysqli $mysqli_link, string $dbname): bool|null {}
447+
function mysqli_select_db(mysqli $mysqli_link, string $dbname): bool {}
452448

453-
function mysqli_set_charset(mysqli $mysqli_link, string $charset): bool|null {}
449+
function mysqli_set_charset(mysqli $mysqli_link, string $charset): bool {}
454450

455451
function mysqli_stmt_affected_rows(mysqli_stmt $mysql_stmt): int|bool {}
456452

@@ -486,7 +482,7 @@ function mysqli_stmt_get_result(mysqli_stmt $mysql_stmt): mysqli_result|false {}
486482

487483
function mysqli_stmt_get_warnings(mysqli_stmt $mysql_stmt): mysqli_warning|null|false {}
488484

489-
function mysqli_stmt_init(mysqli $mysql_link): mysqli_stmt|null|false {}
485+
function mysqli_stmt_init(mysqli $mysql_link): mysqli_stmt|false {}
490486

491487
function mysqli_stmt_insert_id(mysqli_stmt $mysql_stmt): int|bool {}
492488

@@ -519,23 +515,23 @@ function mysqli_ssl_set(
519515
string $certificate_authority,
520516
string $certificate_authority_path,
521517
string $cipher
522-
): bool|null {}
518+
): bool {}
523519

524-
function mysqli_stat(mysqli $mysql_link): string|null|false {}
520+
function mysqli_stat(mysqli $mysql_link): string|false {}
525521

526522
function mysqli_store_result(mysqli $mysql_link, int $flags = 0): mysqli_result|false {}
527523

528524
function mysqli_thread_id(mysqli $mysql_link): int|bool {}
529525

530526
function mysqli_thread_safe(): bool {}
531527

532-
function mysqli_use_result(mysqli $mysql_link): mysqli_result|null|false {}
528+
function mysqli_use_result(mysqli $mysql_link): mysqli_result|false {}
533529

534530
function mysqli_warning_count(mysqli $mysql_link): int|bool {}
535531

536-
function mysqli_refresh(mysqli $mysqli_link, int $options): bool|null {}
532+
function mysqli_refresh(mysqli $mysqli_link, int $options): bool {}
537533

538-
function mysqli_escape_string(mysqli $mysqli_link, string $string_to_escape): string|null {}
534+
function mysqli_escape_string(mysqli $mysqli_link, string $string_to_escape): string {}
539535

540536
/** @param mixed $value */
541-
function mysqli_set_opt(mysqli $mysqli_link, int $option, $value): bool|null {}
537+
function mysqli_set_opt(mysqli $mysqli_link, int $option, $value): bool {}

0 commit comments

Comments
 (0)