Review

Author: tvlooy

ext/mysqli/mysqli.stub.php

@@ -119,7 +119,7 @@ public function real_query(string $query);
     public function release_savepoint(string $name);
 
     /** @return bool */
-    public function rollback(?int $flags = 0, ?string $name = '');
+    public function rollback(int $flags = 0, string $name = '');
 
     /** @return bool */
     public function savepoint(string $name);
@@ -175,11 +175,9 @@ public function refresh(int $options);
 class mysqli_warning
 {
     /**
-     * mysqli_link|mysqli_stmt $mysqli_link
-     *
      * @return object|false
      */
-    public function __construct();
+    public function __construct(object $mysqli_link);
 
     /** @return bool */
     public function next();
@@ -188,12 +186,9 @@ public function next();
 class mysqli_result
 {
      /**
-      * mysqli $mysqli_link,
-      * int $resmode = MYSQLI_STORE_RESULT
-      *
       * @return object|false
       */
-     public function __construct();
+     public function __construct(object $mysqli_link, int $resmode = MYSQLI_STORE_RESULT);
 
     /** @return void */
     public function close();
@@ -258,7 +253,7 @@ public function bind_result(&...$vars);
     /** @return bool */
     public function close();
 
-    /** @return void|false */
+    /** @return null|false */
     public function data_seek(int $offset);
 
     /** @return bool */
@@ -449,7 +444,7 @@ function mysqli_reap_async_query(mysqli $mysqli_link): mysqli_result|bool {}
 
 function mysqli_release_savepoint(mysqli $mysqli_link, string $name): bool {}
 
-function mysqli_rollback(mysqli $mysqli_link, ?int $flags = 0, ?string $name = ''): bool {}
+function mysqli_rollback(mysqli $mysqli_link, int $flags = 0, string $name = ''): bool {}
 
 function mysqli_savepoint(mysqli $mysqli_link, string $name): bool {}
 
@@ -471,7 +466,7 @@ function mysqli_stmt_bind_result(mysqli_stmt $mysql_stmt, &...$vars): bool {}
 
 function mysqli_stmt_close(mysqli_stmt $mysql_stmt): bool {}
 
-/** @return void|false */
+/** @return null|false */
 function mysqli_stmt_data_seek(mysqli_stmt $mysql_stmt, int $offset) {}
 
 function mysqli_stmt_errno(mysqli_stmt $mysql_stmt): int {}
@@ -513,10 +508,10 @@ 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|void */
+/** @return string|null */
 function mysqli_stmt_sqlstate(mysqli_stmt $mysql_stmt) {}
 
-/** @return string|void */
+/** @return string|null */
 function mysqli_sqlstate(mysqli $mysqli_link) {}
 
 function mysqli_ssl_set(

ext/mysqli/mysqli_arginfo.h

@@ -104,10 +104,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_release_savepoint, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_rollback, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO(0, flags, IS_LONG, 1)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 1)
-ZEND_END_ARG_INFO()
+#define arginfo_class_mysqli_rollback arginfo_class_mysqli_begin_transaction
 
 #define arginfo_class_mysqli_savepoint arginfo_class_mysqli_release_savepoint
 
@@ -150,11 +147,16 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_refresh, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_mysqli_warning___construct arginfo_class_mysqli_character_set_name
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_warning___construct, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, mysqli_link, IS_OBJECT, 0)
+ZEND_END_ARG_INFO()
 
 #define arginfo_class_mysqli_warning_next arginfo_class_mysqli_character_set_name
 
-#define arginfo_class_mysqli_result___construct arginfo_class_mysqli_character_set_name
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_result___construct, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, mysqli_link, IS_OBJECT, 0)
+	ZEND_ARG_TYPE_INFO(0, resmode, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
 #define arginfo_class_mysqli_result_close arginfo_class_mysqli_character_set_name
 
@@ -499,8 +501,8 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_rollback, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, mysqli_link, mysqli, 0)
-	ZEND_ARG_TYPE_INFO(0, flags, IS_LONG, 1)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, flags, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_mysqli_savepoint arginfo_mysqli_release_savepoint