Generate function entries from stubs for mysqli

Closes GH-5420

12 files changed, 811 insertions, 638 deletions

diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4
index 4f011adf8d..c38f013583 100644
--- a/ext/mysqli/config.m4
+++ b/ext/mysqli/config.m4
@@ -107,7 +107,7 @@ if test "$PHP_MYSQLI" != "no"; then
   fi
 
   mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \
-                  mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \
+                  mysqli_report.c mysqli_driver.c mysqli_warning.c \
                   mysqli_exception.c mysqli_result_iterator.c"
   PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
   PHP_SUBST(MYSQLI_SHARED_LIBADD)
diff --git a/ext/mysqli/config.w32 b/ext/mysqli/config.w32
index bd76923c0c..ed6f2be7e7 100644
--- a/ext/mysqli/config.w32
+++ b/ext/mysqli/config.w32
@@ -13,7 +13,6 @@ if (PHP_MYSQLI != "no") {
 		"mysqli_api.c " +
 		"mysqli_driver.c " +
 		"mysqli_exception.c " +
-		"mysqli_fe.c " +
 		"mysqli_nonapi.c " +
 		"mysqli_prop.c " +
 		"mysqli_result_iterator.c " +
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 5d5413a593..85ed67627f 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -32,6 +32,7 @@
 #include "zend_exceptions.h"
 #include "ext/spl/spl_exceptions.h"
 #include "zend_interfaces.h"
+#include "mysqli_arginfo.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(mysqli)
 static PHP_GINIT_FUNCTION(mysqli);
@@ -572,13 +573,13 @@ PHP_MINIT_FUNCTION(mysqli)
 	le_pmysqli = zend_register_list_destructors_ex(NULL, php_mysqli_dtor,
 		"MySqli persistent connection", module_number);
 
-	INIT_CLASS_ENTRY(cex, "mysqli_sql_exception", mysqli_exception_methods);
+	INIT_CLASS_ENTRY(cex, "mysqli_sql_exception", class_mysqli_sql_exception_methods);
 	mysqli_exception_class_entry = zend_register_internal_class_ex(&cex, spl_ce_RuntimeException);
 	mysqli_exception_class_entry->ce_flags |= ZEND_ACC_FINAL;
 	zend_declare_property_long(mysqli_exception_class_entry, "code", sizeof("code")-1, 0, ZEND_ACC_PROTECTED);
 	zend_declare_property_string(mysqli_exception_class_entry, "sqlstate", sizeof("sqlstate")-1, "00000", ZEND_ACC_PROTECTED);
 
-	REGISTER_MYSQLI_CLASS_ENTRY("mysqli_driver", mysqli_driver_class_entry, mysqli_driver_methods);
+	REGISTER_MYSQLI_CLASS_ENTRY("mysqli_driver", mysqli_driver_class_entry, class_mysqli_driver_methods);
 	ce = mysqli_driver_class_entry;
 	zend_hash_init(&mysqli_driver_properties, 0, NULL, free_prop_handler, 1);
 	MYSQLI_ADD_PROPERTIES(&mysqli_driver_properties, mysqli_driver_property_entries);
@@ -591,7 +592,7 @@ PHP_MINIT_FUNCTION(mysqli)
 	ce->ce_flags |= ZEND_ACC_FINAL;
 	zend_hash_add_ptr(&classes, ce->name, &mysqli_driver_properties);
 
-	REGISTER_MYSQLI_CLASS_ENTRY("mysqli", mysqli_link_class_entry, mysqli_link_methods);
+	REGISTER_MYSQLI_CLASS_ENTRY("mysqli", mysqli_link_class_entry, class_mysqli_methods);
 	ce = mysqli_link_class_entry;
 	zend_hash_init(&mysqli_link_properties, 0, NULL, free_prop_handler, 1);
 	MYSQLI_ADD_PROPERTIES(&mysqli_link_properties, mysqli_link_property_entries);
@@ -615,7 +616,7 @@ PHP_MINIT_FUNCTION(mysqli)
 	zend_declare_property_null(ce, "warning_count",		sizeof("warning_count") - 1, ZEND_ACC_PUBLIC);
 	zend_hash_add_ptr(&classes, ce->name, &mysqli_link_properties);
 
-	REGISTER_MYSQLI_CLASS_ENTRY("mysqli_warning", mysqli_warning_class_entry, mysqli_warning_methods);
+	REGISTER_MYSQLI_CLASS_ENTRY("mysqli_warning", mysqli_warning_class_entry, class_mysqli_warning_methods);
 	ce = mysqli_warning_class_entry;
 	ce->ce_flags |= ZEND_ACC_FINAL;
 	zend_hash_init(&mysqli_warning_properties, 0, NULL, free_prop_handler, 1);
@@ -625,7 +626,7 @@ PHP_MINIT_FUNCTION(mysqli)
 	zend_declare_property_null(ce, "errno",		sizeof("errno") - 1, ZEND_ACC_PUBLIC);
 	zend_hash_add_ptr(&classes, ce->name, &mysqli_warning_properties);
 
-	REGISTER_MYSQLI_CLASS_ENTRY("mysqli_result", mysqli_result_class_entry, mysqli_result_methods);
+	REGISTER_MYSQLI_CLASS_ENTRY("mysqli_result", mysqli_result_class_entry, class_mysqli_result_methods);
 	ce = mysqli_result_class_entry;
 	zend_hash_init(&mysqli_result_properties, 0, NULL, free_prop_handler, 1);
 	MYSQLI_ADD_PROPERTIES(&mysqli_result_properties, mysqli_result_property_entries);
@@ -638,7 +639,7 @@ PHP_MINIT_FUNCTION(mysqli)
 	zend_class_implements(mysqli_result_class_entry, 1, zend_ce_traversable);
 	zend_hash_add_ptr(&classes, ce->name, &mysqli_result_properties);
 
-	REGISTER_MYSQLI_CLASS_ENTRY("mysqli_stmt", mysqli_stmt_class_entry, mysqli_stmt_methods);
+	REGISTER_MYSQLI_CLASS_ENTRY("mysqli_stmt", mysqli_stmt_class_entry, class_mysqli_stmt_methods);
 	ce = mysqli_stmt_class_entry;
 	zend_hash_init(&mysqli_stmt_properties, 0, NULL, free_prop_handler, 1);
 	MYSQLI_ADD_PROPERTIES(&mysqli_stmt_properties, mysqli_stmt_property_entries);
@@ -975,7 +976,7 @@ zend_module_entry mysqli_module_entry = {
 	STANDARD_MODULE_HEADER_EX, NULL,
 	mysqli_deps,
 	"mysqli",
-	mysqli_functions,
+	ext_functions,
 	PHP_MINIT(mysqli),
 	PHP_MSHUTDOWN(mysqli),
 	PHP_RINIT(mysqli),
diff --git a/ext/mysqli/mysqli.stub.php b/ext/mysqli/mysqli.stub.php
index 8d3dc75a97..e370b30242 100644
--- a/ext/mysqli/mysqli.stub.php
+++ b/ext/mysqli/mysqli.stub.php
@@ -1,11 +1,14 @@
 <?php
 
+/** @generate-function-entries */
+
 class mysqli_driver
 {
 }
 
 class mysqli
 {
+    /** @alias mysqli_link_construct */
     public function __construct(
         ?string $host = null,
         ?string $user = null,
@@ -13,27 +16,48 @@ class mysqli
         ?string $database = null,
         ?int $port = null,
         ?string $socket = null
-    );
+    ) {}
 
-    /** @return bool */
-    public function autocommit(bool $mode);
+    /**
+     * @return bool
+     * @alias mysqli_autocommit
+     */
+    public function autocommit(bool $mode) {}
 
-    /** @return bool */
-    public function begin_transaction(int $flags = 0, string $name = UNKNOWN);
+    /**
+     * @return bool
+     * @alias mysqli_begin_transaction
+     */
+    public function begin_transaction(int $flags = 0, string $name = UNKNOWN) {}
 
-    /** @return bool */
-    public function change_user(string $user, string $password, ?string $database);
+    /**
+     * @return bool
+     * @alias mysqli_change_user
+     */
+    public function change_user(string $user, string $password, ?string $database) {}
 
-    /** @return string|null */
-    public function character_set_name();
+    /**
+     * @return string|null
+     * @alias mysqli_character_set_name
+     */
+    public function character_set_name() {}
 
-    /** @return bool */
-    public function close();
+    /**
+     * @return bool
+     * @alias mysqli_close
+     */
+    public function close() {}
 
-    /** @return bool */
-    public function commit(int $flags = -1, string $name = UNKNOWN);
+    /**
+     * @return bool
+     * @alias mysqli_commit
+     */
+    public function commit(int $flags = -1, string $name = UNKNOWN) {}
 
-    /** @return mysqli|null|false */
+    /**
+     * @return mysqli|null|false
+     * @alias mysqli_connect
+     */
     public function connect(
         ?string $host = null,
         ?string $user = null,
@@ -41,57 +65,114 @@ class mysqli
         ?string $database = null,
         ?int $port = null,
         ?string $socket = null
-    );
+    ) {}
 
-    /** @return bool */
-    public function dump_debug_info();
+    /**
+     * @return bool
+     * @alias mysqli_dump_debug_info
+     */
+    public function dump_debug_info() {}
 
-    /** @return bool */
-    public function debug(string $debug_options);
+    /**
+     * @return bool
+     * @alias mysqli_debug
+     */
+    public function debug(string $debug_options) {}
 
-    /** @return object|null */
-    public function get_charset();
+#ifdef HAVE_MYSQLI_GET_CHARSET
+    /**
+     * @return object|null
+     * @alias mysqli_get_charset
+     */
+    public function get_charset() {}
+#endif
 
-    /** @return string|null */
-    public function get_client_info();
+    /**
+     * @return string|null
+     * @alias mysqli_get_client_info
+     */
+    public function get_client_info() {}
 
-    /** @return array */
-    public function get_connection_stats();
+#if defined(MYSQLI_USE_MYSQLND)
+    /**
+     * @return array
+     * @alias mysqli_get_connection_stats
+     */
+    public function get_connection_stats() {}
+#endif
 
-    /** @return string|null */
-    public function get_server_info();
+    /**
+     * @return string|null
+     * @alias mysqli_get_server_info
+     */
+    public function get_server_info() {}
 
-    /** @return mysqli_warning|false */
-    public function get_warnings();
+    /**
+     * @return mysqli_warning|false
+     * @alias mysqli_get_warnings
+     */
+    public function get_warnings() {}
 
-    /** @return mysqli|false */
-    public function init();
+    /**
+     * @return mysqli|false
+     * @alias mysqli_init_method
+     */
+    public function init() {}
 
-    /** @return bool */
-    public function kill(int $connection_id);
+    /**
+     * @return bool
+     * @alias mysqli_kill
+     */
+    public function kill(int $connection_id) {}
 
-    /** @return bool */
-    public function multi_query(string $query);
+    /**
+     * @return bool
+     * @alias mysqli_multi_query
+     */
+    public function multi_query(string $query) {}
 
-    /** @return bool */
-    public function more_results();
+    /**
+     * @return bool
+     * @alias mysqli_more_results
+     */
+    public function more_results() {}
 
-    /** @return bool */
-    public function next_result();
+    /**
+     * @return bool
+     * @alias mysqli_next_result
+     */
+    public function next_result() {}
 
-    /** @return bool */
-    public function ping();
+    /**
+     * @return bool
+     * @alias mysqli_ping
+     */
+    public function ping() {}
 
-    /** @return int|false */
-    public static function poll(?array &$read, ?array &$write, array &$error, int $sec, int $usec = 0);
+#if defined(MYSQLI_USE_MYSQLND)
+    /**
+     * @return int|false
+     * @alias mysqli_poll
+     */
+    public static function poll(?array &$read, ?array &$write, array &$error, int $sec, int $usec = 0) {}
+#endif
 
-    /** @return mysqli_stmt|false */
-    public function prepare(string $query);
+    /**
+     * @return mysqli_stmt|false
+     * @alias mysqli_prepare
+     */
+    public function prepare(string $query) {}
 
-    /** @return mysqli_result|bool */
-    public function query(string $query, int $resultmode = MYSQLI_STORE_RESULT);
+    /**
+     * @return mysqli_result|bool
+     * @alias mysqli_query
+     */
+    public function query(string $query, int $resultmode = MYSQLI_STORE_RESULT) {}
 
-    /** @return bool */
+    /**
+     * @return bool
+     * @alias mysqli_real_connect
+     */
     public function real_connect(
         ?string $host = null,
         ?string $user = null,
@@ -100,185 +181,350 @@ class mysqli
         ?int $port = null,
         ?string $socket = null,
         int $flags = 0
-    );
+    ) {}
 
