Add stubs for aliases

Closes GH-5187

25 files changed, 295 insertions, 164 deletions

diff --git a/ext/bz2/bz2.stub.php b/ext/bz2/bz2.stub.php
index b4898481d0..4dcaf07a11 100644
--- a/ext/bz2/bz2.stub.php
+++ b/ext/bz2/bz2.stub.php
@@ -12,29 +12,19 @@ function bzread($bz, int $length = 1024): string|false {}
 /** @param resource $bz */
 function bzwrite($bz, string $str, int $length = UNKNOWN): int|false {}
 
-/**
- * @param resource $bz
- */
+/** @param resource $bz */
 function bzflush($bz): bool {}
 
-/**
- * @param resource $bz
- */
+/** @param resource $bz */
 function bzclose($bz): bool {}
 
-/**
- * @param resource $bz
- */
+/** @param resource $bz */
 function bzerrno($bz): int {}
 
-/**
- * @param resource $bz
- */
+/** @param resource $bz */
 function bzerrstr($bz): string {}
 
-/**
- * @param resource $bz
- */
+/** @param resource $bz */
 function bzerror($bz): array {}
 
 function bzcompress(string $source, int $blocksize = 4, int $workfactor = 0): string|int {}
diff --git a/ext/ftp/ftp.stub.php b/ext/ftp/ftp.stub.php
index e01603a99c..bae3a5128c 100644
--- a/ext/ftp/ftp.stub.php
+++ b/ext/ftp/ftp.stub.php
@@ -114,6 +114,9 @@ function ftp_site($ftp, string $cmd): bool {}
 function ftp_close($ftp): bool {}
 
 /** @param resource $ftp */
+function ftp_quit($ftp): bool {}
+
+/** @param resource $ftp */
 function ftp_set_option($ftp, int $option, $value): bool {}
 
 /** @param resource $ftp */
diff --git a/ext/ftp/ftp_arginfo.h b/ext/ftp/ftp_arginfo.h
index 69a3cd01e9..04292b459f 100644
--- a/ext/ftp/ftp_arginfo.h
+++ b/ext/ftp/ftp_arginfo.h
@@ -182,6 +182,8 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_ftp_close arginfo_ftp_cdup
 
+#define arginfo_ftp_quit arginfo_ftp_cdup
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_set_option, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, ftp)
 	ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index d196230a62..8254ed9127 100644
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -75,7 +75,7 @@ static const zend_function_entry php_ftp_functions[] = {
 	PHP_FE(ftp_nb_continue,		arginfo_ftp_nb_continue)
 	PHP_FE(ftp_nb_put,			arginfo_ftp_nb_put)
 	PHP_FE(ftp_nb_fput,			arginfo_ftp_nb_fput)
-	PHP_FALIAS(ftp_quit, ftp_close, arginfo_ftp_close)
+	PHP_FALIAS(ftp_quit, ftp_close, arginfo_ftp_quit)
 	PHP_FE_END
 };
 
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index d539f6fbcf..f473e24caa 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -174,14 +174,14 @@ static const zend_function_entry imap_functions[] = {
 	PHP_FE(imap_getsubscribed,						arginfo_imap_getsubscribed)
 	PHP_FE(imap_getmailboxes,						arginfo_imap_getmailboxes)
 
-	PHP_FALIAS(imap_header,			imap_headerinfo,	arginfo_imap_headerinfo)
-	PHP_FALIAS(imap_listmailbox,	imap_list,			arginfo_imap_list)
-	PHP_FALIAS(imap_scanmailbox,	imap_listscan,		arginfo_imap_listscan)
-	PHP_FALIAS(imap_listsubscribed,	imap_lsub,			arginfo_imap_lsub)
-	PHP_FALIAS(imap_fetchtext,		imap_body,			arginfo_imap_body)
-	PHP_FALIAS(imap_scan,			imap_listscan,		arginfo_imap_listscan)
-	PHP_FALIAS(imap_create,			imap_createmailbox,	arginfo_imap_createmailbox)
-	PHP_FALIAS(imap_rename,			imap_renamemailbox,	arginfo_imap_renamemailbox)
+	PHP_FALIAS(imap_header,			imap_headerinfo,	arginfo_imap_header)
+	PHP_FALIAS(imap_listmailbox,	imap_list,			arginfo_imap_listmailbox)
+	PHP_FALIAS(imap_scanmailbox,	imap_listscan,		arginfo_imap_scanmailbox)
+	PHP_FALIAS(imap_listsubscribed,	imap_lsub,			arginfo_imap_listsubscribed)
+	PHP_FALIAS(imap_fetchtext,		imap_body,			arginfo_imap_fetchtext)
+	PHP_FALIAS(imap_scan,			imap_listscan,		arginfo_imap_scan)
+	PHP_FALIAS(imap_create,			imap_createmailbox,	arginfo_imap_create)
+	PHP_FALIAS(imap_rename,			imap_renamemailbox,	arginfo_imap_rename)
 	PHP_FE_END
 };
 /* }}} */
diff --git a/ext/imap/php_imap.stub.php b/ext/imap/php_imap.stub.php
index 06d19318f5..c80799225c 100644
--- a/ext/imap/php_imap.stub.php
+++ b/ext/imap/php_imap.stub.php
@@ -27,6 +27,8 @@ function imap_headers($stream_id): array|false {}
 /** @param resource $stream_id */
 function imap_headerinfo($stream_id, int $msg_no, int $from_length = 0, int $subject_length = 0, string $default_host = UNKNOWN): stdClass|false {}
 
+function imap_header($stream_id, int $msg_no, int $from_length = 0, int $subject_length = 0, string $default_host = UNKNOWN): stdClass|false {}
+
 function imap_rfc822_parse_headers(string $headers, string $default_host = 'UNKNOWN'): \stdClass {}
 
 function imap_rfc822_write_address(string $mailbox, string $host, string $personal): string|false {}
@@ -36,6 +38,9 @@ function imap_rfc822_parse_adrlist(string $address_string, string $default_host)
 /** @param resource $stream_id */
 function imap_body($stream_id, int $msg_no, int $options = 0): string|false {}
 
+/** @param resource $stream_id */
+function imap_fetchtext($stream_id, int $msg_no, int $options = 0): string|false {}
+
 /**
  * @param resource $stream_id
  * @return \stdClass|false
@@ -86,51 +91,45 @@ function imap_check($stream_id): stdClass|false {}
 /** @param resource $stream_id */
 function imap_listscan($stream_id, string $ref, string $pattern, string $content): array|false {}
 
-/**
- * @param resource $stream_id
- */
+/** @param resource $stream_id */
+function imap_scan($stream_id, string $ref, string $pattern, string $content): array|false {}
+
+/** @param resource $stream_id */
+function imap_scanmailbox($stream_id, string $ref, string $pattern, string $content): array|false {}
+
+/** @param resource $stream_id */
 function imap_mail_copy($stream_id, string $msglist, string $mailbox, int $options = 0): bool {}
 
-/**
- * @param resource $stream_id
- */
+/** @param resource $stream_id */
 function imap_mail_move($stream_id, string $sequence, string $mailbox, int $options = 0): bool {}
 
 function imap_mail_compose(array $envelope, array $body): string|false {}
 
