diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2021-01-12 12:09:13 +0100 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2021-01-12 12:09:13 +0100 |
commit | 1a0fa12753931dba9908161df0f63feb6d0ba025 (patch) | |
tree | 6e62499f26024ef77dae106b17a082c6e268aa23 /ext/sockets | |
parent | 13e049ecfda257f59c39d35d7683b9bbdcb2d368 (diff) | |
parent | 41e9a8ebdca3a94cc7da933dc10df058c50ac8bb (diff) | |
download | php-git-1a0fa12753931dba9908161df0f63feb6d0ba025.tar.gz |
Merge branch 'PHP-8.0'
* PHP-8.0:
socket_create_pair() can no longer return NULL
Diffstat (limited to 'ext/sockets')
-rw-r--r-- | ext/sockets/sockets.stub.php | 2 | ||||
-rw-r--r-- | ext/sockets/sockets_arginfo.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/sockets/sockets.stub.php b/ext/sockets/sockets.stub.php index 1a62d83193..b345163bc7 100644 --- a/ext/sockets/sockets.stub.php +++ b/ext/sockets/sockets.stub.php @@ -78,7 +78,7 @@ function socket_setopt(Socket $socket, int $level, int $option, $value): bool {} #ifdef HAVE_SOCKETPAIR /** @param array $pair */ -function socket_create_pair(int $domain, int $type, int $protocol, &$pair): ?bool {} +function socket_create_pair(int $domain, int $type, int $protocol, &$pair): bool {} #endif #ifdef HAVE_SHUTDOWN diff --git a/ext/sockets/sockets_arginfo.h b/ext/sockets/sockets_arginfo.h index f86f225026..343c19a563 100644 --- a/ext/sockets/sockets_arginfo.h +++ b/ext/sockets/sockets_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: ee025740240c285691a84cfa3563c1dd1586a75d */ + * Stub hash: 90c3c470833947859433a2668d328fddfff94ae9 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_select, 0, 4, MAY_BE_LONG|MAY_BE_FALSE) ZEND_ARG_TYPE_INFO(1, read, IS_ARRAY, 1) @@ -125,7 +125,7 @@ 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_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_socket_create_pair, 0, 4, _IS_BOOL, 0) ZEND_ARG_TYPE_INFO(0, domain, IS_LONG, 0) ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0) ZEND_ARG_TYPE_INFO(0, protocol, IS_LONG, 0) |