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);
@@ -137,13 +137,6 @@ public function set_charset(string $charset);
      */
     public function options(int $option, $value);
 
-    /**
-     * @param mixed $value
-     *
-     * @return bool
-     */
-    public function set_opt(int $option, $value);
-
     /** @return bool */
     public function ssl_set(
         string $key,
@@ -175,7 +168,7 @@ public function refresh(int $options);
 class mysqli_warning
 {
     /**
-     * mysqli_link|mysqli_stmt $mysqli_link
+     * object $mysqli_link
      *
      * @return object|false
      */
@@ -449,7 +442,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 {}
 

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
 
@@ -124,8 +121,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_options, 0, 0, 2)
 	ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_mysqli_set_opt arginfo_class_mysqli_options
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_ssl_set, 0, 0, 5)
 	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, cert, IS_STRING, 0)
@@ -499,8 +494,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

ext/mysqli/mysqli_fe.c

@@ -224,7 +224,7 @@ const zend_function_entry mysqli_link_methods[] = {
 #ifdef HAVE_MYSQLI_SET_CHARSET
 	PHP_ME_MAPPING(set_charset, mysqli_set_charset, arginfo_class_mysqli_set_charset, ZEND_ACC_PUBLIC)
 #endif
-	PHP_ME_MAPPING(set_opt, mysqli_options, arginfo_class_mysqli_set_opt, ZEND_ACC_PUBLIC)
+	PHP_ME_MAPPING(set_opt, mysqli_options, arginfo_class_mysqli_options, ZEND_ACC_PUBLIC)
 	PHP_ME_MAPPING(ssl_set, mysqli_ssl_set, arginfo_class_mysqli_ssl_set, ZEND_ACC_PUBLIC)
 	PHP_ME_MAPPING(stat, mysqli_stat, arginfo_class_mysqli_stat, ZEND_ACC_PUBLIC)
 	PHP_ME_MAPPING(stmt_init, mysqli_stmt_init, arginfo_class_mysqli_stmt_init, ZEND_ACC_PUBLIC)

ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt

@@ -938,14 +938,14 @@ Number of Required Parameters: 0
 
 Inspecting parameter 'flags' of method 'rollback'
 isArray: no
-allowsNull: yes
+allowsNull: no
 isPassedByReference: no
 isOptional: yes
 isDefaultValueAvailable: no
 
 Inspecting parameter 'name' of method 'rollback'
 isArray: no
-allowsNull: yes
+allowsNull: no
 isPassedByReference: no
 isOptional: yes
 isDefaultValueAvailable: no