Review

Author: tvlooy

ext/mysqli/mysqli.stub.php

@@ -307,7 +307,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|null {}
+function mysqli_character_set_name(mysqli $mysql_link): ?string {}
 
 function mysqli_close(mysqli $mysql_link): bool {}
 
@@ -334,7 +334,7 @@ function mysqli_debug(string $debug): bool {}
 
 function mysqli_errno(mysqli $mysql_link): int {}
 
-function mysqli_error(mysqli $mysql_link): string {}
+function mysqli_error(mysqli $mysql_link): ?string {}
 
 function mysqli_error_list(mysqli $mysql_link): array {}
 
@@ -354,50 +354,49 @@ function mysqli_fetch_all(mysqli_result $mysql_result, int $mode = MYSQLI_NUM):
 
 function mysqli_fetch_array(mysqli_result $mysql_result, int $fetchtype = MYSQLI_BOTH): array|null|false {}
 
-function mysqli_fetch_assoc(mysqli_result $mysql_result): array|null {}
+function mysqli_fetch_assoc(mysqli_result $mysql_result): ?array {}
 
 function mysqli_fetch_object(
     mysqli_result $mysqli_result,
     string $class_name = 'stdClass',
     array $params = []
-): object|null {}
+): ?object {}
 
-function mysqli_fetch_row(mysqli_result $mysqli_result): array|null {}
+function mysqli_fetch_row(mysqli_result $mysqli_result): ?array {}
 
 function mysqli_field_count(mysqli $mysqli_link): int {}
 
 function mysqli_field_seek(mysqli_result $mysqli_result, int $field_nr): bool {}
 
 function mysqli_field_tell(mysqli_result $mysqli_result): int {}
 
-/** @return void */
-function mysqli_free_result(mysqli_result $mysqli_result) {}
+function mysqli_free_result(mysqli_result $mysqli_result): void {}
 
 function mysqli_get_connection_stats(mysqli $mysqli_link): array {}
 
 function mysqli_get_client_stats(): array {}
 
-function mysqli_get_charset(mysqli $mysqli_link): object|null {}
+function mysqli_get_charset(mysqli $mysqli_link): ?object {}
 
-function mysqli_get_client_info(?mysqli $mysqli_link = null): string|null {}
+function mysqli_get_client_info(?mysqli $mysqli_link = null): ?string {}
 
 function mysqli_get_client_version(): int {}
 
-function mysqli_get_links_stats(mysqli $mysqli_link): array {}
+function mysqli_get_links_stats(): array {}
 
 function mysqli_get_host_info(mysqli $mysqli_link): string {}
 
 function mysqli_get_proto_info(mysqli $mysqli_link): int {}
 
-function mysqli_get_server_info(mysqli $mysqli_link): string|null {}
+function mysqli_get_server_info(mysqli $mysqli_link): ?string {}
 
 function mysqli_get_server_version(mysqli $mysqli_link): int {}
 
 function mysqli_get_warnings(mysqli $mysqli_link): mysqli_warning|false {}
 
 function mysqli_init(): mysqli|false {}
 
-function mysqli_info(mysqli $mysqli_link): string|null {}
+function mysqli_info(mysqli $mysqli_link): ?string {}
 
 function mysqli_insert_id(mysqli $mysqli_link): int {}
 
@@ -466,21 +465,19 @@ function mysqli_stmt_bind_result(mysqli_stmt $mysql_stmt, &...$vars): bool {}
 
 function mysqli_stmt_close(mysqli_stmt $mysql_stmt): bool {}
 
-/** @return null|false */
-function mysqli_stmt_data_seek(mysqli_stmt $mysql_stmt, int $offset) {}
+function mysqli_stmt_data_seek(mysqli_stmt $mysql_stmt, int $offset): ?bool {}
 
 function mysqli_stmt_errno(mysqli_stmt $mysql_stmt): int {}
 
-function mysqli_stmt_error(mysqli_stmt $mysql_stmt): string {}
+function mysqli_stmt_error(mysqli_stmt $mysql_stmt): ?string {}
 
 function mysqli_stmt_error_list(mysqli_stmt $mysql_stmt): array {}
 