-/**
- * @param resource $stream_id
- */
+/** @param resource $stream_id */
 function imap_createmailbox($stream_id, string $mailbox): bool {}
 
-/**
- * @param resource $stream_id
- */
+/** @param resource $stream_id */
+function imap_create($stream_id, string $mailbox): bool {}
+
+/** @param resource $stream_id */
 function imap_renamemailbox($stream_id, string $old_name, string $new_name): bool {}
 
-/**
- * @param resource $stream_id
- */
+/** @param resource $stream_id */
+function imap_rename($stream_id, string $old_name, string $new_name): bool {}
+
+/** @param resource $stream_id */
 function imap_deletemailbox($stream_id, string $mailbox): bool {}
 
-/**
- * @param resource $stream_id
- */
+/** @param resource $stream_id */
 function imap_subscribe($stream_id, string $mailbox): bool {}
 
-/**
- * @param resource $stream_id
- */
+/** @param resource $stream_id */
 function imap_unsubscribe($stream_id, string $mailbox): bool {}
 
-/**
- * @param resource $stream_id
- */
+/** @param resource $stream_id */
 function imap_append($stream_id, string $folder, string $message, string $options = UNKNOWN, string $internal_date = UNKNOWN): bool {}
 
-/**
- * @param resource $stream_id
- */
+/** @param resource $stream_id */
 function imap_ping($stream_id): bool {}
 
 function imap_base64(string $text): string|false {}
@@ -150,25 +149,18 @@ function imap_utf8(string $mime_encoded_text): string {}
  */
 function imap_status($stream_id, string $mailbox, int $options) {}
 
-/**
- * @param resource $stream_id
- */
+/** @param resource $stream_id */
 function imap_mailboxmsginfo($stream_id): \stdClass {}
 
-/**
- * @param resource $stream_id
- */
+/** @param resource $stream_id */
 function imap_setflag_full($stream_id, string $sequence, string $flag, int $options = 0): bool {}
 
-/**
- * @param resource $stream_id
- */
+/** @param resource $stream_id */
 function imap_clearflag_full($stream_id, string $sequence, string $flag, int $options = 0): bool {}
 
 /** @param resource $stream_id */
 function imap_sort($stream_id, int $criteria, int $reverse, int $options = 0, string $search_criteria = UNKNOWN, string $charset = UNKNOWN): array|false {}
 
-
 /** @param resource $stream_id */
 function imap_uid($stream_id, int $msg_no): int|false {}
 
@@ -179,9 +171,15 @@ function imap_msgno($stream_id, int $unique_msg_id): int|false {}
 function imap_list($stream_id, string $ref, string $pattern): array|false {}
 
 /** @param resource $stream_id */
+function imap_listmailbox($stream_id, string $ref, string $pattern): array|false {}
+
+/** @param resource $stream_id */
 function imap_lsub($stream_id, string $ref, string $pattern): array|false {}
 
 /** @param resource $stream_id */
+function imap_listsubscribed($stream_id, string $ref, string $pattern): array|false {}
+
+/** @param resource $stream_id */
 function imap_getsubscribed($stream_id, string $ref, string $pattern): array|false {}
 
 /** @param resource $stream_id */
@@ -223,14 +221,10 @@ function imap_get_quota($stream_id, string $qroot): array|false {}
 /** @param resource $stream_id */
 function imap_get_quotaroot($stream_id, string $mbox): array|false {}
 
-/**
- * @param resource $stream_id
- */
+/** @param resource $stream_id */
 function imap_set_quota($stream_id, string $qroot, int $mailbox_size): bool {}
 
-/**
- * @param resource $stream_id
- */
+/** @param resource $stream_id */
 function imap_setacl($stream_id, string $mailbox, string $id, string $rights): bool {}
 
 /** @param resource $stream_id */
diff --git a/ext/imap/php_imap_arginfo.h b/ext/imap/php_imap_arginfo.h
index 74fb1f7afb..df274969e7 100644
--- a/ext/imap/php_imap_arginfo.h
+++ b/ext/imap/php_imap_arginfo.h
@@ -39,6 +39,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imap_headerinfo, 0, 2, stdCl
 	ZEND_ARG_TYPE_INFO(0, default_host, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_imap_header arginfo_imap_headerinfo
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_imap_rfc822_parse_headers, 0, 1, stdClass, 0)
 	ZEND_ARG_TYPE_INFO(0, headers, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, default_host, IS_STRING, 0)
@@ -61,6 +63,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imap_body, 0, 2, MAY_BE_STRING|M
 	ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_imap_fetchtext arginfo_imap_body
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_bodystruct, 0, 0, 3)
 	ZEND_ARG_INFO(0, stream_id)
 	ZEND_ARG_TYPE_INFO(0, msg_no, IS_LONG, 0)
@@ -120,6 +124,10 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imap_listscan, 0, 4, MAY_BE_ARRA
 	ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_imap_scan arginfo_imap_listscan
+
+#define arginfo_imap_scanmailbox arginfo_imap_listscan
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imap_mail_copy, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, stream_id)
 	ZEND_ARG_TYPE_INFO(0, msglist, IS_STRING, 0)
