From bf0859d315cdaa987e45f42233c13dd942cfb3ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Thu, 6 May 2021 15:19:43 +0200
Subject: [PATCH 1/3] Fix return type of UConverter::fromUCallback() and
 UConverter::toUCallback()

---
 ext/intl/converter/converter.stub.php  | 4 ++--
 ext/intl/converter/converter_arginfo.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/intl/converter/converter.stub.php b/ext/intl/converter/converter.stub.php
index 5b82b098f47f7..605ef9f4a589d 100644
--- a/ext/intl/converter/converter.stub.php
+++ b/ext/intl/converter/converter.stub.php
@@ -11,7 +11,7 @@ public function convert(string $str, bool $reverse = false) {}
 
     /**
      * @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 @@ public function setSubstChars(string $chars) {}
 
     /**
      * @param int $error
-     * @return string|null
+     * @return string|int|array|null
      */
     public function toUCallback(int $reason, string $source, string $codeUnits, &$error) {}
 
diff --git a/ext/intl/converter/converter_arginfo.h b/ext/intl/converter/converter_arginfo.h
index 8b8f8fc1f521e..7ab414f7d15eb 100644
--- a/ext/intl/converter/converter_arginfo.h
+++ b/ext/intl/converter/converter_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: e33e2614c969c59b79c6062f7a347a8e8e486d85 */
+ * Stub hash: 07a152ecebadf8f1766fb231cd60bfefda0dd6a6 */
 
 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")

From 4def97680689ec048a8260a25b547403697c964b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Thu, 6 May 2021 15:20:58 +0200
Subject: [PATCH 2/3] Fix return type of mysqli::init()

---
 ext/mysqli/mysqli.stub.php  | 2 +-
 ext/mysqli/mysqli_arginfo.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/mysqli/mysqli.stub.php b/ext/mysqli/mysqli.stub.php
index 9326bbd915513..bb8746535b649 100644
--- a/ext/mysqli/mysqli.stub.php
+++ b/ext/mysqli/mysqli.stub.php
@@ -113,7 +113,7 @@ public function get_server_info() {}
     public function get_warnings() {}
 
     /**
-     * @return mysqli|false
+     * @return null|false
      */
     public function init() {}
 
diff --git a/ext/mysqli/mysqli_arginfo.h b/ext/mysqli/mysqli_arginfo.h
index c9f203a559698..6ecfbd42a60d4 100644
--- a/ext/mysqli/mysqli_arginfo.h
+++ b/ext/mysqli/mysqli_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 36c7ee22aa4c5bb5e0174031a3defcaaadde0dbd */
+ * Stub hash: c2ab263780902447855ecb0d8a9e3432577a32d1 */
 
 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)

From 97fb5c265d3cc63c0bed56915c43b6b7e7b063c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Thu, 6 May 2021 15:22:33 +0200
Subject: [PATCH 3/3] Fix return type of php_user_filter::onCreate()

---
 ext/standard/user_filters.c         | 2 ++
 ext/standard/user_filters.stub.php  | 2 +-
 ext/standard/user_filters_arginfo.h | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index 758f79ff11266..a236e0e42a6f4 100644
--- a/ext/standard/user_filters.c
+++ b/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)
diff --git a/ext/standard/user_filters.stub.php b/ext/standard/user_filters.stub.php
index 40657503127f4..595b4841283f2 100755
--- a/ext/standard/user_filters.stub.php
+++ b/ext/standard/user_filters.stub.php
@@ -12,7 +12,7 @@ class php_user_filter
      */
     public function filter($in, $out, &$consumed, bool $closing) {}
 
-    /** @return void */
+    /** @return bool */
     public function onCreate() {}
 
     /** @return void */
diff --git a/ext/standard/user_filters_arginfo.h b/ext/standard/user_filters_arginfo.h
index aabb25c9d1bdc..d434c20796dbd 100644
--- a/ext/standard/user_filters_arginfo.h
+++ b/ext/standard/user_filters_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: b3876ce9055a9417d0d1db9f97235513740de956 */
+ * Stub hash: b48d5f26a4f0663a06a274aeba1cfca2e0e80f91 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_php_user_filter_filter, 0, 0, 4)
 	ZEND_ARG_INFO(0, in)