Skip to content

Commit ceb0951

Browse files
committed
mysqli_get_client_info() cannot return null
This method is already deprecated
1 parent 9f6ee9f commit ceb0951

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

ext/mysqli/mysqli.stub.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public function debug(string $options) {}
8787
public function get_charset() {}
8888

8989
/**
90-
* @return string|null
90+
* @return string
9191
* @alias mysqli_get_client_info
9292
*/
9393
public function get_client_info() {}
@@ -601,7 +601,7 @@ function mysqli_get_client_stats(): array {}
601601

602602
function mysqli_get_charset(mysqli $mysql): ?object {}
603603

604-
function mysqli_get_client_info(?mysqli $mysql = null): ?string {}
604+
function mysqli_get_client_info(?mysqli $mysql = null): string {}
605605

606606
function mysqli_get_client_version(): int {}
607607

ext/mysqli/mysqli_arginfo.h

Lines changed: 2 additions & 2 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: b801127d89f2a392476c71bef16f43c78d82dfd7 */
2+
* Stub hash: 04fabe8f7b61ccf36e8ed383396bd4b56e11dd25 */
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)
@@ -146,7 +146,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_get_charset, 0, 1, IS_OBJ
146146
ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)
147147
ZEND_END_ARG_INFO()
148148

149-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_get_client_info, 0, 0, IS_STRING, 1)
149+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_get_client_info, 0, 0, IS_STRING, 0)
150150
ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, mysql, mysqli, 1, "null")
151151
ZEND_END_ARG_INFO()
152152

ext/opcache/Optimizer/zend_func_info.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ static const func_info_t func_infos[] = {
475475
F1("mysqli_fetch_field_direct", MAY_BE_FALSE | MAY_BE_OBJECT),
476476
F1("mysqli_fetch_lengths", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG),
477477
F1("mysqli_fetch_row", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ANY),
478-
F1("mysqli_get_client_info", MAY_BE_NULL | MAY_BE_STRING),
478+
F1("mysqli_get_client_info", MAY_BE_STRING),
479479
F1("mysqli_get_host_info", MAY_BE_STRING),
480480
F1("mysqli_get_server_info", MAY_BE_STRING),
481481
F1("mysqli_info", MAY_BE_NULL | MAY_BE_STRING),

0 commit comments

Comments
 (0)