-    /** @return string */
-    public function real_escape_string(string $string_to_escape);
+    /**
+     * @return string
+     * @alias mysqli_real_escape_string
+     */
+    public function real_escape_string(string $string_to_escape) {}
 
-    /** @return mysqli_result|bool */
-    public function reap_async_query();
+#if defined(MYSQLI_USE_MYSQLND)
+    /**
+     * @return mysqli_result|bool
+     * @alias mysqli_reap_async_query
+     */
+    public function reap_async_query() {}
+#endif
 
-    /** @return string */
-    public function escape_string(string $string_to_escape);
+    /**
+     * @return string
+     * @alias mysqli_real_escape_string
+     */
+    public function escape_string(string $string_to_escape) {}
 
-    /** @return bool */
-    public function real_query(string $query);
+    /**
+     * @return bool
+     * @alias mysqli_real_query
+     */
+    public function real_query(string $query) {}
 
-    /** @return bool */
-    public function release_savepoint(string $name);
+    /**
+     * @return bool
+     * @alias mysqli_release_savepoint
+     */
+    public function release_savepoint(string $name) {}
 
-    /** @return bool */
-    public function rollback(int $flags = 0, string $name = '');
+    /**
+     * @return bool
+     * @alias mysqli_rollback
+     */
+    public function rollback(int $flags = 0, string $name = '') {}
 
-    /** @return bool */
-    public function savepoint(string $name);
+    /**
+     * @return bool
+     * @alias mysqli_savepoint
+     */
+    public function savepoint(string $name) {}
 
-    /** @return bool */
-    public function select_db(string $database);
+    /**
+     * @return bool
+     * @alias mysqli_select_db
+     */
+    public function select_db(string $database) {}
 
-    /** @return bool */
-    public function set_charset(string $charset);
+#ifdef HAVE_MYSQLI_SET_CHARSET
+    /**
+     * @return bool
+     * @alias mysqli_set_charset
+     */
+    public function set_charset(string $charset) {}
+#endif
 
     /**
      * @param mixed $value
-     *
      * @return bool
+     * @alias mysqli_options
      */
-    public function options(int $option, $value);
+    public function options(int $option, $value) {}
 
     /**
      * @param mixed $value
-     *
      * @return bool
+     * @alias mysqli_options
      */
-    public function set_opt(int $option, $value);
+    public function set_opt(int $option, $value) {}
 
-    /** @return bool */
+    /**
+     * @return bool
+     * @alias mysqli_ssl_set
+     */
     public function ssl_set(
         string $key,
         string $cert,
         string $certificate_authority,
         string $certificate_authority_path,
         string $cipher
-    );
+    ) {}
 
-    /** @return string|false */
-    public function stat();
+    /**
+     * @return string|false
+     * @alias mysqli_stat
+     */
+    public function stat() {}
 
-    /** @return mysqli_stmt|false */
-    public function stmt_init();
+    /**
+     * @return mysqli_stmt|false
+     * @alias mysqli_stmt_init
+     */
+    public function stmt_init() {}
 
-    /** @return mysqli_result|false */
-    public function store_result(int $flags = 0);
+    /**
+     * @return mysqli_result|false
+     * @alias mysqli_store_result
+     */
+    public function store_result(int $flags = 0) {}
 
-    /** @return bool */
-    public function thread_safe();
+    /**
+     * @return bool
+     * @alias mysqli_thread_safe
+     */
+    public function thread_safe() {}
 
-    /** @return mysqli_result|false */
-    public function use_result();
+    /**
+     * @return mysqli_result|false
+     * @alias mysqli_use_result
+     */
+    public function use_result() {}
 
-    /** @return bool */
-    public function refresh(int $options);
+    /**
+     * @return bool
+     * @alias mysqli_refresh
+     */
+    public function refresh(int $options) {}
 }
 
 class mysqli_result
 {
-     public function __construct(object $mysqli_link, int $resmode = MYSQLI_STORE_RESULT);
+    /** @alias mysqli_result_construct */
+    public function __construct(object $mysqli_link, int $resmode = MYSQLI_STORE_RESULT) {}
 
-    /** @return void */
-    public function close();
+    /**
+     * @return void
+     * @alias mysqli_free_result
+     */
+    public function close() {}
 
-    /** @return void */
-    public function free();
+    /**
+     * @return void
+     * @alias mysqli_free_result
+     */
+    public function free() {}
 
-    /** @return bool */
-    public function data_seek(int $offset);
+    /**
+     * @return bool
+     * @alias mysqli_data_seek
+     */
+    public function data_seek(int $offset) {}
 
-    /** @return object|false */
-    public function fetch_field();
+    /**
+     * @return object|false
+     * @alias mysqli_fetch_field
+     */
+    public function fetch_field() {}
 
-    /** @return array */
-    public function fetch_fields();
+    /**
+     * @return array
+     * @alias mysqli_fetch_fields
+     */
+    public function fetch_fields() {}
 
-    /** @return object|false */
-    public function fetch_field_direct(int $field_nr);
+    /**
+     * @return object|false
+     * @alias mysqli_fetch_field_direct
+     */
+    public function fetch_field_direct(int $field_nr) {}
 
-    /** @return array|false */
-    public function fetch_all(int $result_type = MYSQLI_NUM);
+#if defined(MYSQLI_USE_MYSQLND)
+    /**
+     * @return array|false
+     * @alias mysqli_fetch_all
+     */
+    public function fetch_all(int $result_type = MYSQLI_NUM) {}
+#endif
 
-    /** @return array|null|false */
-    public function fetch_array(int $result_type = MYSQLI_BOTH);
+    /**
+     * @return array|null|false
+     * @alias mysqli_fetch_array
+     */
+    public function fetch_array(int $result_type = MYSQLI_BOTH) {}
 
-    /** @return array|null */
-    public function fetch_assoc();
+    /**
+     * @return array|null
+     * @alias mysqli_fetch_assoc
+     */
+    public function fetch_assoc() {}
 
-    /** @return object|null */
-    public function fetch_object(string $class_name = UNKNOWN, array $params = []);
+    /**
+     * @return object|null
+     * @alias mysqli_fetch_object
+     */
+    public function fetch_object(string $class_name = UNKNOWN, array $params = []) {}
 
-    /** @return array|null */
-    public function fetch_row();
+    /**
+     * @return array|null
+     * @alias mysqli_fetch_row
+     */
+    public function fetch_row() {}
 
-    /** @return bool */
-    public function field_seek(int $field_nr);
+    /**
+     * @return bool
+     * @alias mysqli_field_seek
+     */
+    public function field_seek(int $field_nr) {}
 
-    /** @return void */
-    public function free_result();
+    /**
+     * @return void
+     * @alias mysqli_free_result
+     */
+    public function free_result() {}
 }
 
 class mysqli_stmt
 {
-    public function __construct(mysqli $mysqli_link, string $statement = UNKNOWN);
+    /** @alias mysqli_stmt_construct */
+    public function __construct(mysqli $mysqli_link, string $statement = UNKNOWN) {}
 
-    /** @return int|false */
-    public function attr_get(int $attr);
+    /**
+     * @return int|false
+     * @alias mysqli_stmt_attr_get
+     */
+    public function attr_get(int $attr) {}
 
-    /** @return bool */
-    public function attr_set(int $attr, int $mode_in);
+    /**
+     * @return bool
+     * @alias mysqli_stmt_attr_set
+     */
+    public function attr_set(int $attr, int $mode_in) {}
 
-    /** @return bool */
-    public function bind_param(string $types, &...$vars);
+    /**
+     * @return bool
+     * @alias mysqli_stmt_bind_param
+     */
+    public function bind_param(string $types, &...$vars) {}
 
-    /** @return bool */
-    public function bind_result(&...$vars);
+    /**
+     * @return bool
+     * @alias mysqli_stmt_bind_result
+     */
+    public function bind_result(&...$vars) {}
 
-    /** @return bool */
-    public function close();
+    /**
+     * @return bool
+     * @alias mysqli_stmt_close
+     */
+    public function close() {}
 
-    /** @return null|false */
-    public function data_seek(int $offset);
+    /**
+     * @return bool|null
+     * @alias mysqli_stmt_data_seek
+     */
+    public function data_seek(int $offset) {}
 
-    /** @return bool */
-    public function execute();
+    /**
+     * @return bool
+     * @alias mysqli_stmt_execute
+     */
+    public function execute() {}
 
-    /** @return bool|null */
-    public function fetch();
+    /**
+     * @return bool|null
+     * @alias mysqli_stmt_fetch
+     */
+    public function fetch() {}
 
-    /** @return mysqli_warning|false */
-    public function get_warnings();
+    /**
+     * @return mysqli_warning|false
+     * @alias mysqli_stmt_get_warnings
+     */
+    public function get_warnings() {}
 
-    /** @return mysqli_result|false */
-    public function result_metadata();
+    /**
+     * @return mysqli_result|false
+     * @alias mysqli_stmt_result_metadata
+     */
+    public function result_metadata() {}
 
-    /** @return bool */
-    public function more_results();
+#if defined(MYSQLI_USE_MYSQLND)
+    /**
+     * @return bool
+     * @alias mysqli_stmt_more_results
+     */
+    public function more_results() {}
 
-    /** @return bool */
-    public function next_result();
+    /**
+     * @return bool
+     * @alias mysqli_stmt_next_result
+     */
+    public function next_result() {}
+#endif
 
-    /** @return int|string */
-    public function num_rows();
+    /**
+     * @return int|string
+     * @alias mysqli_stmt_num_rows
+     */
+    public function num_rows() {}
 
-    /** @return bool */
-    public function send_long_data(int $param_nr, string $data);
+    /**
+     * @return bool
+     * @alias mysqli_stmt_send_long_data
+     */
+    public function send_long_data(int $param_nr, string $data) {}
 
-    /** @return void */
-    public function free_result();
+    /**
+     * @return void
+     * @alias mysqli_stmt_free_result
+     */
+    public function free_result() {}
 
-    /** @return bool */
-    public function reset();
+    /**
+     * @return bool
+     * @alias mysqli_stmt_reset
+     */
+    public function reset() {}
 
-    /** @return bool */
-    public function prepare(string $query);
+    /**
+     * @return bool
+     * @alias mysqli_stmt_prepare
+     */
+    public function prepare(string $query) {}
 
-    /** @return bool */
-    public function store_result();
+    /**
+     * @return bool
+     * @alias mysqli_stmt_store_result
+     */
+    public function store_result() {}
 
-    /** @return mysqli_result|false */
-    public function get_result();
+#if defined(MYSQLI_USE_MYSQLND)
+    /**
+     * @return mysqli_result|false
+     * @alias mysqli_stmt_get_result
+     */
+    public function get_result() {}
+#endif
+}
+
+class mysqli_warning
+{
+    protected function __construct(object $mysqli_link) {}
+
+    /** @return bool */
+    public function next() {}
 }
 
 class mysqli_sql_exception extends RuntimeException
