Skip to content

Commit 1a1a9b2

Browse files
committed
Merge branch 'PHP-8.0'
* Fix the return type of mysqli_connect()
2 parents 187c56a + 97f7279 commit 1a1a9b2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ext/mysqli/mysqli.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ function mysqli_connect(
628628
?string $database = null,
629629
?int $port = null,
630630
?string $socket = null
631-
): mysqli|null|false {}
631+
): mysqli|false {}
632632

633633
function mysqli_connect_errno(): int {}
634634

ext/mysqli/mysqli_arginfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 44c9bfee4b52160b69a83a457a3176b030046bb7 */
2+
* Stub hash: df166a75b0b335aa8f938dc30e139d04ae8c1363 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
55
ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)
@@ -33,7 +33,7 @@ ZEND_END_ARG_INFO()
3333

3434
#define arginfo_mysqli_commit arginfo_mysqli_begin_transaction
3535

36-
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_mysqli_connect, 0, 0, mysqli, MAY_BE_NULL|MAY_BE_FALSE)
36+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_mysqli_connect, 0, 0, mysqli, MAY_BE_FALSE)
3737
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, hostname, IS_STRING, 1, "null")
3838
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, username, IS_STRING, 1, "null")
3939
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 1, "null")

0 commit comments

Comments
 (0)