-function mysqli_stmt_fetch(mysqli_stmt $mysql_stmt): bool|null {}
+function mysqli_stmt_fetch(mysqli_stmt $mysql_stmt): ?bool {}
 
 function mysqli_stmt_field_count(mysqli_stmt $mysql_stmt): int {}
 
-/** @return void */
-function mysqli_stmt_free_result(mysqli_stmt $mysql_stmt) {}
+function mysqli_stmt_free_result(mysqli_stmt $mysql_stmt): void {}
 
 function mysqli_stmt_get_result(mysqli_stmt $mysql_stmt): mysqli_result|false {}
 
@@ -508,11 +505,9 @@ function mysqli_stmt_send_long_data(mysqli_stmt $mysql_stmt, int $param_nr, stri
 
 function mysqli_stmt_store_result(mysqli_stmt $mysql_stmt): bool {}
 
-/** @return string|null */
-function mysqli_stmt_sqlstate(mysqli_stmt $mysql_stmt) {}
+function mysqli_stmt_sqlstate(mysqli_stmt $mysql_stmt): ?string {}
 
-/** @return string|null */
-function mysqli_sqlstate(mysqli $mysqli_link) {}
+function mysqli_sqlstate(mysqli $mysqli_link): ?string {}
 
 function mysqli_ssl_set(
     mysqli $mysql_link,

ext/mysqli/mysqli_arginfo.h

@@ -306,9 +306,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_mysqli_errno arginfo_mysqli_affected_rows
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_error, 0, 1, IS_STRING, 0)
-	ZEND_ARG_OBJ_INFO(0, mysql_link, mysqli, 0)
-ZEND_END_ARG_INFO()
+#define arginfo_mysqli_error arginfo_mysqli_character_set_name
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_error_list, 0, 1, IS_ARRAY, 0)
 	ZEND_ARG_OBJ_INFO(0, mysql_link, mysqli, 0)
@@ -374,7 +372,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_field_tell, 0, 1, IS_LONG
 	ZEND_ARG_OBJ_INFO(0, mysqli_result, mysqli_result, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_free_result, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_free_result, 0, 1, IS_VOID, 0)
 	ZEND_ARG_OBJ_INFO(0, mysqli_result, mysqli_result, 0)
 ZEND_END_ARG_INFO()
 
@@ -395,7 +393,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_mysqli_get_client_version arginfo_mysqli_connect_errno
 
-#define arginfo_mysqli_get_links_stats arginfo_mysqli_get_connection_stats
+#define arginfo_mysqli_get_links_stats arginfo_mysqli_get_client_stats
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_get_host_info, 0, 1, IS_STRING, 0)
 	ZEND_ARG_OBJ_INFO(0, mysqli_link, mysqli, 0)
@@ -545,14 +543,14 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_mysqli_stmt_close arginfo_mysqli_stmt_execute
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_stmt_data_seek, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_stmt_data_seek, 0, 2, _IS_BOOL, 1)
 	ZEND_ARG_OBJ_INFO(0, mysql_stmt, mysqli_stmt, 0)
 	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_mysqli_stmt_errno arginfo_mysqli_stmt_affected_rows
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_stmt_error, 0, 1, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_stmt_error, 0, 1, IS_STRING, 1)
 	ZEND_ARG_OBJ_INFO(0, mysql_stmt, mysqli_stmt, 0)
 ZEND_END_ARG_INFO()
 
@@ -566,7 +564,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_mysqli_stmt_field_count arginfo_mysqli_stmt_affected_rows
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_stmt_free_result, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_stmt_free_result, 0, 1, IS_VOID, 0)
 	ZEND_ARG_OBJ_INFO(0, mysql_stmt, mysqli_stmt, 0)
 ZEND_END_ARG_INFO()
 
@@ -609,11 +607,9 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_mysqli_stmt_store_result arginfo_mysqli_stmt_execute
 
-#define arginfo_mysqli_stmt_sqlstate arginfo_mysqli_stmt_free_result
+#define arginfo_mysqli_stmt_sqlstate arginfo_mysqli_stmt_error
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_sqlstate, 0, 0, 1)
-	ZEND_ARG_OBJ_INFO(0, mysqli_link, mysqli, 0)
-ZEND_END_ARG_INFO()
+#define arginfo_mysqli_sqlstate arginfo_mysqli_get_server_info
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_ssl_set, 0, 6, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, mysql_link, mysqli, 0)