bdnugget/php-src
1
0 Fork 0
mirror of https://github.com/bdnugget/php-src.git synced 2026-11-07 09:17:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0'

Browse Source 
* mysqli_get_client_info() cannot return null
This commit is contained in:
Máté Kocsis committed 2021-05-26 17:49:39 +02:00
2 parents 62f7c0a2d6 ceb0951fa5
commit 6af5b369d7
3 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Zend/Optimizer/zend_func_info.c
+1 -1
View File
@@ -451,7 +451,7 @@ static const func_info_t func_infos[] = {
F1("mysqli_fetch_field_direct", MAY_BE_FALSE | MAY_BE_OBJECT),
F1("mysqli_fetch_lengths", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG),
F1("mysqli_fetch_row", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ANY),
F1("mysqli_get_client_info", MAY_BE_NULL | MAY_BE_STRING),
F1("mysqli_get_client_info", MAY_BE_STRING),
F1("mysqli_get_host_info", MAY_BE_STRING),
F1("mysqli_get_server_info", MAY_BE_STRING),
F1("mysqli_info", MAY_BE_NULL | MAY_BE_STRING),
ext/mysqli/mysqli.stub.php
+1 -1
View File
@@ -683,7 +683,7 @@ function mysqli_get_client_stats(): array {}
function mysqli_get_charset(mysqli $mysql): ?object {}
function mysqli_get_client_info(?mysqli $mysql = null): ?string {}
function mysqli_get_client_info(?mysqli $mysql = null): string {}
function mysqli_get_client_version(): int {}
ext/mysqli/mysqli_arginfo.h
+2 -2
View File
@@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: c9f340f48c4414f1b0cfa48ac9b7167a0a6991ef */
* Stub hash: 2f96f80badee5623220fd720e91aec7795e32723 */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)
@@ -150,7 +150,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_get_charset, 0, 1, IS_OBJ
ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_get_client_info, 0, 0, IS_STRING, 1)
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_get_client_info, 0, 0, IS_STRING, 0)
ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, mysql, mysqli, 1, "null")
ZEND_END_ARG_INFO()