-{}
+{
+}
 
 function mysqli_affected_rows(mysqli $mysql_link): int|string {}
 
diff --git a/ext/mysqli/mysqli_arginfo.h b/ext/mysqli/mysqli_arginfo.h
index a540a8fa23..a857c59261 100644
--- a/ext/mysqli/mysqli_arginfo.h
+++ b/ext/mysqli/mysqli_arginfo.h
@@ -458,11 +458,17 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_debug, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, debug_options, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_mysqli_get_charset arginfo_class_mysqli_character_set_name
+#if defined(HAVE_MYSQLI_GET_CHARSET)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_get_charset, 0, 0, 0)
+ZEND_END_ARG_INFO()
+#endif
 
 #define arginfo_class_mysqli_get_client_info arginfo_class_mysqli_character_set_name
 
-#define arginfo_class_mysqli_get_connection_stats arginfo_class_mysqli_character_set_name
+#if defined(MYSQLI_USE_MYSQLND)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_get_connection_stats, 0, 0, 0)
+ZEND_END_ARG_INFO()
+#endif
 
 #define arginfo_class_mysqli_get_server_info arginfo_class_mysqli_character_set_name
 
@@ -484,6 +490,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_mysqli_ping arginfo_class_mysqli_character_set_name
 
+#if defined(MYSQLI_USE_MYSQLND)
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_poll, 0, 0, 4)
 	ZEND_ARG_TYPE_INFO(1, read, IS_ARRAY, 1)
 	ZEND_ARG_TYPE_INFO(1, write, IS_ARRAY, 1)
@@ -491,6 +498,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_poll, 0, 0, 4)
 	ZEND_ARG_TYPE_INFO(0, sec, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, usec, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
+#endif
 
 #define arginfo_class_mysqli_prepare arginfo_class_mysqli_multi_query
 
@@ -513,7 +521,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_real_escape_string, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, string_to_escape, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_mysqli_reap_async_query arginfo_class_mysqli_character_set_name
+#if defined(MYSQLI_USE_MYSQLND)
+#define arginfo_class_mysqli_reap_async_query arginfo_class_mysqli_get_connection_stats
+#endif
 
 #define arginfo_class_mysqli_escape_string arginfo_class_mysqli_real_escape_string
 
@@ -534,9 +544,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_select_db, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, database, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+#if defined(HAVE_MYSQLI_SET_CHARSET)
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_set_charset, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, charset, IS_STRING, 0)
 ZEND_END_ARG_INFO()
+#endif
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_options, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
@@ -590,9 +602,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_result_fetch_field_direct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, field_nr, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
+#if defined(MYSQLI_USE_MYSQLND)
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_result_fetch_all, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, result_type, IS_LONG, 0, "MYSQLI_NUM")
 ZEND_END_ARG_INFO()
+#endif
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_result_fetch_array, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, result_type, IS_LONG, 0, "MYSQLI_BOTH")
@@ -646,9 +660,13 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_mysqli_stmt_result_metadata arginfo_class_mysqli_character_set_name
 
-#define arginfo_class_mysqli_stmt_more_results arginfo_class_mysqli_character_set_name
+#if defined(MYSQLI_USE_MYSQLND)
+#define arginfo_class_mysqli_stmt_more_results arginfo_class_mysqli_get_connection_stats
+#endif
 
-#define arginfo_class_mysqli_stmt_next_result arginfo_class_mysqli_character_set_name
+#if defined(MYSQLI_USE_MYSQLND)
+#define arginfo_class_mysqli_stmt_next_result arginfo_class_mysqli_get_connection_stats
+#endif
 
 #define arginfo_class_mysqli_stmt_num_rows arginfo_class_mysqli_character_set_name
 
@@ -665,4 +683,384 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_mysqli_stmt_store_result arginfo_class_mysqli_character_set_name
 
