review

Author: tvlooy

ext/mysqli/mysqli.stub.php

@@ -25,7 +25,7 @@ public function begin_transaction(int $flags = -1, string $name = UNKNOWN);
     /** @return bool */
     public function change_user(string $user, string $password, ?string $database);
 
-    /** @return string */
+    /** @return string|null */
     public function character_set_name();
 
     /** @return bool */
@@ -53,13 +53,13 @@ public function debug(string $debug_options);
     /** @return object|null */
     public function get_charset();
 
-    /** @return string */
+    /** @return string|null */
     public function get_client_info();
 
     /** @return array */
     public function get_connection_stats();
 
-    /** @return string */
+    /** @return string|null */
     public function get_server_info();
 
     /** @return mysqli_warning|false */
@@ -303,7 +303,7 @@ function mysqli_begin_transaction(mysqli $mysql_link, int $flags = -1, string $n
 
 function mysqli_change_user(mysqli $mysql_link, string $user, string $password, ?string $database): bool {}
 
-function mysqli_character_set_name(mysqli $mysql_link): string {}
+function mysqli_character_set_name(mysqli $mysql_link): string|null {}
 
 function mysqli_close(mysqli $mysql_link): bool {}
 
@@ -375,7 +375,7 @@ function mysqli_get_client_stats(): array {}
 
 function mysqli_get_charset(mysqli $mysqli_link): object|null {}
 
-function mysqli_get_client_info(?mysqli $mysqli_link = null): string {}
+function mysqli_get_client_info(?mysqli $mysqli_link = null): string|null {}
 
 function mysqli_get_client_version(): int {}
 
@@ -385,7 +385,7 @@ function mysqli_get_host_info(mysqli $mysqli_link): string|bool {}
 
 function mysqli_get_proto_info(mysqli $mysqli_link): int|bool {}
 
-function mysqli_get_server_info(mysqli $mysqli_link): string {}
+function mysqli_get_server_info(mysqli $mysqli_link): string|null {}
 
 function mysqli_get_server_version(mysqli $mysqli_link): int|bool {}
 

ext/mysqli/mysqli_arginfo.h

@@ -268,7 +268,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_change_user, 0, 4, _IS_BO
 	ZEND_ARG_TYPE_INFO(0, database, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_character_set_name, 0, 1, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_character_set_name, 0, 1, IS_STRING, 1)
 	ZEND_ARG_OBJ_INFO(0, mysql_link, mysqli, 0)
 ZEND_END_ARG_INFO()
 
@@ -389,7 +389,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_get_charset, 0, 1, IS_OBJ
 	ZEND_ARG_OBJ_INFO(0, mysqli_link, mysqli, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_get_client_info, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_get_client_info, 0, 0, IS_STRING, 1)
 	ZEND_ARG_OBJ_INFO(0, mysqli_link, mysqli, 1)
 ZEND_END_ARG_INFO()
 
@@ -403,7 +403,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_mysqli_get_proto_info arginfo_mysqli_field_count
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_get_server_info, 0, 1, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_get_server_info, 0, 1, IS_STRING, 1)
 	ZEND_ARG_OBJ_INFO(0, mysqli_link, mysqli, 0)
 ZEND_END_ARG_INFO()