diff options
| author | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-02-18 19:59:15 +0100 |
|---|---|---|
| committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-02-18 21:10:36 +0100 |
| commit | 736b22dc0b2fc36e9bd87f2ee5af8c4b2be9fd3d (patch) | |
| tree | d64c1ceccf5eb553e6a210105238c32da693c22a /ext/sockets | |
| parent | 172010a08d0916ab1678f7f0768472c120330307 (diff) | |
| download | php-git-736b22dc0b2fc36e9bd87f2ee5af8c4b2be9fd3d.tar.gz | |
Add stubs for aliases
Closes GH-5187
Diffstat (limited to 'ext/sockets')
| -rw-r--r-- | ext/sockets/sockets.c | 4 | ||||
| -rw-r--r-- | ext/sockets/sockets.stub.php | 6 | ||||
| -rw-r--r-- | ext/sockets/sockets_arginfo.h | 4 |
3 files changed, 12 insertions, 2 deletions
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) |