Merge branch 'PHP-8.0'

* Fix return type of php_user_filter::onCreate()
* Fix return type of mysqli::init()
* Fix return type of UConverter::fromUCallback() and UConverter::toUCallback()

ext/intl/converter/converter.stub.php

@@ -11,7 +11,7 @@ class UConverter
 
     /**
      * @param int $error
-     * @return string|null
+     * @return string|int|array|null
      */
     public function fromUCallback(int $reason, array $source, int $codePoint, &$error) {}
 
@@ -59,7 +59,7 @@ class UConverter
 
     /**
      * @param int $error
-     * @return string|null
+     * @return string|int|array|null
      */
     public function toUCallback(int $reason, string $source, string $codeUnits, &$error) {}
 

ext/intl/converter/converter_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: c01b6c9d6a6754a2fffde1279bec3a984e6a2f34 */
+ * Stub hash: ede345fc0cbc16ca968535b96a93c0479451764e */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_UConverter___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, destination_encoding, IS_STRING, 1, "null")

ext/mysqli/mysqli.stub.php

@@ -159,7 +159,7 @@ class mysqli
     public function get_warnings() {}
 
     /**
-     * @return mysqli|false
+     * @return null|false
      */
     public function init() {}
 

ext/mysqli/mysqli_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 42fdb807a547cfa3ba35bb2b8a4ee0f0d556a18c */
+ * Stub hash: 6e22edabfde28f950f79aae189c1b410bb31b785 */
 
 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)

ext/standard/user_filters.c

@@ -51,6 +51,8 @@ PHP_METHOD(php_user_filter, filter)
 PHP_METHOD(php_user_filter, onCreate)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
+
+	RETURN_TRUE;
 }
 
 PHP_METHOD(php_user_filter, onClose)

ext/standard/user_filters.stub.php

@@ -15,7 +15,7 @@ class php_user_filter
      */
     public function filter($in, $out, &$consumed, bool $closing) {}
 
-    /** @return void */
+    /** @return bool */
     public function onCreate() {}
 
     /** @return void */

ext/standard/user_filters_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: d4044dd3037954ce035142577a5476bb2d403c76 */
+ * Stub hash: 849ca9dc7aa120c1162f75aa43d85049276486a6 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_php_user_filter_filter, 0, 0, 4)
 	ZEND_ARG_INFO(0, in)