Fix mysqlii_connect() and mysqli::connect() return types

Author: kocsismate

ext/mysqli/mysqli.stub.php

@@ -110,7 +110,7 @@ public function connect(
         ?string $database = null,
         ?int $port = null,
         ?string $socket = null
-    ): mysqli|null|false {}
+    ): bool {}
 
     /**
      * @tentative-return-type
@@ -624,7 +624,7 @@ function mysqli_connect(
     ?string $database = null,
     ?int $port = null,
     ?string $socket = null
-): mysqli|null|false {}
+): mysqli|false {}
 
 function mysqli_connect_errno(): int {}
 

ext/mysqli/mysqli_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 441527cdbb3017b3a18026ebe843d1b47b6c5acb */
+ * Stub hash: c9f340f48c4414f1b0cfa48ac9b7167a0a6991ef */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
 	ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)
@@ -33,7 +33,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_mysqli_commit arginfo_mysqli_begin_transaction
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_mysqli_connect, 0, 0, mysqli, MAY_BE_NULL|MAY_BE_FALSE)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_mysqli_connect, 0, 0, mysqli, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, hostname, IS_STRING, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, username, IS_STRING, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 1, "null")
@@ -454,7 +454,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_mysqli_commit arginfo_class_mysqli_begin_transaction
 
-ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_mysqli_connect, 0, 0, mysqli, MAY_BE_NULL|MAY_BE_FALSE)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_mysqli_connect, 0, 0, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, hostname, IS_STRING, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, username, IS_STRING, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 1, "null")

ext/mysqli/mysqli_nonapi.c

@@ -359,11 +359,8 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, bool is_real_connect, b
 	} else {
 		(Z_MYSQLI_P(object))->ptr = mysqli_resource;
 	}
-	if (!is_real_connect) {
-		return;
-	} else {
-		RETURN_TRUE;
-	}
+
+	RETURN_TRUE;
 
 err:
 	if (mysql->hash_key) {