-#define arginfo_class_mysqli_stmt_get_result arginfo_class_mysqli_character_set_name
+#if defined(MYSQLI_USE_MYSQLND)
+#define arginfo_class_mysqli_stmt_get_result arginfo_class_mysqli_get_connection_stats
+#endif
+
+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
+
+
+ZEND_FUNCTION(mysqli_affected_rows);
+ZEND_FUNCTION(mysqli_autocommit);
+ZEND_FUNCTION(mysqli_begin_transaction);
+ZEND_FUNCTION(mysqli_change_user);
+ZEND_FUNCTION(mysqli_character_set_name);
+ZEND_FUNCTION(mysqli_close);
+ZEND_FUNCTION(mysqli_commit);
+ZEND_FUNCTION(mysqli_connect);
+ZEND_FUNCTION(mysqli_connect_errno);
+ZEND_FUNCTION(mysqli_connect_error);
+ZEND_FUNCTION(mysqli_data_seek);
+ZEND_FUNCTION(mysqli_dump_debug_info);
+ZEND_FUNCTION(mysqli_debug);
+ZEND_FUNCTION(mysqli_errno);
+ZEND_FUNCTION(mysqli_error);
+ZEND_FUNCTION(mysqli_error_list);
+ZEND_FUNCTION(mysqli_stmt_execute);
+ZEND_FUNCTION(mysqli_fetch_field);
+ZEND_FUNCTION(mysqli_fetch_fields);
+ZEND_FUNCTION(mysqli_fetch_field_direct);
+ZEND_FUNCTION(mysqli_fetch_lengths);
+ZEND_FUNCTION(mysqli_fetch_all);
+ZEND_FUNCTION(mysqli_fetch_array);
+ZEND_FUNCTION(mysqli_fetch_assoc);
+ZEND_FUNCTION(mysqli_fetch_object);
+ZEND_FUNCTION(mysqli_fetch_row);
+ZEND_FUNCTION(mysqli_field_count);
+ZEND_FUNCTION(mysqli_field_seek);
+ZEND_FUNCTION(mysqli_field_tell);
+ZEND_FUNCTION(mysqli_free_result);
+ZEND_FUNCTION(mysqli_get_connection_stats);
+ZEND_FUNCTION(mysqli_get_client_stats);
+ZEND_FUNCTION(mysqli_get_charset);
+ZEND_FUNCTION(mysqli_get_client_info);
+ZEND_FUNCTION(mysqli_get_client_version);
+ZEND_FUNCTION(mysqli_get_links_stats);
+ZEND_FUNCTION(mysqli_get_host_info);
+ZEND_FUNCTION(mysqli_get_proto_info);
+ZEND_FUNCTION(mysqli_get_server_info);
+ZEND_FUNCTION(mysqli_get_server_version);
+ZEND_FUNCTION(mysqli_get_warnings);
+ZEND_FUNCTION(mysqli_init);
+ZEND_FUNCTION(mysqli_info);
+ZEND_FUNCTION(mysqli_insert_id);
+ZEND_FUNCTION(mysqli_kill);
+ZEND_FUNCTION(mysqli_more_results);
+ZEND_FUNCTION(mysqli_multi_query);
+ZEND_FUNCTION(mysqli_next_result);
+ZEND_FUNCTION(mysqli_num_fields);
+ZEND_FUNCTION(mysqli_num_rows);
+ZEND_FUNCTION(mysqli_options);
+ZEND_FUNCTION(mysqli_ping);
+ZEND_FUNCTION(mysqli_poll);
+ZEND_FUNCTION(mysqli_prepare);
+ZEND_FUNCTION(mysqli_report);
+ZEND_FUNCTION(mysqli_query);
+ZEND_FUNCTION(mysqli_real_connect);
+ZEND_FUNCTION(mysqli_real_escape_string);
+ZEND_FUNCTION(mysqli_real_query);
+ZEND_FUNCTION(mysqli_reap_async_query);
+ZEND_FUNCTION(mysqli_release_savepoint);
+ZEND_FUNCTION(mysqli_rollback);
+ZEND_FUNCTION(mysqli_savepoint);
+ZEND_FUNCTION(mysqli_select_db);
+ZEND_FUNCTION(mysqli_set_charset);
+ZEND_FUNCTION(mysqli_stmt_affected_rows);
+ZEND_FUNCTION(mysqli_stmt_attr_get);
+ZEND_FUNCTION(mysqli_stmt_attr_set);
+ZEND_FUNCTION(mysqli_stmt_bind_param);
+ZEND_FUNCTION(mysqli_stmt_bind_result);
+ZEND_FUNCTION(mysqli_stmt_close);
+ZEND_FUNCTION(mysqli_stmt_data_seek);
+ZEND_FUNCTION(mysqli_stmt_errno);
+ZEND_FUNCTION(mysqli_stmt_error);
+ZEND_FUNCTION(mysqli_stmt_error_list);
+ZEND_FUNCTION(mysqli_stmt_fetch);
+ZEND_FUNCTION(mysqli_stmt_field_count);
+ZEND_FUNCTION(mysqli_stmt_free_result);
+ZEND_FUNCTION(mysqli_stmt_get_result);
+ZEND_FUNCTION(mysqli_stmt_get_warnings);
+ZEND_FUNCTION(mysqli_stmt_init);
+ZEND_FUNCTION(mysqli_stmt_insert_id);
+ZEND_FUNCTION(mysqli_stmt_more_results);
+ZEND_FUNCTION(mysqli_stmt_next_result);
+ZEND_FUNCTION(mysqli_stmt_num_rows);
+ZEND_FUNCTION(mysqli_stmt_param_count);
+ZEND_FUNCTION(mysqli_stmt_prepare);
+ZEND_FUNCTION(mysqli_stmt_reset);
+ZEND_FUNCTION(mysqli_stmt_result_metadata);
+ZEND_FUNCTION(mysqli_stmt_send_long_data);
+ZEND_FUNCTION(mysqli_stmt_store_result);
+ZEND_FUNCTION(mysqli_stmt_sqlstate);
+ZEND_FUNCTION(mysqli_sqlstate);
+ZEND_FUNCTION(mysqli_ssl_set);
+ZEND_FUNCTION(mysqli_stat);
+ZEND_FUNCTION(mysqli_store_result);
+ZEND_FUNCTION(mysqli_thread_id);
+ZEND_FUNCTION(mysqli_thread_safe);
+ZEND_FUNCTION(mysqli_use_result);
+ZEND_FUNCTION(mysqli_warning_count);
+ZEND_FUNCTION(mysqli_refresh);
+ZEND_FUNCTION(mysqli_link_construct);
+#if defined(HAVE_MYSQLI_GET_CHARSET)
+ZEND_FUNCTION(mysqli_get_charset);
+#endif
+#if defined(MYSQLI_USE_MYSQLND)
+ZEND_FUNCTION(mysqli_get_connection_stats);
+#endif
+ZEND_FUNCTION(mysqli_init_method);
+#if defined(MYSQLI_USE_MYSQLND)
+ZEND_FUNCTION(mysqli_poll);
+#endif
+#if defined(MYSQLI_USE_MYSQLND)
+ZEND_FUNCTION(mysqli_reap_async_query);
+#endif
+#if defined(HAVE_MYSQLI_SET_CHARSET)
+ZEND_FUNCTION(mysqli_set_charset);
+#endif
+ZEND_FUNCTION(mysqli_result_construct);
+#if defined(MYSQLI_USE_MYSQLND)
+ZEND_FUNCTION(mysqli_fetch_all);
+#endif
+ZEND_FUNCTION(mysqli_stmt_construct);
+#if defined(MYSQLI_USE_MYSQLND)
+ZEND_FUNCTION(mysqli_stmt_more_results);
+#endif
+#if defined(MYSQLI_USE_MYSQLND)
+ZEND_FUNCTION(mysqli_stmt_next_result);
+#endif
+#if defined(MYSQLI_USE_MYSQLND)
+ZEND_FUNCTION(mysqli_stmt_get_result);
+#endif
+ZEND_METHOD(mysqli_warning, __construct);
+ZEND_METHOD(mysqli_warning, next);
+
+
+static const zend_function_entry ext_functions[] = {
+	ZEND_FE(mysqli_affected_rows, arginfo_mysqli_affected_rows)
+	ZEND_FE(mysqli_autocommit, arginfo_mysqli_autocommit)
+	ZEND_FE(mysqli_begin_transaction, arginfo_mysqli_begin_transaction)
+	ZEND_FE(mysqli_change_user, arginfo_mysqli_change_user)
+	ZEND_FE(mysqli_character_set_name, arginfo_mysqli_character_set_name)
+	ZEND_FE(mysqli_close, arginfo_mysqli_close)
+	ZEND_FE(mysqli_commit, arginfo_mysqli_commit)
+	ZEND_FE(mysqli_connect, arginfo_mysqli_connect)
+	ZEND_FE(mysqli_connect_errno, arginfo_mysqli_connect_errno)
+	ZEND_FE(mysqli_connect_error, arginfo_mysqli_connect_error)
+	ZEND_FE(mysqli_data_seek, arginfo_mysqli_data_seek)
+	ZEND_FE(mysqli_dump_debug_info, arginfo_mysqli_dump_debug_info)
+	ZEND_FE(mysqli_debug, arginfo_mysqli_debug)
+	ZEND_FE(mysqli_errno, arginfo_mysqli_errno)
+	ZEND_FE(mysqli_error, arginfo_mysqli_error)
+	ZEND_FE(mysqli_error_list, arginfo_mysqli_error_list)
+	ZEND_FE(mysqli_stmt_execute, arginfo_mysqli_stmt_execute)
+	ZEND_FALIAS(mysqli_execute, mysqli_stmt_execute, arginfo_mysqli_execute)
+	ZEND_FE(mysqli_fetch_field, arginfo_mysqli_fetch_field)
+	ZEND_FE(mysqli_fetch_fields, arginfo_mysqli_fetch_fields)
+	ZEND_FE(mysqli_fetch_field_direct, arginfo_mysqli_fetch_field_direct)
+	ZEND_FE(mysqli_fetch_lengths, arginfo_mysqli_fetch_lengths)
+	ZEND_FE(mysqli_fetch_all, arginfo_mysqli_fetch_all)
+	ZEND_FE(mysqli_fetch_array, arginfo_mysqli_fetch_array)
+	ZEND_FE(mysqli_fetch_assoc, arginfo_mysqli_fetch_assoc)
+	ZEND_FE(mysqli_fetch_object, arginfo_mysqli_fetch_object)
+	ZEND_FE(mysqli_fetch_row, arginfo_mysqli_fetch_row)
+	ZEND_FE(mysqli_field_count, arginfo_mysqli_field_count)
+	ZEND_FE(mysqli_field_seek, arginfo_mysqli_field_seek)
+	ZEND_FE(mysqli_field_tell, arginfo_mysqli_field_tell)
+	ZEND_FE(mysqli_free_result, arginfo_mysqli_free_result)
+	ZEND_FE(mysqli_get_connection_stats, arginfo_mysqli_get_connection_stats)
+	ZEND_FE(mysqli_get_client_stats, arginfo_mysqli_get_client_stats)
+	ZEND_FE(mysqli_get_charset, arginfo_mysqli_get_charset)
+	ZEND_FE(mysqli_get_client_info, arginfo_mysqli_get_client_info)
+	ZEND_FE(mysqli_get_client_version, arginfo_mysqli_get_client_version)
+	ZEND_FE(mysqli_get_links_stats, arginfo_mysqli_get_links_stats)
+	ZEND_FE(mysqli_get_host_info, arginfo_mysqli_get_host_info)
+	ZEND_FE(mysqli_get_proto_info, arginfo_mysqli_get_proto_info)
+	ZEND_FE(mysqli_get_server_info, arginfo_mysqli_get_server_info)
+	ZEND_FE(mysqli_get_server_version, arginfo_mysqli_get_server_version)
+	ZEND_FE(mysqli_get_warnings, arginfo_mysqli_get_warnings)
+	ZEND_FE(mysqli_init, arginfo_mysqli_init)
+	ZEND_FE(mysqli_info, arginfo_mysqli_info)
+	ZEND_FE(mysqli_insert_id, arginfo_mysqli_insert_id)
+	ZEND_FE(mysqli_kill, arginfo_mysqli_kill)
+	ZEND_FE(mysqli_more_results, arginfo_mysqli_more_results)
+	ZEND_FE(mysqli_multi_query, arginfo_mysqli_multi_query)
+	ZEND_FE(mysqli_next_result, arginfo_mysqli_next_result)
+	ZEND_FE(mysqli_num_fields, arginfo_mysqli_num_fields)
+	ZEND_FE(mysqli_num_rows, arginfo_mysqli_num_rows)
+	ZEND_FE(mysqli_options, arginfo_mysqli_options)
+	ZEND_FE(mysqli_ping, arginfo_mysqli_ping)
+	ZEND_FE(mysqli_poll, arginfo_mysqli_poll)
+	ZEND_FE(mysqli_prepare, arginfo_mysqli_prepare)
+	ZEND_FE(mysqli_report, arginfo_mysqli_report)
+	ZEND_FE(mysqli_query, arginfo_mysqli_query)
+	ZEND_FE(mysqli_real_connect, arginfo_mysqli_real_connect)
+	ZEND_FE(mysqli_real_escape_string, arginfo_mysqli_real_escape_string)
+	ZEND_FE(mysqli_real_query, arginfo_mysqli_real_query)
+	ZEND_FE(mysqli_reap_async_query, arginfo_mysqli_reap_async_query)
+	ZEND_FE(mysqli_release_savepoint, arginfo_mysqli_release_savepoint)
+	ZEND_FE(mysqli_rollback, arginfo_mysqli_rollback)
+	ZEND_FE(mysqli_savepoint, arginfo_mysqli_savepoint)
+	ZEND_FE(mysqli_select_db, arginfo_mysqli_select_db)
+	ZEND_FE(mysqli_set_charset, arginfo_mysqli_set_charset)
+	ZEND_FE(mysqli_stmt_affected_rows, arginfo_mysqli_stmt_affected_rows)
+	ZEND_FE(mysqli_stmt_attr_get, arginfo_mysqli_stmt_attr_get)
+	ZEND_FE(mysqli_stmt_attr_set, arginfo_mysqli_stmt_attr_set)
+	ZEND_FE(mysqli_stmt_bind_param, arginfo_mysqli_stmt_bind_param)
+	ZEND_FE(mysqli_stmt_bind_result, arginfo_mysqli_stmt_bind_result)
+	ZEND_FE(mysqli_stmt_close, arginfo_mysqli_stmt_close)
+	ZEND_FE(mysqli_stmt_data_seek, arginfo_mysqli_stmt_data_seek)
+	ZEND_FE(mysqli_stmt_errno, arginfo_mysqli_stmt_errno)
+	ZEND_FE(mysqli_stmt_error, arginfo_mysqli_stmt_error)
+	ZEND_FE(mysqli_stmt_error_list, arginfo_mysqli_stmt_error_list)
+	ZEND_FE(mysqli_stmt_fetch, arginfo_mysqli_stmt_fetch)
+	ZEND_FE(mysqli_stmt_field_count, arginfo_mysqli_stmt_field_count)
+	ZEND_FE(mysqli_stmt_free_result, arginfo_mysqli_stmt_free_result)
+	ZEND_FE(mysqli_stmt_get_result, arginfo_mysqli_stmt_get_result)
+	ZEND_FE(mysqli_stmt_get_warnings, arginfo_mysqli_stmt_get_warnings)
+	ZEND_FE(mysqli_stmt_init, arginfo_mysqli_stmt_init)
+	ZEND_FE(mysqli_stmt_insert_id, arginfo_mysqli_stmt_insert_id)
+	ZEND_FE(mysqli_stmt_more_results, arginfo_mysqli_stmt_more_results)
+	ZEND_FE(mysqli_stmt_next_result, arginfo_mysqli_stmt_next_result)
+	ZEND_FE(mysqli_stmt_num_rows, arginfo_mysqli_stmt_num_rows)
+	ZEND_FE(mysqli_stmt_param_count, arginfo_mysqli_stmt_param_count)
+	ZEND_FE(mysqli_stmt_prepare, arginfo_mysqli_stmt_prepare)
+	ZEND_FE(mysqli_stmt_reset, arginfo_mysqli_stmt_reset)
+	ZEND_FE(mysqli_stmt_result_metadata, arginfo_mysqli_stmt_result_metadata)
+	ZEND_FE(mysqli_stmt_send_long_data, arginfo_mysqli_stmt_send_long_data)
+	ZEND_FE(mysqli_stmt_store_result, arginfo_mysqli_stmt_store_result)
+	ZEND_FE(mysqli_stmt_sqlstate, arginfo_mysqli_stmt_sqlstate)
+	ZEND_FE(mysqli_sqlstate, arginfo_mysqli_sqlstate)
+	ZEND_FE(mysqli_ssl_set, arginfo_mysqli_ssl_set)
+	ZEND_FE(mysqli_stat, arginfo_mysqli_stat)
+	ZEND_FE(mysqli_store_result, arginfo_mysqli_store_result)
+	ZEND_FE(mysqli_thread_id, arginfo_mysqli_thread_id)
+	ZEND_FE(mysqli_thread_safe, arginfo_mysqli_thread_safe)
+	ZEND_FE(mysqli_use_result, arginfo_mysqli_use_result)
+	ZEND_FE(mysqli_warning_count, arginfo_mysqli_warning_count)
+	ZEND_FE(mysqli_refresh, arginfo_mysqli_refresh)
+	ZEND_FALIAS(mysqli_escape_string, mysqli_real_escape_string, arginfo_mysqli_escape_string)
+	ZEND_FALIAS(mysqli_set_opt, mysqli_options, arginfo_mysqli_set_opt)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_mysqli_driver_methods[] = {
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_mysqli_methods[] = {
+	ZEND_ME_MAPPING(__construct, mysqli_link_construct, arginfo_class_mysqli___construct, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(autocommit, mysqli_autocommit, arginfo_class_mysqli_autocommit, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(begin_transaction, mysqli_begin_transaction, arginfo_class_mysqli_begin_transaction, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(change_user, mysqli_change_user, arginfo_class_mysqli_change_user, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(character_set_name, mysqli_character_set_name, arginfo_class_mysqli_character_set_name, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(close, mysqli_close, arginfo_class_mysqli_close, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(commit, mysqli_commit, arginfo_class_mysqli_commit, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(connect, mysqli_connect, arginfo_class_mysqli_connect, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(dump_debug_info, mysqli_dump_debug_info, arginfo_class_mysqli_dump_debug_info, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(debug, mysqli_debug, arginfo_class_mysqli_debug, ZEND_ACC_PUBLIC)
+#if defined(HAVE_MYSQLI_GET_CHARSET)
+	ZEND_ME_MAPPING(get_charset, mysqli_get_charset, arginfo_class_mysqli_get_charset, ZEND_ACC_PUBLIC)
+#endif
+	ZEND_ME_MAPPING(get_client_info, mysqli_get_client_info, arginfo_class_mysqli_get_client_info, ZEND_ACC_PUBLIC)
+#if defined(MYSQLI_USE_MYSQLND)
+	ZEND_ME_MAPPING(get_connection_stats, mysqli_get_connection_stats, arginfo_class_mysqli_get_connection_stats, ZEND_ACC_PUBLIC)
+#endif
+	ZEND_ME_MAPPING(get_server_info, mysqli_get_server_info, arginfo_class_mysqli_get_server_info, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(get_warnings, mysqli_get_warnings, arginfo_class_mysqli_get_warnings, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(init, mysqli_init_method, arginfo_class_mysqli_init, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(kill, mysqli_kill, arginfo_class_mysqli_kill, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(multi_query, mysqli_multi_query, arginfo_class_mysqli_multi_query, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(more_results, mysqli_more_results, arginfo_class_mysqli_more_results, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(next_result, mysqli_next_result, arginfo_class_mysqli_next_result, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(ping, mysqli_ping, arginfo_class_mysqli_ping, ZEND_ACC_PUBLIC)
+#if defined(MYSQLI_USE_MYSQLND)
+	ZEND_ME_MAPPING(poll, mysqli_poll, arginfo_class_mysqli_poll, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+#endif
+	ZEND_ME_MAPPING(prepare, mysqli_prepare, arginfo_class_mysqli_prepare, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(query, mysqli_query, arginfo_class_mysqli_query, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(real_connect, mysqli_real_connect, arginfo_class_mysqli_real_connect, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(real_escape_string, mysqli_real_escape_string, arginfo_class_mysqli_real_escape_string, ZEND_ACC_PUBLIC)
+#if defined(MYSQLI_USE_MYSQLND)
+	ZEND_ME_MAPPING(reap_async_query, mysqli_reap_async_query, arginfo_class_mysqli_reap_async_query, ZEND_ACC_PUBLIC)
+#endif
+	ZEND_ME_MAPPING(escape_string, mysqli_real_escape_string, arginfo_class_mysqli_escape_string, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(real_query, mysqli_real_query, arginfo_class_mysqli_real_query, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(release_savepoint, mysqli_release_savepoint, arginfo_class_mysqli_release_savepoint, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(rollback, mysqli_rollback, arginfo_class_mysqli_rollback, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(savepoint, mysqli_savepoint, arginfo_class_mysqli_savepoint, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(select_db, mysqli_select_db, arginfo_class_mysqli_select_db, ZEND_ACC_PUBLIC)
+#if defined(HAVE_MYSQLI_SET_CHARSET)
+	ZEND_ME_MAPPING(set_charset, mysqli_set_charset, arginfo_class_mysqli_set_charset, ZEND_ACC_PUBLIC)
+#endif
+	ZEND_ME_MAPPING(options, mysqli_options, arginfo_class_mysqli_options, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(set_opt, mysqli_options, arginfo_class_mysqli_set_opt, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(ssl_set, mysqli_ssl_set, arginfo_class_mysqli_ssl_set, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(stat, mysqli_stat, arginfo_class_mysqli_stat, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(stmt_init, mysqli_stmt_init, arginfo_class_mysqli_stmt_init, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(store_result, mysqli_store_result, arginfo_class_mysqli_store_result, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(thread_safe, mysqli_thread_safe, arginfo_class_mysqli_thread_safe, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(use_result, mysqli_use_result, arginfo_class_mysqli_use_result, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(refresh, mysqli_refresh, arginfo_class_mysqli_refresh, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_mysqli_result_methods[] = {
+	ZEND_ME_MAPPING(__construct, mysqli_result_construct, arginfo_class_mysqli_result___construct, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(close, mysqli_free_result, arginfo_class_mysqli_result_close, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(free, mysqli_free_result, arginfo_class_mysqli_result_free, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(data_seek, mysqli_data_seek, arginfo_class_mysqli_result_data_seek, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(fetch_field, mysqli_fetch_field, arginfo_class_mysqli_result_fetch_field, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(fetch_fields, mysqli_fetch_fields, arginfo_class_mysqli_result_fetch_fields, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(fetch_field_direct, mysqli_fetch_field_direct, arginfo_class_mysqli_result_fetch_field_direct, ZEND_ACC_PUBLIC)
+#if defined(MYSQLI_USE_MYSQLND)
+	ZEND_ME_MAPPING(fetch_all, mysqli_fetch_all, arginfo_class_mysqli_result_fetch_all, ZEND_ACC_PUBLIC)
+#endif
+	ZEND_ME_MAPPING(fetch_array, mysqli_fetch_array, arginfo_class_mysqli_result_fetch_array, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(fetch_assoc, mysqli_fetch_assoc, arginfo_class_mysqli_result_fetch_assoc, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(fetch_object, mysqli_fetch_object, arginfo_class_mysqli_result_fetch_object, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(fetch_row, mysqli_fetch_row, arginfo_class_mysqli_result_fetch_row, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(field_seek, mysqli_field_seek, arginfo_class_mysqli_result_field_seek, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(free_result, mysqli_free_result, arginfo_class_mysqli_result_free_result, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_mysqli_stmt_methods[] = {
+	ZEND_ME_MAPPING(__construct, mysqli_stmt_construct, arginfo_class_mysqli_stmt___construct, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(attr_get, mysqli_stmt_attr_get, arginfo_class_mysqli_stmt_attr_get, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(attr_set, mysqli_stmt_attr_set, arginfo_class_mysqli_stmt_attr_set, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(bind_param, mysqli_stmt_bind_param, arginfo_class_mysqli_stmt_bind_param, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(bind_result, mysqli_stmt_bind_result, arginfo_class_mysqli_stmt_bind_result, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(close, mysqli_stmt_close, arginfo_class_mysqli_stmt_close, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(data_seek, mysqli_stmt_data_seek, arginfo_class_mysqli_stmt_data_seek, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(execute, mysqli_stmt_execute, arginfo_class_mysqli_stmt_execute, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(fetch, mysqli_stmt_fetch, arginfo_class_mysqli_stmt_fetch, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(get_warnings, mysqli_stmt_get_warnings, arginfo_class_mysqli_stmt_get_warnings, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(result_metadata, mysqli_stmt_result_metadata, arginfo_class_mysqli_stmt_result_metadata, ZEND_ACC_PUBLIC)
+#if defined(MYSQLI_USE_MYSQLND)
+	ZEND_ME_MAPPING(more_results, mysqli_stmt_more_results, arginfo_class_mysqli_stmt_more_results, ZEND_ACC_PUBLIC)
+#endif
+#if defined(MYSQLI_USE_MYSQLND)
+	ZEND_ME_MAPPING(next_result, mysqli_stmt_next_result, arginfo_class_mysqli_stmt_next_result, ZEND_ACC_PUBLIC)
+#endif
+	ZEND_ME_MAPPING(num_rows, mysqli_stmt_num_rows, arginfo_class_mysqli_stmt_num_rows, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(send_long_data, mysqli_stmt_send_long_data, arginfo_class_mysqli_stmt_send_long_data, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(free_result, mysqli_stmt_free_result, arginfo_class_mysqli_stmt_free_result, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(reset, mysqli_stmt_reset, arginfo_class_mysqli_stmt_reset, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(prepare, mysqli_stmt_prepare, arginfo_class_mysqli_stmt_prepare, ZEND_ACC_PUBLIC)
+	ZEND_ME_MAPPING(store_result, mysqli_stmt_store_result, arginfo_class_mysqli_stmt_store_result, ZEND_ACC_PUBLIC)
+#if defined(MYSQLI_USE_MYSQLND)
+	ZEND_ME_MAPPING(get_result, mysqli_stmt_get_result, arginfo_class_mysqli_stmt_get_result, ZEND_ACC_PUBLIC)
+#endif
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_mysqli_warning_methods[] = {
+	ZEND_ME(mysqli_warning, __construct, arginfo_class_mysqli_warning___construct, ZEND_ACC_PROTECTED)
+	ZEND_ME(mysqli_warning, next, arginfo_class_mysqli_warning_next, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_mysqli_sql_exception_methods[] = {
+	ZEND_FE_END
+};
diff --git a/ext/mysqli/mysqli_driver.c b/ext/mysqli/mysqli_driver.c
index d0cc505cbf..72c571ba82 100644
--- a/ext/mysqli/mysqli_driver.c
+++ b/ext/mysqli/mysqli_driver.c
@@ -25,7 +25,6 @@
 #include "ext/standard/info.h"
 #include "php_mysqli_structs.h"
 #include "zend_exceptions.h"
-#include "mysqli_fe.h"
 
 #define MAP_PROPERTY_MYG_BOOL_READ(name, value) \
 static int name(mysqli_object *obj, zval *retval, zend_bool quiet) \
@@ -141,9 +140,3 @@ const mysqli_property_entry mysqli_driver_property_entries[] = {
 	{NULL, 0, NULL, NULL}
 };
 
-/* {{{ mysqli_driver_methods[]
- */
-const zend_function_entry mysqli_driver_methods[] = {
-	PHP_FE_END
-};
-/* }}} */
diff --git a/ext/mysqli/mysqli_exception.c b/ext/mysqli/mysqli_exception.c
index f93479328c..d8a8d4dad1 100644
--- a/ext/mysqli/mysqli_exception.c
+++ b/ext/mysqli/mysqli_exception.c
@@ -27,13 +27,6 @@
 #include "mysqli_priv.h"
 #include "zend_exceptions.h"
 
-/* {{{ mysqli_exception_methods[]
- */
-const zend_function_entry mysqli_exception_methods[] = {
-	PHP_FE_END
-};
-/* }}} */
-
 void php_mysqli_throw_sql_exception(char *sqlstate, int errorno, char *format, ...)
 {
 	zval	sql_ex;
diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c
deleted file mode 100644
index 07b24de106..0000000000
--- a/ext/mysqli/mysqli_fe.c
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
-  +----------------------------------------------------------------------+
-  | Copyright (c) The PHP Group                                          |
-  +----------------------------------------------------------------------+
-  | This source file is subject to version 3.01 of the PHP license,      |
-  | that is bundled with this package in the file LICENSE, and is        |
-  | available through the world-wide-web at the following url:           |
-  | http://www.php.net/license/3_01.txt                                  |
-  | If you did not receive a copy of the PHP license and are unable to   |
-  | obtain it through the world-wide-web, please send a note to          |
-  | license@php.net so we can mail you a copy immediately.               |
-  +----------------------------------------------------------------------+
-  | Authors: Georg Richter <georg@php.net>                               |
-  |          Andrey Hristov <andrey@php.net>                             |
-  |          Ulf Wendel <uw@php.net>                                     |
-  +----------------------------------------------------------------------+
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <signal.h>
-
-#include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
-#include "php_mysqli_structs.h"
-#include "mysqli_fe.h"
-#include "mysqli_priv.h"
-
-#include "mysqli_arginfo.h"
-
-#ifdef MYSQLI_USE_FULL_TYPED_ARGINFO_0
-#define MYSQLI_ZEND_ARG_OBJ_INFO_LINK() ZEND_ARG_OBJ_INFO(0, link, mysqli, 0)
-#define MYSQLI_ZEND_ARG_OBJ_INFO_RESULT() ZEND_ARG_OBJ_INFO(0, result, mysqli_result, 0)
-#define MYSQLI_ZEND_ARG_OBJ_INFO_STMT() ZEND_ARG_OBJ_INFO(0, stmt, mysqli_stmt, 0)
-#else
-#define MYSQLI_ZEND_ARG_OBJ_INFO_LINK() ZEND_ARG_INFO(0, link)
-#define MYSQLI_ZEND_ARG_OBJ_INFO_RESULT() ZEND_ARG_INFO(0, result)
-#define MYSQLI_ZEND_ARG_OBJ_INFO_STMT() ZEND_ARG_INFO(0, stmt)
-#endif
-
-/* {{{ mysqli_functions[]
- *
- * Every user visible function must have an entry in mysqli_functions[].
- */
-const zend_function_entry mysqli_functions[] = {
-	PHP_FE(mysqli_affected_rows,						arginfo_mysqli_affected_rows)
-	PHP_FE(mysqli_autocommit,							arginfo_mysqli_autocommit)
-	PHP_FE(mysqli_begin_transaction,					arginfo_mysqli_begin_transaction)
-	PHP_FE(mysqli_change_user,							arginfo_mysqli_change_user)
-	PHP_FE(mysqli_character_set_name,					arginfo_mysqli_character_set_name)
-	PHP_FE(mysqli_close,								arginfo_mysqli_close)
-	PHP_FE(mysqli_commit,								arginfo_mysqli_commit)
-	PHP_FE(mysqli_connect, 								arginfo_mysqli_connect)
-	PHP_FE(mysqli_connect_errno,						arginfo_mysqli_connect_errno)
-	PHP_FE(mysqli_connect_error,						arginfo_mysqli_connect_error)
-	PHP_FE(mysqli_data_seek,							arginfo_mysqli_data_seek)
-	PHP_FE(mysqli_dump_debug_info,						arginfo_mysqli_dump_debug_info)
-	PHP_FE(mysqli_debug,								arginfo_mysqli_debug)
-	PHP_FE(mysqli_errno,								arginfo_mysqli_errno)
-	PHP_FE(mysqli_error,								arginfo_mysqli_error)
-	PHP_FE(mysqli_error_list,							arginfo_mysqli_error_list)
-	PHP_FE(mysqli_stmt_execute,							arginfo_mysqli_stmt_execute)
-	PHP_FALIAS(mysqli_execute, mysqli_stmt_execute,		arginfo_mysqli_execute)
-	PHP_FE(mysqli_fetch_field,							arginfo_mysqli_fetch_field)
-	PHP_FE(mysqli_fetch_fields,							arginfo_mysqli_fetch_fields)
-	PHP_FE(mysqli_fetch_field_direct,					arginfo_mysqli_fetch_field_direct)
-	PHP_FE(mysqli_fetch_lengths,						arginfo_mysqli_fetch_lengths)
-#ifdef MYSQLI_USE_MYSQLND
-	PHP_FE(mysqli_fetch_all,							arginfo_mysqli_fetch_all)
-#endif
-	PHP_FE(mysqli_fetch_array,							arginfo_mysqli_fetch_array)
-	PHP_FE(mysqli_fetch_assoc,							arginfo_mysqli_fetch_assoc)
-	PHP_FE(mysqli_fetch_object,							arginfo_mysqli_fetch_object)
-	PHP_FE(mysqli_fetch_row,							arginfo_mysqli_fetch_row)
-	PHP_FE(mysqli_field_count,							arginfo_mysqli_field_count)
-	PHP_FE(mysqli_field_seek,							arginfo_mysqli_field_seek)
-	PHP_FE(mysqli_field_tell,							arginfo_mysqli_field_tell)
-	PHP_FE(mysqli_free_result,							arginfo_mysqli_free_result)
-#if defined(MYSQLI_USE_MYSQLND)
-	PHP_FE(mysqli_get_connection_stats,					arginfo_mysqli_get_connection_stats)
-	PHP_FE(mysqli_get_client_stats,						arginfo_mysqli_get_client_stats)
-#endif
-#ifdef HAVE_MYSQLI_GET_CHARSET
-	PHP_FE(mysqli_get_charset,							arginfo_mysqli_get_charset)
-#endif
-	PHP_FE(mysqli_get_client_info,						arginfo_mysqli_get_client_info)
-	PHP_FE(mysqli_get_client_version,					arginfo_mysqli_get_client_version)
-	PHP_FE(mysqli_get_links_stats,						arginfo_mysqli_get_links_stats)
-	PHP_FE(mysqli_get_host_info,						arginfo_mysqli_get_host_info)
-	PHP_FE(mysqli_get_proto_info,						arginfo_mysqli_get_proto_info)
-	PHP_FE(mysqli_get_server_info,						arginfo_mysqli_get_server_info)
-	PHP_FE(mysqli_get_server_version,					arginfo_mysqli_get_server_version)
-	PHP_FE(mysqli_get_warnings,							arginfo_mysqli_get_warnings)
-	PHP_FE(mysqli_init, 								arginfo_mysqli_init)
-	PHP_FE(mysqli_info,									arginfo_mysqli_info)
-	PHP_FE(mysqli_insert_id,							arginfo_mysqli_insert_id)
-	PHP_FE(mysqli_kill,									arginfo_mysqli_kill)
-	PHP_FE(mysqli_more_results,							arginfo_mysqli_more_results)
-	PHP_FE(mysqli_multi_query, 							arginfo_mysqli_multi_query)
-	PHP_FE(mysqli_next_result,							arginfo_mysqli_next_result)
-	PHP_FE(mysqli_num_fields,							arginfo_mysqli_num_fields)
-	PHP_FE(mysqli_num_rows,								arginfo_mysqli_num_rows)
-	PHP_FE(mysqli_options, 								arginfo_mysqli_options)
-	PHP_FE(mysqli_ping,									arginfo_mysqli_ping)
-#if defined(MYSQLI_USE_MYSQLND)
-	PHP_FE(mysqli_poll,									arginfo_mysqli_poll)
-#endif
-	PHP_FE(mysqli_prepare,								arginfo_mysqli_prepare)
-	PHP_FE(mysqli_report,								arginfo_mysqli_report)
-	PHP_FE(mysqli_query,								arginfo_mysqli_query)
-	PHP_FE(mysqli_real_connect,							arginfo_mysqli_real_connect)
-	PHP_FE(mysqli_real_escape_string,					arginfo_mysqli_real_escape_string)
-	PHP_FE(mysqli_real_query,							arginfo_mysqli_real_query)
-#if defined(MYSQLI_USE_MYSQLND)
-	PHP_FE(mysqli_reap_async_query,						arginfo_mysqli_reap_async_query)
-#endif
-	PHP_FE(mysqli_release_savepoint,					arginfo_mysqli_release_savepoint)
-	PHP_FE(mysqli_rollback,								arginfo_mysqli_rollback)
-	PHP_FE(mysqli_savepoint,							arginfo_mysqli_savepoint)
-	PHP_FE(mysqli_select_db,							arginfo_mysqli_select_db)
-#ifdef HAVE_MYSQLI_SET_CHARSET
-	PHP_FE(mysqli_set_charset,							arginfo_mysqli_set_charset)
-#endif
-	PHP_FE(mysqli_stmt_affected_rows,					arginfo_mysqli_stmt_affected_rows)
-	PHP_FE(mysqli_stmt_attr_get,						arginfo_mysqli_stmt_attr_get)
-	PHP_FE(mysqli_stmt_attr_set,						arginfo_mysqli_stmt_attr_set)
-	PHP_FE(mysqli_stmt_bind_param,						arginfo_mysqli_stmt_bind_param)
-	PHP_FE(mysqli_stmt_bind_result,						arginfo_mysqli_stmt_bind_result)
-	PHP_FE(mysqli_stmt_close,							arginfo_mysqli_stmt_close)
-	PHP_FE(mysqli_stmt_data_seek,						arginfo_mysqli_stmt_data_seek)
-	PHP_FE(mysqli_stmt_errno,							arginfo_mysqli_stmt_errno)
-	PHP_FE(mysqli_stmt_error,							arginfo_mysqli_stmt_error)
-	PHP_FE(mysqli_stmt_error_list,						arginfo_mysqli_stmt_error_list)
-	PHP_FE(mysqli_stmt_fetch,							arginfo_mysqli_stmt_fetch)
-	PHP_FE(mysqli_stmt_field_count,						arginfo_mysqli_stmt_field_count)
-	PHP_FE(mysqli_stmt_free_result,						arginfo_mysqli_stmt_free_result)
-#if defined(MYSQLI_USE_MYSQLND)
-	PHP_FE(mysqli_stmt_get_result,						arginfo_mysqli_stmt_get_result)
-#endif
-	PHP_FE(mysqli_stmt_get_warnings,					arginfo_mysqli_stmt_get_warnings)
-	PHP_FE(mysqli_stmt_init,							arginfo_mysqli_stmt_init)
-	PHP_FE(mysqli_stmt_insert_id,						arginfo_mysqli_stmt_insert_id)
-#if defined(MYSQLI_USE_MYSQLND)
-	PHP_FE(mysqli_stmt_more_results,					arginfo_mysqli_stmt_more_results)
-	PHP_FE(mysqli_stmt_next_result,						arginfo_mysqli_stmt_next_result)
-#endif
-	PHP_FE(mysqli_stmt_num_rows,						arginfo_mysqli_stmt_num_rows)
-	PHP_FE(mysqli_stmt_param_count,						arginfo_mysqli_stmt_param_count)
-	PHP_FE(mysqli_stmt_prepare,							arginfo_mysqli_stmt_prepare)
-	PHP_FE(mysqli_stmt_reset,							arginfo_mysqli_stmt_reset)
-	PHP_FE(mysqli_stmt_result_metadata,					arginfo_mysqli_stmt_result_metadata)
-	PHP_FE(mysqli_stmt_send_long_data,					arginfo_mysqli_stmt_send_long_data)
-	PHP_FE(mysqli_stmt_store_result,					arginfo_mysqli_stmt_store_result)
-	PHP_FE(mysqli_stmt_sqlstate,   						arginfo_mysqli_stmt_sqlstate)
-	PHP_FE(mysqli_sqlstate,   							arginfo_mysqli_sqlstate)
-	PHP_FE(mysqli_ssl_set,								arginfo_mysqli_ssl_set)
-	PHP_FE(mysqli_stat,									arginfo_mysqli_stat)
-	PHP_FE(mysqli_store_result,							arginfo_mysqli_store_result)
-	PHP_FE(mysqli_thread_id,							arginfo_mysqli_thread_id)
-	PHP_FE(mysqli_thread_safe,							arginfo_mysqli_thread_safe)
-	PHP_FE(mysqli_use_result,							arginfo_mysqli_use_result)
-	PHP_FE(mysqli_warning_count,						arginfo_mysqli_warning_count)
-
-	PHP_FE(mysqli_refresh,								arginfo_mysqli_refresh)
-
-	/* Aliases */
-	PHP_FALIAS(mysqli_escape_string,	mysqli_real_escape_string,	arginfo_mysqli_escape_string)
-	PHP_FALIAS(mysqli_set_opt,			mysqli_options,				arginfo_mysqli_set_opt)
-
-	PHP_FE_END
-};
-/* }}} */
-
-/* {{{ mysqli_link_methods[]
- *
- * Every user visible function must have an entry in mysqli_link_methods[].
- */
-const zend_function_entry mysqli_link_methods[] = {
-	PHP_ME_MAPPING(autocommit, mysqli_autocommit, arginfo_class_mysqli_autocommit, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(begin_transaction, mysqli_begin_transaction, arginfo_class_mysqli_begin_transaction, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(change_user, mysqli_change_user, arginfo_class_mysqli_change_user, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(character_set_name, mysqli_character_set_name, arginfo_class_mysqli_character_set_name, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(close, mysqli_close, arginfo_class_mysqli_close, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(commit, mysqli_commit, arginfo_class_mysqli_commit, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(connect, mysqli_connect, arginfo_class_mysqli_connect, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(dump_debug_info, mysqli_dump_debug_info, arginfo_class_mysqli_dump_debug_info, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(debug, mysqli_debug, arginfo_class_mysqli_debug, ZEND_ACC_PUBLIC)
-#ifdef HAVE_MYSQLI_GET_CHARSET
-	PHP_ME_MAPPING(get_charset, mysqli_get_charset, arginfo_class_mysqli_get_charset, ZEND_ACC_PUBLIC)
-#endif
-	PHP_ME_MAPPING(get_client_info, mysqli_get_client_info, arginfo_class_mysqli_get_client_info, ZEND_ACC_PUBLIC)
-#if defined(MYSQLI_USE_MYSQLND)
-	PHP_ME_MAPPING(get_connection_stats, mysqli_get_connection_stats, arginfo_class_mysqli_get_connection_stats, ZEND_ACC_PUBLIC)
-#endif
-	PHP_ME_MAPPING(get_server_info, mysqli_get_server_info, arginfo_class_mysqli_get_server_info, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(get_warnings, mysqli_get_warnings, arginfo_class_mysqli_get_warnings, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(init, mysqli_init_method, arginfo_class_mysqli_init, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(kill, mysqli_kill, arginfo_class_mysqli_kill, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(multi_query, mysqli_multi_query, arginfo_class_mysqli_multi_query, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(__construct, mysqli_link_construct, arginfo_class_mysqli___construct, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(more_results, mysqli_more_results, arginfo_class_mysqli_more_results, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(next_result, mysqli_next_result, arginfo_class_mysqli_next_result, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(options, mysqli_options, arginfo_class_mysqli_options, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(ping, mysqli_ping, arginfo_class_mysqli_ping, ZEND_ACC_PUBLIC)
-#if defined(MYSQLI_USE_MYSQLND)
-	PHP_ME_MAPPING(poll, mysqli_poll, arginfo_class_mysqli_poll, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-#endif
-	PHP_ME_MAPPING(prepare, mysqli_prepare, arginfo_class_mysqli_prepare, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(query, mysqli_query, arginfo_class_mysqli_query, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(real_connect, mysqli_real_connect, arginfo_class_mysqli_real_connect, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(real_escape_string, mysqli_real_escape_string, arginfo_class_mysqli_real_escape_string, ZEND_ACC_PUBLIC)
-#if defined(MYSQLI_USE_MYSQLND)
-	PHP_ME_MAPPING(reap_async_query, mysqli_reap_async_query, arginfo_class_mysqli_reap_async_query, ZEND_ACC_PUBLIC)
-#endif
-	PHP_ME_MAPPING(escape_string, mysqli_real_escape_string, arginfo_class_mysqli_real_escape_string, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(real_query, mysqli_real_query, arginfo_class_mysqli_real_query, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(release_savepoint, mysqli_release_savepoint, arginfo_class_mysqli_release_savepoint, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(rollback, mysqli_rollback, arginfo_class_mysqli_rollback, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(savepoint, mysqli_savepoint, arginfo_class_mysqli_savepoint, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(select_db, mysqli_select_db, arginfo_class_mysqli_select_db, ZEND_ACC_PUBLIC)
-#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(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)
-	PHP_ME_MAPPING(store_result, mysqli_store_result, arginfo_class_mysqli_store_result, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(thread_safe, mysqli_thread_safe, arginfo_class_mysqli_thread_safe, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(use_result, mysqli_use_result, arginfo_class_mysqli_use_result, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(refresh, mysqli_refresh, arginfo_class_mysqli_refresh, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-/* }}} */
-
-/* {{{ mysqli_result_methods[]
- *
- * Every user visible function must have an entry in mysqli_result_methods[].
- */
-const zend_function_entry mysqli_result_methods[] = {
-	PHP_ME_MAPPING(__construct, mysqli_result_construct, arginfo_class_mysqli_result___construct, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(close, mysqli_free_result, arginfo_class_mysqli_result_close, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(free, mysqli_free_result, arginfo_class_mysqli_result_free, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(data_seek, mysqli_data_seek, arginfo_class_mysqli_result_data_seek, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(fetch_field, mysqli_fetch_field, arginfo_class_mysqli_result_fetch_field, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(fetch_fields, mysqli_fetch_fields, arginfo_class_mysqli_result_fetch_fields, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(fetch_field_direct, mysqli_fetch_field_direct, arginfo_class_mysqli_result_fetch_field_direct, ZEND_ACC_PUBLIC)
-#if defined(MYSQLI_USE_MYSQLND)
-	PHP_ME_MAPPING(fetch_all, mysqli_fetch_all, arginfo_class_mysqli_result_fetch_all, ZEND_ACC_PUBLIC)
-#endif
-	PHP_ME_MAPPING(fetch_array, mysqli_fetch_array, arginfo_class_mysqli_result_fetch_array, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(fetch_assoc, mysqli_fetch_assoc, arginfo_class_mysqli_result_fetch_assoc, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(fetch_object, mysqli_fetch_object, arginfo_class_mysqli_result_fetch_object, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(fetch_row, mysqli_fetch_row, arginfo_class_mysqli_result_fetch_row, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(field_seek, mysqli_field_seek, arginfo_class_mysqli_result_field_seek, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(free_result, mysqli_free_result, arginfo_class_mysqli_result_free_result, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-/* }}} */
-
-/* {{{ mysqli_stmt_methods[]
- *
- * Every user visible function must have an entry in mysqli_stmt_methods[].
- */
-const zend_function_entry mysqli_stmt_methods[] = {
-	PHP_ME_MAPPING(__construct, mysqli_stmt_construct, arginfo_class_mysqli_stmt___construct, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(attr_get, mysqli_stmt_attr_get, arginfo_class_mysqli_stmt_attr_get, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(attr_set, mysqli_stmt_attr_set, arginfo_class_mysqli_stmt_attr_set, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(bind_param, mysqli_stmt_bind_param, arginfo_class_mysqli_stmt_bind_param, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(bind_result, mysqli_stmt_bind_result, arginfo_class_mysqli_stmt_bind_result, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(close, mysqli_stmt_close, arginfo_class_mysqli_stmt_close, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(data_seek, mysqli_stmt_data_seek, arginfo_class_mysqli_stmt_data_seek, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(execute, mysqli_stmt_execute, arginfo_class_mysqli_stmt_execute, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(fetch, mysqli_stmt_fetch, arginfo_class_mysqli_stmt_fetch, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(get_warnings, mysqli_stmt_get_warnings, arginfo_class_mysqli_stmt_get_warnings, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(result_metadata, mysqli_stmt_result_metadata, arginfo_class_mysqli_stmt_result_metadata, ZEND_ACC_PUBLIC)
-#if defined(MYSQLI_USE_MYSQLND)
-	PHP_ME_MAPPING(more_results, mysqli_stmt_more_results, arginfo_class_mysqli_stmt_more_results, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(next_result, mysqli_stmt_next_result, arginfo_class_mysqli_stmt_next_result, ZEND_ACC_PUBLIC)
-#endif
-	PHP_ME_MAPPING(num_rows, mysqli_stmt_num_rows, arginfo_class_mysqli_stmt_num_rows, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(send_long_data, mysqli_stmt_send_long_data, arginfo_class_mysqli_stmt_send_long_data, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(free_result, mysqli_stmt_free_result, arginfo_class_mysqli_stmt_free_result, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(reset, mysqli_stmt_reset, arginfo_class_mysqli_stmt_reset, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(prepare, mysqli_stmt_prepare, arginfo_class_mysqli_stmt_prepare, ZEND_ACC_PUBLIC)
-	PHP_ME_MAPPING(store_result, mysqli_stmt_store_result, arginfo_class_mysqli_stmt_store_result, ZEND_ACC_PUBLIC)
-#if defined(MYSQLI_USE_MYSQLND)
-	PHP_ME_MAPPING(get_result, mysqli_stmt_get_result, arginfo_class_mysqli_stmt_get_result, ZEND_ACC_PUBLIC)
-#endif
-	PHP_FE_END
-};
-/* }}} */
diff --git a/ext/mysqli/mysqli_fe.h b/ext/mysqli/mysqli_fe.h
deleted file mode 100644
index ab2974900d..0000000000
--- a/ext/mysqli/mysqli_fe.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-  +----------------------------------------------------------------------+
-  | Copyright (c) The PHP Group                                          |
-  +----------------------------------------------------------------------+
-  | This source file is subject to version 3.01 of the PHP license,      |
-  | that is bundled with this package in the file LICENSE, and is        |
-  | available through the world-wide-web at the following url:           |
-  | http://www.php.net/license/3_01.txt                                  |
-  | If you did not receive a copy of the PHP license and are unable to   |
-  | obtain it through the world-wide-web, please send a note to          |
-  | license@php.net so we can mail you a copy immediately.               |
-  +----------------------------------------------------------------------+
-  | Author: Georg Richter <georg@php.net>                                |
-            Andrey Hristov <andrey@php.net>                              |
-  +----------------------------------------------------------------------+
-*/
-
-#ifndef MYSQLI_FE_H
-#define MYSQLI_FE_H
-
-PHP_FUNCTION(mysqli);
-PHP_FUNCTION(mysqli_affected_rows);
-PHP_FUNCTION(mysqli_autocommit);
-PHP_FUNCTION(mysqli_begin_transaction);
-PHP_FUNCTION(mysqli_change_user);
-PHP_FUNCTION(mysqli_character_set_name);
-PHP_FUNCTION(mysqli_set_charset);
-PHP_FUNCTION(mysqli_close);
-PHP_FUNCTION(mysqli_commit);
-PHP_FUNCTION(mysqli_connect);
-PHP_FUNCTION(mysqli_connect_errno);
-PHP_FUNCTION(mysqli_connect_error);
-PHP_FUNCTION(mysqli_data_seek);
-PHP_FUNCTION(mysqli_debug);
-PHP_FUNCTION(mysqli_dump_debug_info);
-PHP_FUNCTION(mysqli_errno);
-PHP_FUNCTION(mysqli_error);
-PHP_FUNCTION(mysqli_error_list);
-PHP_FUNCTION(mysqli_fetch_all);
-PHP_FUNCTION(mysqli_fetch_array);
-PHP_FUNCTION(mysqli_fetch_assoc);
-PHP_FUNCTION(mysqli_fetch_object);
-PHP_FUNCTION(mysqli_fetch_field);
-PHP_FUNCTION(mysqli_fetch_fields);
-PHP_FUNCTION(mysqli_fetch_field_direct);
-PHP_FUNCTION(mysqli_fetch_lengths);
-PHP_FUNCTION(mysqli_fetch_row);
-PHP_FUNCTION(mysqli_field_count);
-PHP_FUNCTION(mysqli_field_seek);
-PHP_FUNCTION(mysqli_field_tell);
-PHP_FUNCTION(mysqli_free_result);
-PHP_FUNCTION(mysqli_get_client_stats);
-PHP_FUNCTION(mysqli_get_connection_stats);
-PHP_FUNCTION(mysqli_get_charset);
-PHP_FUNCTION(mysqli_get_client_info);
-PHP_FUNCTION(mysqli_get_client_version);
-PHP_FUNCTION(mysqli_get_host_info);
-PHP_FUNCTION(mysqli_get_links_stats);
-PHP_FUNCTION(mysqli_get_proto_info);
-PHP_FUNCTION(mysqli_get_server_info);
-PHP_FUNCTION(mysqli_get_server_version);
-PHP_FUNCTION(mysqli_get_warnings);
-PHP_FUNCTION(mysqli_info);
-PHP_FUNCTION(mysqli_insert_id);
-PHP_FUNCTION(mysqli_init);
-PHP_FUNCTION(mysqli_init_method);
-PHP_FUNCTION(mysqli_kill);
-PHP_FUNCTION(mysqli_link_construct);
-PHP_FUNCTION(mysqli_set_local_infile_default);
-PHP_FUNCTION(mysqli_set_local_infile_handler);
-PHP_FUNCTION(mysqli_more_results);
-PHP_FUNCTION(mysqli_multi_query);
-PHP_FUNCTION(mysqli_next_result);
-PHP_FUNCTION(mysqli_num_fields);
-PHP_FUNCTION(mysqli_num_rows);
-PHP_FUNCTION(mysqli_options);
-PHP_FUNCTION(mysqli_ping);
-PHP_FUNCTION(mysqli_poll);
-PHP_FUNCTION(mysqli_prepare);
-PHP_FUNCTION(mysqli_query);
-PHP_FUNCTION(mysqli_stmt_result_metadata);
-PHP_FUNCTION(mysqli_report);
-PHP_FUNCTION(mysqli_read_query_result);
-PHP_FUNCTION(mysqli_real_connect);
-PHP_FUNCTION(mysqli_real_query);
-PHP_FUNCTION(mysqli_real_escape_string);
-PHP_FUNCTION(mysqli_reap_async_query);
-PHP_FUNCTION(mysqli_rollback);
-PHP_FUNCTION(mysqli_row_seek);
-PHP_FUNCTION(mysqli_select_db);
-PHP_FUNCTION(mysqli_stmt_attr_get);
-PHP_FUNCTION(mysqli_stmt_attr_set);
-PHP_FUNCTION(mysqli_stmt_bind_param);
-PHP_FUNCTION(mysqli_stmt_bind_result);
-PHP_FUNCTION(mysqli_stmt_execute);
-PHP_FUNCTION(mysqli_stmt_field_count);
-PHP_FUNCTION(mysqli_stmt_init);
-PHP_FUNCTION(mysqli_stmt_prepare);
-PHP_FUNCTION(mysqli_stmt_fetch);
-PHP_FUNCTION(mysqli_stmt_param_count);
-PHP_FUNCTION(mysqli_stmt_send_long_data);
-PHP_FUNCTION(mysqli_sqlstate);
-PHP_FUNCTION(mysqli_ssl_set);
-PHP_FUNCTION(mysqli_stat);
-PHP_FUNCTION(mysqli_refresh);
-PHP_FUNCTION(mysqli_savepoint);
-PHP_FUNCTION(mysqli_release_savepoint);
-PHP_FUNCTION(mysqli_stmt_affected_rows);
-PHP_FUNCTION(mysqli_stmt_close);
-PHP_FUNCTION(mysqli_stmt_data_seek);
-PHP_FUNCTION(mysqli_stmt_errno);
-PHP_FUNCTION(mysqli_stmt_error);
-PHP_FUNCTION(mysqli_stmt_error_list);
-PHP_FUNCTION(mysqli_stmt_free_result);
-PHP_FUNCTION(mysqli_stmt_get_result);
-PHP_FUNCTION(mysqli_stmt_get_warnings);
-PHP_FUNCTION(mysqli_stmt_reset);
-PHP_FUNCTION(mysqli_stmt_insert_id);
-PHP_FUNCTION(mysqli_stmt_more_results);
-PHP_FUNCTION(mysqli_stmt_next_result);
-PHP_FUNCTION(mysqli_stmt_num_rows);
-PHP_FUNCTION(mysqli_stmt_sqlstate);
-PHP_FUNCTION(mysqli_stmt_store_result);
-PHP_FUNCTION(mysqli_store_result);
-PHP_FUNCTION(mysqli_thread_id);
-PHP_FUNCTION(mysqli_thread_safe);
-PHP_FUNCTION(mysqli_use_result);
-PHP_FUNCTION(mysqli_warning_count);
-
-PHP_FUNCTION(mysqli_stmt_construct);
-PHP_FUNCTION(mysqli_result_construct);
-PHP_FUNCTION(mysqli_driver_construct);
-PHP_METHOD(mysqli_warning,__construct);
-
-#endif /* MYSQLI_FE_H */
diff --git a/ext/mysqli/mysqli_warning.c b/ext/mysqli/mysqli_warning.c
index 673ca48aae..16cb0ebdfb 100644
--- a/ext/mysqli/mysqli_warning.c
+++ b/ext/mysqli/mysqli_warning.c
@@ -26,8 +26,6 @@
 #include "php_mysqli_structs.h"
 #include "mysqli_priv.h"
 
-#include "mysqli_warning_arginfo.h"
-
 /* Define these in the PHP7 tree to make merging easy process */
 #define ZSTR_DUPLICATE (1<<0)
 #define ZSTR_AUTOFREE  (1<<1)
@@ -318,14 +316,6 @@ PHP_METHOD(mysqli_warning, __construct)
 }
 /* }}} */
 
-/* {{{ mysqli_warning_methods */
-const zend_function_entry mysqli_warning_methods[] = {
-	PHP_ME(mysqli_warning, __construct,	arginfo_class_mysqli_warning___construct, ZEND_ACC_PROTECTED)
-	PHP_ME(mysqli_warning, next, arginfo_class_mysqli_warning_next, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-/* }}} */
-
 /* {{{ mysqli_warning_property_entries */
 const mysqli_property_entry mysqli_warning_property_entries[] = {
 	{"message", sizeof("message") - 1, mysqli_warning_message, NULL},
diff --git a/ext/mysqli/mysqli_warning.stub.php b/ext/mysqli/mysqli_warning.stub.php
deleted file mode 100644
index aa92204e50..0000000000
--- a/ext/mysqli/mysqli_warning.stub.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class mysqli_warning
-{
-    public function __construct(object $mysqli_link);
-
-    /** @return bool */
-    public function next();
-}
diff --git a/ext/mysqli/mysqli_warning_arginfo.h b/ext/mysqli/mysqli_warning_arginfo.h
deleted file mode 100644
index ea98da480e..0000000000
--- a/ext/mysqli/mysqli_warning_arginfo.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* This is a generated file, edit the .stub.php file instead. */
-
-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()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_warning_next, 0, 0, 0)
-ZEND_END_ARG_INFO()