review

Author: tvlooy

ext/mysqli/mysqli.stub.php

@@ -68,8 +68,8 @@ public function get_warnings();
     /** @return mysqli|false */
     public function init();
 
-    /** @return bool|null */
-    public function kill(int $connection_id): bool|null;
+    /** @return bool */
+    public function kill(int $connection_id);
 
     /** @return bool */
     public function multi_query(string $query);
@@ -86,7 +86,7 @@ public function ping();
     /** @return int|false */
     public static function poll(?array &$read, ?array &$write, array &$error, int $sec, int $usec = 0);
 
-    /** @return mysqli_stmt|null|false */
+    /** @return mysqli_stmt|false */
     public function prepare(string $query);
 
     /** @return mysqli_result|null|bool */
@@ -389,21 +389,21 @@ function mysqli_get_server_info(mysqli $mysqli_link): string {}
 
 function mysqli_get_server_version(mysqli $mysqli_link): int|bool {}
 
-function mysqli_get_warnings(mysqli $mysqli_link): mysqli_warning|null|false {}
+function mysqli_get_warnings(mysqli $mysqli_link): mysqli_warning|false {}
 
 function mysqli_init(): mysqli|false {}
 
 function mysqli_info(mysqli $mysqli_link): string|bool|null {}
 
 function mysqli_insert_id(mysqli $mysqli_link): int|bool|string {}
 
-function mysqli_kill(mysqli $mysqli_link, int $connection_id): bool|null {}
+function mysqli_kill(mysqli $mysqli_link, int $connection_id): bool {}
 
-function mysqli_more_results(mysqli $mysqli_link): bool|null {}
+function mysqli_more_results(mysqli $mysqli_link): bool {}
 
-function mysqli_multi_query(mysqli $mysqli_link, string $query): bool|null {}
+function mysqli_multi_query(mysqli $mysqli_link, string $query): bool {}
 
-function mysqli_next_result(mysqli $mysqli_link): bool|null {}
+function mysqli_next_result(mysqli $mysqli_link): bool {}
 
 function mysqli_num_fields(mysqli_result $mysql_result): int|bool {}
 
@@ -412,11 +412,11 @@ function mysqli_num_rows(mysqli_result $mysqli_result): int|string|bool {}
 /** @param mixed $value */
 function mysqli_options(mysqli $mysqli_link, int $option, $value): bool|null {}
 
-function mysqli_ping(mysqli $mysqli_link): bool|null {}
+function mysqli_ping(mysqli $mysqli_link): bool {}
 
 function mysqli_poll(?array &$read, ?array &$write, array &$error, int $sec, int $usec = 0): int|false {}
 
-function mysqli_prepare(mysqli $mysqli_link, string $query): mysqli_stmt|null|false {}
+function mysqli_prepare(mysqli $mysqli_link, string $query): mysqli_stmt|false {}
 
 function mysqli_report(int $flags): bool {}
 

ext/mysqli/mysqli_arginfo.h

@@ -51,7 +51,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_mysqli_init arginfo_class_mysqli_character_set_name
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_mysqli_kill, 0, 1, _IS_BOOL, 1)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_kill, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, connection_id, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
@@ -409,7 +409,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_mysqli_get_server_version arginfo_mysqli_field_count
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_mysqli_get_warnings, 0, 1, mysqli_warning, MAY_BE_NULL|MAY_BE_FALSE)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_mysqli_get_warnings, 0, 1, mysqli_warning, MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, mysqli_link, mysqli, 0)
 ZEND_END_ARG_INFO()
 
@@ -424,16 +424,16 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_insert_id, 0, 1, MAY_BE_L
 	ZEND_ARG_OBJ_INFO(0, mysqli_link, mysqli, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_kill, 0, 2, _IS_BOOL, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_kill, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, mysqli_link, mysqli, 0)
 	ZEND_ARG_TYPE_INFO(0, connection_id, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_more_results, 0, 1, _IS_BOOL, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_more_results, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, mysqli_link, mysqli, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_multi_query, 0, 2, _IS_BOOL, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_multi_query, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, mysqli_link, mysqli, 0)
 	ZEND_ARG_TYPE_INFO(0, query, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -464,7 +464,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_poll, 0, 4, MAY_BE_LONG|M
 	ZEND_ARG_TYPE_INFO(0, usec, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_mysqli_prepare, 0, 2, mysqli_stmt, MAY_BE_NULL|MAY_BE_FALSE)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_mysqli_prepare, 0, 2, mysqli_stmt, MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, mysqli_link, mysqli, 0)
 	ZEND_ARG_TYPE_INFO(0, query, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -494,7 +494,10 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_real_escape_string, 0, 2,
 	ZEND_ARG_TYPE_INFO(0, string_to_escape, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_mysqli_real_query arginfo_mysqli_multi_query
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_real_query, 0, 2, _IS_BOOL, 1)
+	ZEND_ARG_OBJ_INFO(0, mysqli_link, mysqli, 0)
+	ZEND_ARG_TYPE_INFO(0, query, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_mysqli_reap_async_query, 0, 1, mysqli_result, MAY_BE_NULL|MAY_BE_BOOL)
 	ZEND_ARG_OBJ_INFO(0, mysqli_link, mysqli, 0)