Merge branch 'PHP-8.0'

* PHP-8.0:
  Make mysqli_ssl_set() arguments nullable

Author: nikic

ext/mysqli/mysqli.stub.php

@@ -256,11 +256,11 @@ public function set_opt(int $option, $value) {}
      * @alias mysqli_ssl_set
      */
     public function ssl_set(
-        string $key,
-        string $certificate,
-        string $ca_certificate,
-        string $ca_path,
-        string $cipher_algos
+        ?string $key,
+        ?string $certificate,
+        ?string $ca_certificate,
+        ?string $ca_path,
+        ?string $cipher_algos
     ) {}
 
     /**
@@ -746,11 +746,11 @@ function mysqli_sqlstate(mysqli $mysql): string {}
 
 function mysqli_ssl_set(
     mysqli $mysql,
-    string $key,
-    string $certificate,
-    string $ca_certificate,
-    string $ca_path,
-    string $cipher_algos
+    ?string $key,
+    ?string $certificate,
+    ?string $ca_certificate,
+    ?string $ca_path,
+    ?string $cipher_algos
 ): bool {}
 
 function mysqli_stat(mysqli $mysql): string|false {}

ext/mysqli/mysqli_api.c

@@ -2155,7 +2155,7 @@ PHP_FUNCTION(mysqli_ssl_set)
 	char		*ssl_parm[5];
 	size_t			ssl_parm_len[5], i;
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Osssss", &mysql_link, mysqli_link_class_entry, &ssl_parm[0], &ssl_parm_len[0], &ssl_parm[1], &ssl_parm_len[1], &ssl_parm[2], &ssl_parm_len[2], &ssl_parm[3], &ssl_parm_len[3], &ssl_parm[4], &ssl_parm_len[4])   == FAILURE) {
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!s!s!s!s!", &mysql_link, mysqli_link_class_entry, &ssl_parm[0], &ssl_parm_len[0], &ssl_parm[1], &ssl_parm_len[1], &ssl_parm[2], &ssl_parm_len[2], &ssl_parm[3], &ssl_parm_len[3], &ssl_parm[4], &ssl_parm_len[4])   == FAILURE) {
 		RETURN_THROWS();
 	}
 	MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_INITIALIZED);

ext/mysqli/mysqli_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: a41875cecd71e72e1c1d3fc9c4d1442a65cd2d15 */
+ * Stub hash: cd44441ccae3d04e4691e0b1b040cafd8db8b521 */
 
 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)
@@ -382,11 +382,11 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mysqli_ssl_set, 0, 6, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)
-	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, certificate, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, ca_certificate, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, ca_path, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, cipher_algos, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, certificate, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, ca_certificate, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, ca_path, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, cipher_algos, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_stat, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
@@ -545,11 +545,11 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_mysqli_set_opt arginfo_class_mysqli_options
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_mysqli_ssl_set, 0, 0, 5)
-	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, certificate, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, ca_certificate, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, ca_path, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO(0, cipher_algos, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, certificate, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, ca_certificate, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, ca_path, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, cipher_algos, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_mysqli_stat arginfo_class_mysqli_character_set_name