From 8a5b9cbc9f5b44c8e7dca3de27d1b258b88b2a34 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 9 Apr 2020 16:42:26 +0200 Subject: [PATCH] Fix mysqli_get_client_info() stub The dummy link argument is not nullable. --- ext/mysqli/mysqli.stub.php | 2 +- ext/mysqli/mysqli_arginfo.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/mysqli/mysqli.stub.php b/ext/mysqli/mysqli.stub.php index 58132a198d..9a54529609 100644 --- a/ext/mysqli/mysqli.stub.php +++ b/ext/mysqli/mysqli.stub.php @@ -360,7 +360,7 @@ function mysqli_get_client_stats(): array {} function mysqli_get_charset(mysqli $mysqli_link): ?object {} -function mysqli_get_client_info(?mysqli $mysqli_link = null): ?string {} +function mysqli_get_client_info(mysqli $mysqli_link = UNKNOWN): ?string {} function mysqli_get_client_version(): int {} diff --git a/ext/mysqli/mysqli_arginfo.h b/ext/mysqli/mysqli_arginfo.h index 90ac950f01..7ab37584fb 100644 --- a/ext/mysqli/mysqli_arginfo.h +++ b/ext/mysqli/mysqli_arginfo.h @@ -144,7 +144,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_get_charset, 0, 1, IS_OBJ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_get_client_info, 0, 0, IS_STRING, 1) - ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, mysqli_link, mysqli, 1, "null") + ZEND_ARG_OBJ_INFO(0, mysqli_link, mysqli, 0) ZEND_END_ARG_INFO() #define arginfo_mysqli_get_client_version arginfo_mysqli_connect_errno -- 2.50.1