@@ -144,12 +152,16 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imap_createmailbox, 0, 2, _IS_BO
 	ZEND_ARG_TYPE_INFO(0, mailbox, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_imap_create arginfo_imap_createmailbox
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imap_renamemailbox, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, stream_id)
 	ZEND_ARG_TYPE_INFO(0, old_name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, new_name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_imap_rename arginfo_imap_renamemailbox
+
 #define arginfo_imap_deletemailbox arginfo_imap_createmailbox
 
 #define arginfo_imap_subscribe arginfo_imap_createmailbox
@@ -224,8 +236,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imap_list, 0, 3, MAY_BE_ARRAY|MA
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_imap_listmailbox arginfo_imap_list
+
 #define arginfo_imap_lsub arginfo_imap_list
 
+#define arginfo_imap_listsubscribed arginfo_imap_list
+
 #define arginfo_imap_getsubscribed arginfo_imap_list
 
 #define arginfo_imap_getmailboxes arginfo_imap_list
diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php
index e8a2fc8a32..7db01d57b7 100644
--- a/ext/ldap/ldap.stub.php
+++ b/ext/ldap/ldap.stub.php
@@ -10,19 +10,13 @@ function ldap_connect(string $hostname = UNKNOWN, int $port = 389, string $walle
 function ldap_connect(string $hostname = UNKNOWN, int $port = 389) {}
 #endif
 
-/**
- * @param resource $link_identifier
- */
+/** @param resource $link_identifier */
 function ldap_unbind($link_identifier): bool {}
 
-/**
- * @param resource $link_identifier
- */
+/** @param resource $link_identifier */
 function ldap_close($link_identifier): bool {}
 
-/**
- * @param resource $link_identifier
- */
+/** @param resource $link_identifier */
 function ldap_bind($link_identifier, string $bind_rdn = UNKNOWN, string $bind_password = UNKNOWN): bool {}
 
 /**
@@ -32,9 +26,7 @@ function ldap_bind($link_identifier, string $bind_rdn = UNKNOWN, string $bind_pa
 function ldap_bind_ext($link_identifier, string $bind_rdn = UNKNOWN, string $bind_password = UNKNOWN, array $servercontrols = []) {}
 
 #ifdef HAVE_LDAP_SASL
-/**
- * @param resource $link
- */
+/** @param resource $link */
 function ldap_sasl_bind($link, string $binddn = UNKNOWN, string $password = UNKNOWN, string $sasl_mech = UNKNOWN, string $sasl_realm = UNKNOWN, string $sasl_authc_id = UNKNOWN, string $sasl_authz_id = UNKNOWN, string $props = UNKNOWN): bool {}
 #endif
 
@@ -62,9 +54,7 @@ function ldap_list($link_identifier, $base_dn, $filter, array $attributes = [],
  */
 function ldap_search($link_identifier, $base_dn, $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $servercontrols = []) {}
 
-/**
- * @param resource $link_identifier
- */
+/** @param resource $link_identifier */
 function ldap_free_result($link_identifier): bool {}
 
 
@@ -116,13 +106,13 @@ function ldap_get_attributes($link_identifier, $result_entry_identifier): array
  * @param resource $link_identifier
  * @param resource $result_entry_identifier
  */
-function ldap_get_values($link_identifier, $result_entry_identifier, string $attribute): array|false {}
+function ldap_get_values_len($link_identifier, $result_entry_identifier, string $attribute): array|false {}
 
 /**
  * @param resource $link_identifier
  * @param resource $result_entry_identifier
  */
-function ldap_get_values_len($link_identifier, $result_entry_identifier, string $attribute): array|false {}
+function ldap_get_values($link_identifier, $result_entry_identifier, string $attribute): array|false {}
 
 /**
  * @param resource $link_identifier
@@ -152,19 +142,10 @@ function ldap_delete($link_identifier, string $dn, array $servercontrols = []):
  */
 function ldap_delete_ext($link_identifier, string $dn, array $servercontrols = []) {}
 
-/**
- * @param resource $link_identifier
- */
-function ldap_modify($link_identifier, string $dn, array $entry, array $servercontrols = []): bool {}
-
-/**
- * @param resource $link_identifier
- */
+/** @param resource $link_identifier */
 function ldap_modify_batch($link_identifier, string $dn, array $modifications_info, array $servercontrols = []): bool {}
 
-/**
- * @param resource $link_identifier
- */
+/** @param resource $link_identifier */
 function ldap_mod_add($link_identifier, string $dn, array $entry, array $servercontrols = []): bool {}
 
 /**
@@ -173,21 +154,19 @@ function ldap_mod_add($link_identifier, string $dn, array $entry, array $serverc
  */
 function ldap_mod_add_ext($link_identifier, string $dn, array $entry, array $servercontrols = []) {}
 
-
-/**
- * @param resource $link_identifier
- */
+/** @param resource $link_identifier */
 function ldap_mod_replace($link_identifier, string $dn, array $entry, array $servercontrols = []): bool {}
 
+/** @param resource $link_identifier */
+function ldap_modify($link_identifier, string $dn, array $entry, array $servercontrols = []): bool {}
+
 /**
  * @param resource $link_identifier
  * @return resource|false
  */
 function ldap_mod_replace_ext($link_identifier, string $dn, array $entry, array $servercontrols = []) {}
 
-/**
- * @param resource $link_identifier
- */
+/** @param resource $link_identifier */
 function ldap_mod_del($link_identifier, string $dn, array $entry, array $servercontrols = []): bool {}
 
 /**
@@ -196,14 +175,10 @@ function ldap_mod_del($link_identifier, string $dn, array $entry, array $serverc
  */
 function ldap_mod_del_ext($link_identifier, string $dn, array $entry, array $servercontrols = []) {}
 
-/**
- * @param resource $link
- */
+/** @param resource $link */
 function ldap_errno($link): int {}
 
-/**
- * @param resource $link
- */
+/** @param resource $link */
 function ldap_error($link): string {}
 
 function ldap_err2str(int $errno): string {}
@@ -213,9 +188,7 @@ function ldap_compare($link_identifier, string $dn, string $attribute, string $v
 
 
 #ifdef LDAP_CONTROL_PAGEDRESULTS
-/**
- * @param resource $link
- */
+/** @param resource $link */
 function ldap_control_paged_result($link, int $pagesize, bool $iscritical = false, string $cookie = ''): bool {}
 
 /**
@@ -226,9 +199,7 @@ function ldap_control_paged_result_response($link, $result, &$cookie = null, &$e
 #endif
 
 #if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP
-/**
- * @param resource $link_identifier
- */
+/** @param resource $link_identifier */
 function ldap_rename($link_identifier, string $dn, string $newrdn, string $newparent, bool $deleteoldrdn, array $servercontrols = []): bool {}
 
 /**
@@ -238,14 +209,10 @@ function ldap_rename($link_identifier, string $dn, string $newrdn, string $newpa
 function ldap_rename_ext($link_identifier, string $dn, string $newrdn, string $newparent, bool $deleteoldrdn, array $servercontrols = []) {}
 
 
-/**
- * @param resource $link_identifier
- */
+/** @param resource $link_identifier */
 function ldap_get_option($link_identifier, int $option, &$retval = null): bool {}
 
-/**
- * @param ?resource $link_identifier
- */
+/** @param ?resource $link_identifier */
 function ldap_set_option($link_identifier, int $option, $newval): bool {}
 
 /**
diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h
index c7e5429bdf..b03bd99f25 100644
--- a/ext/ldap/ldap_arginfo.h
+++ b/ext/ldap/ldap_arginfo.h
@@ -97,13 +97,13 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_get_attributes, 0, 2, IS_AR
 	ZEND_ARG_INFO(0, result_entry_identifier)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_get_values, 0, 3, MAY_BE_ARRAY|MAY_BE_FALSE)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_get_values_len, 0, 3, MAY_BE_ARRAY|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, link_identifier)
 	ZEND_ARG_INFO(0, result_entry_identifier)
 	ZEND_ARG_TYPE_INFO(0, attribute, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_ldap_get_values_len arginfo_ldap_get_values
+#define arginfo_ldap_get_values arginfo_ldap_get_values_len
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_get_dn, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, link_identifier)
@@ -145,8 +145,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_delete_ext, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, servercontrols, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_ldap_modify arginfo_ldap_add
-
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_modify_batch, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, link_identifier)
 	ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0)
@@ -160,6 +158,8 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_ldap_mod_replace arginfo_ldap_add
 
+#define arginfo_ldap_modify arginfo_ldap_add
+
 #define arginfo_ldap_mod_replace_ext arginfo_ldap_add_ext
 
 #define arginfo_ldap_mod_del arginfo_ldap_add
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index bb3880f518..62263d2f7e 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -150,9 +150,9 @@ static const zend_function_entry openssl_functions[] = {
 	PHP_FE(openssl_pkey_get_public,		arginfo_openssl_pkey_get_public)
 	PHP_FE(openssl_pkey_get_details,	arginfo_openssl_pkey_get_details)
 
-	PHP_FALIAS(openssl_free_key,		openssl_pkey_free, 			arginfo_openssl_pkey_free)
-	PHP_FALIAS(openssl_get_privatekey,	openssl_pkey_get_private,	arginfo_openssl_pkey_get_private)
-	PHP_FALIAS(openssl_get_publickey,	openssl_pkey_get_public,	arginfo_openssl_pkey_get_public)
+	PHP_FALIAS(openssl_free_key,		openssl_pkey_free, 			arginfo_openssl_free_key)
+	PHP_FALIAS(openssl_get_privatekey,	openssl_pkey_get_private,	arginfo_openssl_get_privatekey)
+	PHP_FALIAS(openssl_get_publickey,	openssl_pkey_get_public,	arginfo_openssl_get_publickey)
 
 /* x.509 cert funcs */
 	PHP_FE(openssl_x509_read,				arginfo_openssl_x509_read)
diff --git a/ext/openssl/openssl.stub.php b/ext/openssl/openssl.stub.php
index e75f79c906..413414117f 100644
--- a/ext/openssl/openssl.stub.php
+++ b/ext/openssl/openssl.stub.php
@@ -74,15 +74,30 @@ function openssl_pkey_export($key, &$out, ?string $passphrase = null, ?array $co
  */
 function openssl_pkey_get_public($cert) {}
 
+/**
+ * @param resource|string|array $cert
+ * @return resource|false
+ */
+function openssl_get_publickey($cert) {}
+
 /** @param resource $key */
 function openssl_pkey_free($key): void {}
 
+/** @param resource $key */
+function openssl_free_key($key): void {}
+
 /**
  * @param resource|string|array $key
  * @return resource|false
  */
 function openssl_pkey_get_private($key, string $passphrase = UNKNOWN) {}
 
+/**
+ * @param resource|string|array $key
+ * @return resource|false
+ */
+function openssl_get_privatekey($key, string $passphrase = UNKNOWN) {}
+
 /** @param resource $key */
 function openssl_pkey_get_details($key): array|false {}
 
diff --git a/ext/openssl/openssl_arginfo.h b/ext/openssl/openssl_arginfo.h
index 9f8835ec13..ef1db8bfcd 100644
--- a/ext/openssl/openssl_arginfo.h
+++ b/ext/openssl/openssl_arginfo.h
@@ -128,15 +128,21 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_openssl_pkey_get_public arginfo_openssl_x509_read
 
+#define arginfo_openssl_get_publickey arginfo_openssl_x509_read
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_pkey_free, 0, 1, IS_VOID, 0)
 	ZEND_ARG_INFO(0, key)
 ZEND_END_ARG_INFO()
 
+#define arginfo_openssl_free_key arginfo_openssl_pkey_free
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkey_get_private, 0, 0, 1)
 	ZEND_ARG_INFO(0, key)
 	ZEND_ARG_TYPE_INFO(0, passphrase, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_openssl_get_privatekey arginfo_openssl_pkey_get_private
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_openssl_pkey_get_details, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, key)
 ZEND_END_ARG_INFO()
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 0cf698c9a8..c7aa6bcbc3 100644
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -73,7 +73,7 @@ static const zend_function_entry pcntl_functions[] = {
 	PHP_FE(pcntl_exec,			arginfo_pcntl_exec)
 	PHP_FE(pcntl_alarm,			arginfo_pcntl_alarm)
 	PHP_FE(pcntl_get_last_error,	arginfo_pcntl_get_last_error)
-	PHP_FALIAS(pcntl_errno, pcntl_get_last_error,	arginfo_pcntl_get_last_error)
+	PHP_FALIAS(pcntl_errno, pcntl_get_last_error,	arginfo_pcntl_errno)
 	PHP_FE(pcntl_strerror,		arginfo_pcntl_strerror)
 #ifdef HAVE_GETPRIORITY
 	PHP_FE(pcntl_getpriority,	arginfo_pcntl_getpriority)
diff --git a/ext/pcntl/pcntl.stub.php b/ext/pcntl/pcntl.stub.php
index 7ca872663a..c8da88c481 100644
--- a/ext/pcntl/pcntl.stub.php
+++ b/ext/pcntl/pcntl.stub.php
@@ -50,6 +50,8 @@ function pcntl_alarm(int $seconds): int {}
 
 function pcntl_get_last_error(): int {}
 
+function pcntl_errno(): int {}
+
 #ifdef HAVE_GETPRIORITY
 function pcntl_getpriority(int $pid = UNKNOWN, int $process_identifier = PRIO_PROCESS): int|false {}
 #endif
diff --git a/ext/pcntl/pcntl_arginfo.h b/ext/pcntl/pcntl_arginfo.h
index 7fc37ab4ec..2b73bac3eb 100644
--- a/ext/pcntl/pcntl_arginfo.h
+++ b/ext/pcntl/pcntl_arginfo.h
@@ -87,6 +87,8 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_pcntl_get_last_error arginfo_pcntl_fork
 
+#define arginfo_pcntl_errno arginfo_pcntl_fork
+
 #if defined(HAVE_GETPRIORITY)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pcntl_getpriority, 0, 0, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, pid, IS_LONG, 0)
diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c
index 0bd99f3d41..eae396156f 100644
--- a/ext/skeleton/skeleton.c
+++ b/ext/skeleton/skeleton.c
@@ -16,9 +16,9 @@
 	ZEND_PARSE_PARAMETERS_END()
 #endif
 
-/* {{{ void %EXTNAME%_test1()
+/* {{{ void test1()
  */
-PHP_FUNCTION(%EXTNAME%_test1)
+PHP_FUNCTION(test1)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
 
@@ -70,8 +70,8 @@ PHP_MINFO_FUNCTION(%EXTNAME%)
 /* {{{ %EXTNAME%_functions[]
  */
 static const zend_function_entry %EXTNAME%_functions[] = {
-	PHP_FE(%EXTNAME%_test1,		arginfo_%EXTNAME%_test1)
-	PHP_FE(%EXTNAME%_test2,		arginfo_%EXTNAME%_test2)
+	PHP_FE(test1,		arginfo_test1)
+	PHP_FE(test2,		arginfo_test2)
 	PHP_FE_END
 };
 /* }}} */
diff --git a/ext/skeleton/skeleton.stub.php b/ext/skeleton/skeleton.stub.php
index 4bddcf37aa..59b5abd3dd 100644
--- a/ext/skeleton/skeleton.stub.php
+++ b/ext/skeleton/skeleton.stub.php
@@ -1,5 +1,5 @@
 <?php
 
-function %EXTNAME%_test1(): void {}
+function test1(): void {}
 
-function %EXTNAME%_test2(string $str = ""): string {}
+function test2(string $str = ""): string {}
diff --git a/ext/skeleton/skeleton_arginfo.h b/ext/skeleton/skeleton_arginfo.h
new file mode 100644
index 0000000000..aa1fbaf15d
--- /dev/null
+++ b/ext/skeleton/skeleton_arginfo.h
@@ -0,0 +1,8 @@
+/* This is a generated file, edit the .stub.php file instead. */
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_test1, 0, 0, IS_VOID, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_test2, 0, 0, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
+ZEND_END_ARG_INFO()
diff --git a/ext/skeleton/tests/002.phpt b/ext/skeleton/tests/002.phpt
index da550f27f8..dcbdd8f2b2 100644
--- a/ext/skeleton/tests/002.phpt
+++ b/ext/skeleton/tests/002.phpt
@@ -1,5 +1,5 @@
 --TEST--
-%EXTNAME%_test1() Basic test
+test1() Basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('%EXTNAME%')) {
@@ -8,7 +8,7 @@ if (!extension_loaded('%EXTNAME%')) {
 ?>
 --FILE--
 <?php
-$ret = %EXTNAME%_test1();
+$ret = test1();
 
 var_dump($ret);
 ?>
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 2f0184097f..8552dfbc43 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -189,8 +189,8 @@ static const zend_function_entry sockets_functions[] = {
 	PHP_FE(socket_addrinfo_explain,	arginfo_socket_addrinfo_explain)
 
 	/* for downwards compatibility */
-	PHP_FALIAS(socket_getopt, socket_get_option, arginfo_socket_get_option)
-	PHP_FALIAS(socket_setopt, socket_set_option, arginfo_socket_set_option)
+	PHP_FALIAS(socket_getopt, socket_get_option, arginfo_socket_getopt)
+	PHP_FALIAS(socket_setopt, socket_set_option, arginfo_socket_setopt)
 
 #ifdef PHP_WIN32
 	PHP_FE(socket_wsaprotocol_info_export, arginfo_socket_wsaprotocol_info_export)
diff --git a/ext/sockets/sockets.stub.php b/ext/sockets/sockets.stub.php
index d79cb7ac7a..86c4cd856e 100644
--- a/ext/sockets/sockets.stub.php
+++ b/ext/sockets/sockets.stub.php
@@ -62,8 +62,14 @@ function socket_sendto($socket, string $buf, int $len, int $flags, string $addr,
 function socket_get_option($socket, int $level, int $optname): array|int|false {}
 
 /** @param resource $socket */
+function socket_getopt($socket, int $level, int $optname): array|int|false {}
+
+/** @param resource $socket */
 function socket_set_option($socket, int $level, int $optname, $optval): bool {}
 
+/** @param resource $socket */
+function socket_setopt($socket, int $level, int $optname, $optval): bool {}
+
 #ifdef HAVE_SOCKETPAIR
 function socket_create_pair(int $domain, int $type, int $protocol, &$fd): bool|null {}
 #endif
diff --git a/ext/sockets/sockets_arginfo.h b/ext/sockets/sockets_arginfo.h
index 397c2e5683..ef40e5dda1 100644
--- a/ext/sockets/sockets_arginfo.h
+++ b/ext/sockets/sockets_arginfo.h
@@ -108,6 +108,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_get_option, 0, 3, MAY_BE_
 	ZEND_ARG_TYPE_INFO(0, optname, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_socket_getopt arginfo_socket_get_option
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_socket_set_option, 0, 4, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, socket)
 	ZEND_ARG_TYPE_INFO(0, level, IS_LONG, 0)
@@ -115,6 +117,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_socket_set_option, 0, 4, _IS_BOO
 	ZEND_ARG_INFO(0, optval)
 ZEND_END_ARG_INFO()
 
+#define arginfo_socket_setopt arginfo_socket_set_option
+
 #if defined(HAVE_SOCKETPAIR)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_socket_create_pair, 0, 4, _IS_BOOL, 1)
 	ZEND_ARG_TYPE_INFO(0, domain, IS_LONG, 0)
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index f6d513f53d..b7d2f4618b 100755
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -218,7 +218,7 @@ static const zend_function_entry basic_functions[] = { /* {{{ */
 	PHP_FE(similar_text,													arginfo_similar_text)
 	PHP_FE(explode,															arginfo_explode)
 	PHP_FE(implode,															arginfo_implode)
-	PHP_FALIAS(join,				implode,								arginfo_implode)
+	PHP_FALIAS(join,				implode,								arginfo_join)
 	PHP_FE(setlocale,														arginfo_setlocale)
 	PHP_FE(localeconv,														arginfo_localeconv)
 
@@ -233,8 +233,8 @@ static const zend_function_entry basic_functions[] = { /* {{{ */
 	PHP_FE(parse_str,														arginfo_parse_str)
 	PHP_FE(str_getcsv,														arginfo_str_getcsv)
 	PHP_FE(str_pad,															arginfo_str_pad)
-	PHP_FALIAS(chop,				rtrim,									arginfo_rtrim)
-	PHP_FALIAS(strchr,				strstr,									arginfo_strstr)
+	PHP_FALIAS(chop,				rtrim,									arginfo_chop)
+	PHP_FALIAS(strchr,				strstr,									arginfo_strchr)
 	PHP_NAMED_FE(sprintf,			PHP_FN(user_sprintf),					arginfo_sprintf)
 	PHP_NAMED_FE(printf,			PHP_FN(user_printf),					arginfo_printf)
 	PHP_FE(vprintf,															arginfo_vprintf)
@@ -276,8 +276,8 @@ static const zend_function_entry basic_functions[] = { /* {{{ */
 #endif
 
 	PHP_FE(rand,															arginfo_mt_rand)
-	PHP_FALIAS(srand, mt_srand,												arginfo_mt_srand)
-	PHP_FALIAS(getrandmax, mt_getrandmax,									arginfo_mt_getrandmax)
+	PHP_FALIAS(srand, mt_srand,												arginfo_srand)
+	PHP_FALIAS(getrandmax, mt_getrandmax,									arginfo_getrandmax)
 	PHP_FE(mt_rand,															arginfo_mt_rand)
 	PHP_FE(mt_srand,														arginfo_mt_srand)
 	PHP_FE(mt_getrandmax,													arginfo_mt_getrandmax)
@@ -423,14 +423,14 @@ static const zend_function_entry basic_functions[] = { /* {{{ */
 	PHP_FE(unregister_tick_function,										arginfo_unregister_tick_function)
 
 	PHP_FE(highlight_file,													arginfo_highlight_file)
-	PHP_FALIAS(show_source,			highlight_file,							arginfo_highlight_file)
+	PHP_FALIAS(show_source,			highlight_file,							arginfo_show_source)
 	PHP_FE(highlight_string,												arginfo_highlight_string)
 	PHP_FE(php_strip_whitespace,											arginfo_php_strip_whitespace)
 
 	PHP_FE(ini_get,															arginfo_ini_get)
 	PHP_FE(ini_get_all,														arginfo_ini_get_all)
 	PHP_FE(ini_set,															arginfo_ini_set)
-	PHP_FALIAS(ini_alter,			ini_set,								arginfo_ini_set)
+	PHP_FALIAS(ini_alter,			ini_set,								arginfo_ini_alter)
 	PHP_FE(ini_restore,														arginfo_ini_restore)
 	PHP_FE(get_include_path,												arginfo_get_include_path)
 	PHP_FE(set_include_path,												arginfo_set_include_path)
@@ -471,11 +471,11 @@ static const zend_function_entry basic_functions[] = { /* {{{ */
 #if defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC
 
 	PHP_FE(dns_check_record,												arginfo_dns_check_record)
-	PHP_FALIAS(checkdnsrr,			dns_check_record,						arginfo_dns_check_record)
+	PHP_FALIAS(checkdnsrr,			dns_check_record,						arginfo_checkdnsrr)
 
 # if defined(PHP_WIN32) || HAVE_FULL_DNS_FUNCS
 	PHP_FE(dns_get_mx,														arginfo_dns_get_mx)
-	PHP_FALIAS(getmxrr,				dns_get_mx,					arginfo_dns_get_mx)
+	PHP_FALIAS(getmxrr,				dns_get_mx,					arginfo_getmxrr)
 	PHP_FE(dns_get_record,													arginfo_dns_get_record)
 # endif
 #endif
@@ -483,7 +483,7 @@ static const zend_function_entry basic_functions[] = { /* {{{ */
 	/* functions from type.c */
 	PHP_FE(intval,															arginfo_intval)
 	PHP_FE(floatval,														arginfo_floatval)
-	PHP_FALIAS(doubleval,			floatval,								arginfo_floatval)
+	PHP_FALIAS(doubleval,			floatval,								arginfo_doubleval)
 	PHP_FE(strval,															arginfo_strval)
 	PHP_FE(boolval,															arginfo_boolval)
 	PHP_FE(gettype,															arginfo_gettype)
@@ -493,10 +493,10 @@ static const zend_function_entry basic_functions[] = { /* {{{ */
 	PHP_FE(is_bool,															arginfo_is_bool)
 	PHP_FE(is_int,															arginfo_is_int)
 	PHP_FE(is_float,														arginfo_is_float)
-	PHP_FALIAS(is_integer,			is_int,									arginfo_is_int)
-	PHP_FALIAS(is_long,				is_int,									arginfo_is_int)
-	PHP_FALIAS(is_double,			is_float,								arginfo_is_float)
-	PHP_DEP_FALIAS(is_real,			is_float,								arginfo_is_float)
+	PHP_FALIAS(is_integer,			is_int,									arginfo_is_integer)
+	PHP_FALIAS(is_long,				is_int,									arginfo_is_long)
+	PHP_FALIAS(is_double,			is_float,								arginfo_is_double)
+	PHP_DEP_FALIAS(is_real,			is_float,								arginfo_is_real)
 	PHP_FE(is_numeric,														arginfo_is_numeric)
 	PHP_FE(is_string,														arginfo_is_string)
 	PHP_FE(is_array,														arginfo_is_array)
@@ -526,7 +526,7 @@ static const zend_function_entry basic_functions[] = { /* {{{ */
 	PHP_FE(ftell,															arginfo_ftell)
 	PHP_FE(fflush,															arginfo_fflush)
 	PHP_FE(fwrite,															arginfo_fwrite)
-	PHP_FALIAS(fputs,				fwrite,									arginfo_fwrite)
+	PHP_FALIAS(fputs,				fwrite,									arginfo_fputs)
 	PHP_FE(mkdir,															arginfo_mkdir)
 	PHP_FE(rename,															arginfo_rename)
 	PHP_FE(copy,															arginfo_copy)
@@ -572,16 +572,16 @@ static const zend_function_entry basic_functions[] = { /* {{{ */
 	PHP_FE(get_meta_tags,													arginfo_get_meta_tags)
 	PHP_FE(stream_set_read_buffer,											arginfo_stream_set_read_buffer)
 	PHP_FE(stream_set_write_buffer,											arginfo_stream_set_write_buffer)
-	PHP_FALIAS(set_file_buffer, stream_set_write_buffer,					arginfo_stream_set_write_buffer)
+	PHP_FALIAS(set_file_buffer, stream_set_write_buffer,					arginfo_set_file_buffer)
 	PHP_FE(stream_set_chunk_size,											arginfo_stream_set_chunk_size)
 
 	PHP_FE(stream_set_blocking,												arginfo_stream_set_blocking)
-	PHP_FALIAS(socket_set_blocking, stream_set_blocking,					arginfo_stream_set_blocking)
+	PHP_FALIAS(socket_set_blocking, stream_set_blocking,					arginfo_socket_set_blocking)
 
 	PHP_FE(stream_get_meta_data,											arginfo_stream_get_meta_data)
 	PHP_FE(stream_get_line,													arginfo_stream_get_line)
 	PHP_FE(stream_wrapper_register,											arginfo_stream_wrapper_register)
-	PHP_FALIAS(stream_register_wrapper, stream_wrapper_register,			arginfo_stream_wrapper_register)
+	PHP_FALIAS(stream_register_wrapper, stream_wrapper_register,			arginfo_stream_register_wrapper)
 	PHP_FE(stream_wrapper_unregister,										arginfo_stream_wrapper_unregister)
 	PHP_FE(stream_wrapper_restore,											arginfo_stream_wrapper_restore)
 	PHP_FE(stream_get_wrappers,												arginfo_stream_get_wrappers)
@@ -592,10 +592,10 @@ static const zend_function_entry basic_functions[] = { /* {{{ */
 
 #if HAVE_SYS_TIME_H || defined(PHP_WIN32)
 	PHP_FE(stream_set_timeout,												arginfo_stream_set_timeout)
-	PHP_FALIAS(socket_set_timeout, stream_set_timeout,						arginfo_stream_set_timeout)
+	PHP_FALIAS(socket_set_timeout, stream_set_timeout,						arginfo_socket_set_timeout)
 #endif
 
-	PHP_FALIAS(socket_get_status, stream_get_meta_data,						arginfo_stream_get_meta_data)
+	PHP_FALIAS(socket_get_status, stream_get_meta_data,						arginfo_socket_get_status)
 
 #if HAVE_REALPATH || defined(ZTS)
 	PHP_FE(realpath,														arginfo_realpath)
@@ -648,7 +648,7 @@ static const zend_function_entry basic_functions[] = { /* {{{ */
 	PHP_FE(filetype,														arginfo_filetype)
 	PHP_FE(file_exists,														arginfo_file_exists)
 	PHP_FE(is_writable,														arginfo_is_writable)
-	PHP_FALIAS(is_writeable,		is_writable,							arginfo_is_writable)
+	PHP_FALIAS(is_writeable,		is_writable,							arginfo_is_writeable)
 	PHP_FE(is_readable,														arginfo_is_readable)
 	PHP_FE(is_executable,													arginfo_is_executable)
 	PHP_FE(is_file,															arginfo_is_file)
@@ -671,7 +671,7 @@ static const zend_function_entry basic_functions[] = { /* {{{ */
 	PHP_FE(clearstatcache,													arginfo_clearstatcache)
 	PHP_FE(disk_total_space,												arginfo_disk_total_space)
 	PHP_FE(disk_free_space,													arginfo_disk_free_space)
-	PHP_FALIAS(diskfreespace,		disk_free_space,						arginfo_disk_free_space)
+	PHP_FALIAS(diskfreespace,		disk_free_space,						arginfo_diskfreespace)
 	PHP_FE(realpath_cache_size,												arginfo_realpath_cache_size)
 	PHP_FE(realpath_cache_get,												arginfo_realpath_cache_get)
 
@@ -786,9 +786,9 @@ static const zend_function_entry basic_functions[] = { /* {{{ */
 	PHP_FE(array_key_exists,												arginfo_array_key_exists)
 
 	/* aliases from array.c */
-	PHP_FALIAS(pos,					current,								arginfo_current)
-	PHP_FALIAS(sizeof,				count,									arginfo_count)
-	PHP_FALIAS(key_exists,			array_key_exists,						arginfo_array_key_exists)
+	PHP_FALIAS(pos,					current,								arginfo_pos)
+	PHP_FALIAS(sizeof,				count,									arginfo_sizeof)
+	PHP_FALIAS(key_exists,			array_key_exists,						arginfo_key_exists)
 
 	/* functions from assert.c */
 	PHP_FE(assert,															arginfo_assert)
diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
index 1d2179fe62..3d19f2137b 100755
--- a/ext/standard/basic_functions.stub.php
+++ b/ext/standard/basic_functions.stub.php
@@ -47,6 +47,8 @@ function output_add_rewrite_var(string $name, string $value): bool {}
 
 function stream_wrapper_register(string $protocol, string $classname, int $flags = 0): bool {}
 
+function stream_register_wrapper(string $protocol, string $classname, int $flags = 0): bool {}
+
 function stream_wrapper_unregister(string $protocol): bool {}
 
 function stream_wrapper_restore(string $protocol): bool {}
@@ -62,6 +64,9 @@ function ksort(array &$arg, int $sort_flags = SORT_REGULAR): bool {}
 /** @param mixed $var */
 function count($var, int $mode = COUNT_NORMAL): int {}
 
+/** @param mixed $var */
+function sizeof($var, int $mode = COUNT_NORMAL): int {}
+
 function natsort(array &$arg): bool {}
 
 function natcasesort(array &$arg): bool {}
@@ -95,6 +100,9 @@ function reset(array|object &$arg) {}
 /** @return mixed */
 function current(array|object $arg) {}
 
+/** @return mixed */
+function pos(array|object $arg) {}
+
 function key(array|object $arg): int|string|null {}
 
 /** @return mixed */
@@ -230,6 +238,9 @@ function array_map(?callable $callback, array $arr1, array ...$arrays): array {}
 /** @param mixed $key */
 function array_key_exists($key, array $search): bool {}
 
+/** @param mixed $key */
+function key_exists($key, array $search): bool {}
+
 function array_chunk(array $arg, int $size, bool $preserve_keys = false): array {}
 
 function array_combine(array $keys, array $values): array {}
@@ -305,6 +316,8 @@ function register_shutdown_function($function, ...$args): ?bool {}
 
 function highlight_file(string $filename, bool $return = false): string|bool|null {}
 
+function show_source(string $filename, bool $return = false): string|bool|null {}
+
 function php_strip_whitespace(string $filename): string {}
 
 function highlight_string(string $string, bool $return = false): string|bool|null {}
@@ -315,6 +328,8 @@ function ini_get_all(?string $extension = null, bool $details = true): array|fal
 
 function ini_set(string $varname, string $value): string|false {}
 
+function ini_alter(string $varname, string $value): string|false {}
+
 function ini_restore(string $varname): void {}
 
 function set_include_path(string $include_path): string|false {}
@@ -402,9 +417,13 @@ function gethostbynamel(string $hostname): array|false {}
 #if defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC
 function dns_check_record(string $hostname, string $type = "MX"): bool {}
 
+function checkdnsrr(string $hostname, string $type = "MX"): bool {}
+
 function dns_get_record(string $hostname, int $type = DNS_ANY, &$authns = null, &$addtl = null, bool $raw = false): array|false {}
 
 function dns_get_mx(string $hostname, &$mxhosts, &$weight = null): bool {}
+
+function getmxrr(string $hostname, &$mxhosts, &$weight = null): bool {}
 #endif
 
 /* net.c */
@@ -529,6 +548,8 @@ function trim(string $str, string $character_mask = " \n\r\t\v\0"): string {}
 
 function rtrim(string $str, string $character_mask = " \n\r\t\v\0"): string {}
 
+function chop(string $str, string $character_mask = " \n\r\t\v\0"): string {}
+
 function ltrim(string $str, string $character_mask = " \n\r\t\v\0"): string {}
 
 function wordwrap(string $str, int $width = 75, string $break = "\n", bool $cut = false): string {}
@@ -537,6 +558,8 @@ function explode(string $separator, string $str, int $limit = PHP_INT_MAX): arra
 
 function implode(string|array $glue, array $pieces = UNKNOWN): string {}
 
+function join(string|array $glue, array $pieces = UNKNOWN): string {}
+
 function strtok(string $str, string $token = UNKNOWN): string|false {}
 
 function strtoupper(string $str): string {}
@@ -553,6 +576,8 @@ function stristr(string $haystack, string $needle, bool $before_needle = false):
 
 function strstr(string $haystack, string $needle, bool $before_needle = false): string|false {}
 
+function strchr(string $haystack, string $needle, bool $before_needle = false): string|false {}
+
 function strpos(string $haystack, string $needle, int $offset = 0): int|false {}
 
 function stripos(string $haystack, string $needle, int $offset = 0): int|false {}
@@ -696,6 +721,9 @@ class Directory
 function opendir(string $path, $context = UNKNOWN) {}
 
 /** @param resource $context */
+function getdir(string $path, $context = UNKNOWN): Directory|false {}
+
+/** @param resource $context */
 function dir(string $path, $context = UNKNOWN): Directory|false {}
 
 /** @param resource $dir_handle */
@@ -811,6 +839,9 @@ function fflush($handle): bool {}
 /** @param resource $handle */
 function fwrite($handle, string $content, int $max_length = UNKNOWN): int|false {}
 
+/** @param resource $handle */
+function fputs($handle, string $content, int $max_length = UNKNOWN): int|false {}
+
 /** @param resource|null $context */
 function mkdir(string $pathname, int $mode = 0777, bool $recursive = false, $context = null): bool {}
 
@@ -1157,10 +1188,14 @@ function quoted_printable_encode(string $str): string {}
 
 function mt_srand(int $seed = 0, int $mode = MT_RAND_MT19937): void {}
 
+function srand(int $seed = 0, int $mode = MT_RAND_MT19937): void {}
+
 function mt_rand(int $min = 0, int $max = PHP_INT_MAX): int {}
 
 function mt_getrandmax(): int {}
 
+function getrandmax(): int {}
+
 /* random.c */
 
 function random_bytes(int $length): string {}
@@ -1276,14 +1311,23 @@ function stream_supports_lock($stream): bool {}
 function stream_set_write_buffer($stream, int $buffer): int {}
 
 /** @param resource $stream */
+function set_file_buffer($stream, int $buffer): int {}
+
+/** @param resource $stream */
 function stream_set_read_buffer($stream, int $buffer): int {}
 
 /** @param resource $stream */
 function stream_set_blocking($stream, bool $mode): bool {}
 
 /** @param resource $stream */
+function socket_set_blocking($stream, bool $mode): bool {}
+
+/** @param resource $stream */
 function stream_get_meta_data($stream): array {}
 
+/** @param resource $stream */
+function socket_get_status($stream): array {}
+
 /** @param resource $handle */
 function stream_get_line($handle, int $max_length, string $ending = ""): string|false {}
 
@@ -1310,6 +1354,9 @@ function stream_set_chunk_size($stream, int $size): int {}
 #if HAVE_SYS_TIME_H || defined(PHP_WIN32)
 /** @param resource $socket */
 function stream_set_timeout($socket, int $seconds, int $microseconds = 0): bool {}
+
+/** @param resource $socket */
+function socket_set_timeout($socket, int $seconds, int $microseconds = 0): bool {}
 #endif
 
 /* type.c */
@@ -1326,6 +1373,9 @@ function intval($value, int $base = 10): int {}
 function floatval($value): float {}
 
 /** @param mixed $value */
+function doubleval($value): float {}
+
+/** @param mixed $value */
 function boolval($value): bool {}
 
 /** @param mixed $value */
@@ -1344,9 +1394,21 @@ function is_bool($value): bool {}
 function is_int($value): bool {}
 
 /** @param mixed $value */
+function is_integer($value): bool {}
+
+/** @param mixed $value */
+function is_long($value): bool {}
+
+/** @param mixed $value */
 function is_float($value): bool {}
 
 /** @param mixed $value */
+function is_double($value): bool {}
+
+/** @param mixed $value */
+function is_real($value): bool {}
+
+/** @param mixed $value */
 function is_numeric($value): bool {}
 
 /** @param mixed $value */
diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
index 98c7ff77f7..b5af02829d 100755
--- a/ext/standard/basic_functions_arginfo.h
+++ b/ext/standard/basic_functions_arginfo.h
@@ -60,6 +60,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stream_wrapper_register, 0, 2, _
 	ZEND_ARG_TYPE_INFO(0, flags, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_stream_register_wrapper arginfo_stream_wrapper_register
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stream_wrapper_unregister, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, protocol, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -83,6 +85,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_count, 0, 1, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_sizeof arginfo_count
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_natsort, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(1, arg, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
@@ -120,6 +124,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_current, 0, 0, 1)
 	ZEND_ARG_TYPE_MASK(0, arg, MAY_BE_ARRAY|MAY_BE_OBJECT)
 ZEND_END_ARG_INFO()
 
+#define arginfo_pos arginfo_current
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_key, 0, 1, MAY_BE_LONG|MAY_BE_STRING|MAY_BE_NULL)
 	ZEND_ARG_TYPE_MASK(0, arg, MAY_BE_ARRAY|MAY_BE_OBJECT)
 ZEND_END_ARG_INFO()
@@ -347,6 +353,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_key_exists, 0, 2, _IS_BOOL
 	ZEND_ARG_TYPE_INFO(0, search, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_key_exists arginfo_array_key_exists
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_chunk, 0, 2, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 0)
@@ -463,6 +471,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_highlight_file, 0, 1, MAY_BE_STR
 	ZEND_ARG_TYPE_INFO(0, return, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_show_source arginfo_highlight_file
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_php_strip_whitespace, 0, 1, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -486,6 +496,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ini_set, 0, 2, MAY_BE_STRING|MAY
 	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_ini_alter arginfo_ini_set
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ini_restore, 0, 1, IS_VOID, 0)
 	ZEND_ARG_TYPE_INFO(0, varname, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -626,6 +638,10 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC
+#define arginfo_checkdnsrr arginfo_dns_check_record
+#endif
+
+#if defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_dns_get_record, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
@@ -643,6 +659,10 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_dns_get_mx, 0, 2, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 #endif
 
+#if defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC
+#define arginfo_getmxrr arginfo_dns_get_mx
+#endif
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_net_get_interfaces, 0, 0, MAY_BE_ARRAY|MAY_BE_FALSE)
 ZEND_END_ARG_INFO()
 
@@ -825,6 +845,8 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_rtrim arginfo_trim
 
+#define arginfo_chop arginfo_trim
+
 #define arginfo_ltrim arginfo_trim
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_wordwrap, 0, 1, IS_STRING, 0)
@@ -845,6 +867,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_implode, 0, 1, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, pieces, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_join arginfo_implode
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strtok, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, token, IS_STRING, 0)
@@ -877,6 +901,8 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_strstr arginfo_stristr
 
+#define arginfo_strchr arginfo_stristr
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strpos, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, haystack, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, needle, IS_STRING, 0)
@@ -1083,11 +1109,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_opendir, 0, 0, 1)
 	ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_dir, 0, 1, Directory, MAY_BE_FALSE)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_getdir, 0, 1, Directory, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 0)
 	ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
+#define arginfo_dir arginfo_getdir
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_closedir, 0, 0, IS_VOID, 0)
 	ZEND_ARG_INFO(0, dir_handle)
 ZEND_END_ARG_INFO()
@@ -1256,6 +1284,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_fwrite, 0, 2, MAY_BE_LONG|MAY_BE
 	ZEND_ARG_TYPE_INFO(0, max_length, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_fputs arginfo_fwrite
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mkdir, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, pathname, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
@@ -1801,6 +1831,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mt_srand, 0, 0, IS_VOID, 0)
 	ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_srand arginfo_mt_srand
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mt_rand, 0, 0, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, min, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, max, IS_LONG, 0)
@@ -1808,6 +1840,8 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_mt_getrandmax arginfo_ob_get_level
 
+#define arginfo_getrandmax arginfo_ob_get_level
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_random_bytes, 0, 1, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
 ZEND_END_ARG_INFO()
@@ -1961,6 +1995,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stream_set_write_buffer, 0, 2, I
 	ZEND_ARG_TYPE_INFO(0, buffer, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_set_file_buffer arginfo_stream_set_write_buffer
+
 #define arginfo_stream_set_read_buffer arginfo_stream_set_write_buffer
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stream_set_blocking, 0, 2, _IS_BOOL, 0)
@@ -1968,10 +2004,14 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stream_set_blocking, 0, 2, _IS_B
 	ZEND_ARG_TYPE_INFO(0, mode, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_socket_set_blocking arginfo_stream_set_blocking
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stream_get_meta_data, 0, 1, IS_ARRAY, 0)
 	ZEND_ARG_INFO(0, stream)
 ZEND_END_ARG_INFO()
 
+#define arginfo_socket_get_status arginfo_stream_get_meta_data
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_stream_get_line, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, handle)
 	ZEND_ARG_TYPE_INFO(0, max_length, IS_LONG, 0)
@@ -2008,6 +2048,10 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stream_set_timeout, 0, 2, _IS_BO
 ZEND_END_ARG_INFO()
 #endif
 
+#if HAVE_SYS_TIME_H || defined(PHP_WIN32)
+#define arginfo_socket_set_timeout arginfo_stream_set_timeout
+#endif
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gettype, 0, 1, IS_STRING, 0)
 	ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
@@ -2026,6 +2070,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_floatval, 0, 1, IS_DOUBLE, 0)
 	ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
+#define arginfo_doubleval arginfo_floatval
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_boolval, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
@@ -2042,8 +2088,16 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_is_int arginfo_boolval
 
+#define arginfo_is_integer arginfo_boolval
+
+#define arginfo_is_long arginfo_boolval
+
 #define arginfo_is_float arginfo_boolval
 
+#define arginfo_is_double arginfo_boolval
+
+#define arginfo_is_real arginfo_boolval
+
 #define arginfo_is_numeric arginfo_boolval
 
 #define arginfo_is_string arginfo_boolval