From 65b96397b3275f6c75c5e4e7d7ec8f4d9ba8a814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Tue, 6 Jul 2021 10:55:43 +0200
Subject: [PATCH] Declare tentative return types for ext/intl (#6986)

---
 ext/intl/breakiterator/breakiterator.stub.php | 100 ++++----
 .../breakiterator/breakiterator_arginfo.h     |  52 ++--
 .../breakiterator_iterators.stub.php          |   4 +-
 .../breakiterator_iterators_arginfo.h         |   4 +-
 .../breakiterator/breakiterator_methods.cpp   |   1 -
 ext/intl/calendar/calendar.stub.php           | 177 +++++++------
 ext/intl/calendar/calendar_arginfo.h          |  78 +++---
 ext/intl/calendar/calendar_methods.cpp        |   5 +-
 ext/intl/collator/collator.stub.php           |  50 ++--
 ext/intl/collator/collator_arginfo.h          |  28 +-
 ext/intl/common/common.stub.php               |  20 +-
 ext/intl/common/common_arginfo.h              |  12 +-
 ext/intl/converter/converter.stub.php         |  72 +++---
 ext/intl/converter/converter_arginfo.h        |  41 +--
 ext/intl/dateformat/dateformat.stub.php       |  80 +++---
 ext/intl/dateformat/dateformat_arginfo.h      |  47 ++--
 ext/intl/formatter/formatter.stub.php         |  64 ++---
 ext/intl/formatter/formatter_arginfo.h        |  42 +--
 ext/intl/locale/locale.stub.php               |  70 ++---
 ext/intl/locale/locale_arginfo.h              |  34 ++-
 ext/intl/msgformat/msgformat.stub.php         |  40 +--
 ext/intl/msgformat/msgformat_arginfo.h        |  27 +-
 ext/intl/normalizer/normalizer.stub.php       |  12 +-
 ext/intl/normalizer/normalizer_arginfo.h      |  11 +-
 ext/intl/php_intl.stub.php                    |  32 +--
 ext/intl/php_intl_arginfo.h                   |  28 +-
 .../resourcebundle/resourcebundle.stub.php    |  24 +-
 .../resourcebundle/resourcebundle_arginfo.h   |  17 +-
 ext/intl/spoofchecker/spoofchecker.stub.php   |  20 +-
 ext/intl/spoofchecker/spoofchecker_arginfo.h  |  12 +-
 ext/intl/tests/bug78804.phpt                  |   2 +-
 ext/intl/tests/uconverter_oop_callback.phpt   |   4 +-
 ext/intl/tests/uconverter_oop_callback2.phpt  |   4 +-
 .../tests/uconverter_oop_callback_return.phpt |   8 +-
 ext/intl/timezone/timezone.stub.php           |  96 +++----
 ext/intl/timezone/timezone_arginfo.h          |  60 +++--
 .../transliterator/transliterator.stub.php    |  28 +-
 .../transliterator/transliterator_arginfo.h   |  20 +-
 ext/intl/uchar/uchar.stub.php                 | 239 +++++++++---------
 ext/intl/uchar/uchar_arginfo.h                | 133 +++++-----
 40 files changed, 946 insertions(+), 852 deletions(-)

diff --git a/ext/intl/breakiterator/breakiterator.stub.php b/ext/intl/breakiterator/breakiterator.stub.php
index bae4726be41..c78e48da627 100644
--- a/ext/intl/breakiterator/breakiterator.stub.php
+++ b/ext/intl/breakiterator/breakiterator.stub.php
@@ -4,67 +4,67 @@
 
 class IntlBreakIterator implements IteratorAggregate
 {
-    /** @return IntlBreakIterator|null */
-    public static function createCharacterInstance(?string $locale = null) {}
+    /** @tentative-return-type */
+    public static function createCharacterInstance(?string $locale = null): ?IntlBreakIterator {}
 
-    /** @return IntlCodePointBreakIterator */
-    public static function createCodePointInstance() {}
+    /** @tentative-return-type */
+    public static function createCodePointInstance(): IntlCodePointBreakIterator {}
 
-    /** @return IntlBreakIterator|null */
-    public static function createLineInstance(?string $locale = null) {}
+    /** @tentative-return-type */
+    public static function createLineInstance(?string $locale = null): ?IntlBreakIterator {}
 
-    /** @return IntlBreakIterator|null */
-    public static function createSentenceInstance(?string $locale = null) {}
+    /** @tentative-return-type */
+    public static function createSentenceInstance(?string $locale = null): ?IntlBreakIterator {}
 
-    /** @return IntlBreakIterator|null */
-    public static function createTitleInstance(?string $locale = null) {}
+    /** @tentative-return-type */
+    public static function createTitleInstance(?string $locale = null): ?IntlBreakIterator {}
 
-    /** @return IntlBreakIterator|null */
-    public static function createWordInstance(?string $locale = null) {}
+    /** @tentative-return-type */
+    public static function createWordInstance(?string $locale = null): ?IntlBreakIterator {}
 
     private function __construct() {}
 
-    /** @return int */
-    public function current() {}
+    /** @tentative-return-type */
+    public function current(): int {}
 
-    /** @return int */
-    public function first() {}
+    /** @tentative-return-type */
+    public function first(): int {}
 
-    /** @return int */
-    public function following(int $offset) {}
+    /** @tentative-return-type */
+    public function following(int $offset): int {}
 
-    /** @return int */
-    public function getErrorCode() {}
+    /** @tentative-return-type */
+    public function getErrorCode(): int {}
 
-    /** @return string|false */
-    public function getErrorMessage() {}
+    /** @tentative-return-type */
+    public function getErrorMessage(): string {}
 
-    /** @return string */
-    public function getLocale(int $type) {}
+    /** @tentative-return-type */
+    public function getLocale(int $type): string|false {}
 
-    /** @return IntlPartsIterator */
-    public function getPartsIterator(string $type = IntlPartsIterator::KEY_SEQUENTIAL) {}
+    /** @tentative-return-type */
+    public function getPartsIterator(string $type = IntlPartsIterator::KEY_SEQUENTIAL): IntlPartsIterator {}
 
-    /** @return string|null */
-    public function getText() {}
+    /** @tentative-return-type */
+    public function getText(): ?string {}
 
-    /** @return bool */
-    public function isBoundary(int $offset) {}
+    /** @tentative-return-type */
+    public function isBoundary(int $offset): bool {}
 
-    /** @return int */
-    public function last() {}
+    /** @tentative-return-type */
+    public function last(): int {}
 
-    /** @return int */
-    public function next(?int $offset = null) {}
+    /** @tentative-return-type */
+    public function next(?int $offset = null): int {}
 
-    /** @return int */
-    public function preceding(int $offset) {}
+    /** @tentative-return-type */
+    public function preceding(int $offset): int {}
 
-    /** @return int */
-    public function previous() {}
+    /** @tentative-return-type */
+    public function previous(): int {}
 
-    /** @return bool|null */
-    public function setText(string $text) {}
+    /** @tentative-return-type */
+    public function setText(string $text): ?bool {} // TODO return false instead of null in case of failure
 
     public function getIterator(): Iterator {}
 }
@@ -73,21 +73,21 @@ class IntlRuleBasedBreakIterator extends IntlBreakIterator
 {
     public function __construct(string $rules, bool $compiled = false) {}
 
-    /** @return string|false */
-    public function getBinaryRules() {}
+    /** @tentative-return-type */
+    public function getBinaryRules(): string|false {}
 
-    /** @return string|false */
-    public function getRules() {}
+    /** @tentative-return-type */
+    public function getRules(): string|false {}
 
-    /** @return int */
-    public function getRuleStatus() {}
+    /** @tentative-return-type */
+    public function getRuleStatus(): int {}
 
-    /** @return array|false */
-    public function getRuleStatusVec() {}
+    /** @tentative-return-type */
+    public function getRuleStatusVec(): array|false {}
 }
 
 class IntlCodePointBreakIterator extends IntlBreakIterator
 {
-    /** @return int */
-    public function getLastCodePoint() {}
+    /** @tentative-return-type */
+    public function getLastCodePoint(): int {}
 }
diff --git a/ext/intl/breakiterator/breakiterator_arginfo.h b/ext/intl/breakiterator/breakiterator_arginfo.h
index aa025ee901f..04f834a087e 100644
--- a/ext/intl/breakiterator/breakiterator_arginfo.h
+++ b/ext/intl/breakiterator/breakiterator_arginfo.h
@@ -1,11 +1,11 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 9e9dc1cd1302038f351f6075393494d1a58f0d74 */
+ * Stub hash: 1979da7ee2fa55b27f1c91bb4e0ddc37e8505b08 */
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlBreakIterator_createCharacterInstance, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_IntlBreakIterator_createCharacterInstance, 0, 0, IntlBreakIterator, 1)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlBreakIterator_createCodePointInstance, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_IntlBreakIterator_createCodePointInstance, 0, 0, IntlCodePointBreakIterator, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlBreakIterator_createLineInstance arginfo_class_IntlBreakIterator_createCharacterInstance
@@ -16,43 +16,49 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlBreakIterator_createWordInstance arginfo_class_IntlBreakIterator_createCharacterInstance
 
-#define arginfo_class_IntlBreakIterator___construct arginfo_class_IntlBreakIterator_createCodePointInstance
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlBreakIterator___construct, 0, 0, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlBreakIterator_current arginfo_class_IntlBreakIterator_createCodePointInstance
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlBreakIterator_current, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlBreakIterator_first arginfo_class_IntlBreakIterator_createCodePointInstance
+#define arginfo_class_IntlBreakIterator_first arginfo_class_IntlBreakIterator_current
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlBreakIterator_following, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlBreakIterator_following, 0, 1, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlBreakIterator_getErrorCode arginfo_class_IntlBreakIterator_createCodePointInstance
+#define arginfo_class_IntlBreakIterator_getErrorCode arginfo_class_IntlBreakIterator_current
 
-#define arginfo_class_IntlBreakIterator_getErrorMessage arginfo_class_IntlBreakIterator_createCodePointInstance
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlBreakIterator_getErrorMessage, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlBreakIterator_getLocale, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlBreakIterator_getLocale, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlBreakIterator_getPartsIterator, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_IntlBreakIterator_getPartsIterator, 0, 0, IntlPartsIterator, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_STRING, 0, "IntlPartsIterator::KEY_SEQUENTIAL")
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlBreakIterator_getText arginfo_class_IntlBreakIterator_createCodePointInstance
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlBreakIterator_getText, 0, 0, IS_STRING, 1)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlBreakIterator_isBoundary arginfo_class_IntlBreakIterator_following
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlBreakIterator_isBoundary, 0, 1, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlBreakIterator_last arginfo_class_IntlBreakIterator_createCodePointInstance
+#define arginfo_class_IntlBreakIterator_last arginfo_class_IntlBreakIterator_current
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlBreakIterator_next, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlBreakIterator_next, 0, 0, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlBreakIterator_preceding arginfo_class_IntlBreakIterator_following
 
-#define arginfo_class_IntlBreakIterator_previous arginfo_class_IntlBreakIterator_createCodePointInstance
+#define arginfo_class_IntlBreakIterator_previous arginfo_class_IntlBreakIterator_current
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlBreakIterator_setText, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlBreakIterator_setText, 0, 1, _IS_BOOL, 1)
 	ZEND_ARG_TYPE_INFO(0, text, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
@@ -64,15 +70,17 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlRuleBasedBreakIterator___construct, 0,
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, compiled, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlRuleBasedBreakIterator_getBinaryRules arginfo_class_IntlBreakIterator_createCodePointInstance
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlRuleBasedBreakIterator_getBinaryRules, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlRuleBasedBreakIterator_getRules arginfo_class_IntlBreakIterator_createCodePointInstance
+#define arginfo_class_IntlRuleBasedBreakIterator_getRules arginfo_class_IntlRuleBasedBreakIterator_getBinaryRules
 
-#define arginfo_class_IntlRuleBasedBreakIterator_getRuleStatus arginfo_class_IntlBreakIterator_createCodePointInstance
+#define arginfo_class_IntlRuleBasedBreakIterator_getRuleStatus arginfo_class_IntlBreakIterator_current
 
-#define arginfo_class_IntlRuleBasedBreakIterator_getRuleStatusVec arginfo_class_IntlBreakIterator_createCodePointInstance
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlRuleBasedBreakIterator_getRuleStatusVec, 0, 0, MAY_BE_ARRAY|MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlCodePointBreakIterator_getLastCodePoint arginfo_class_IntlBreakIterator_createCodePointInstance
+#define arginfo_class_IntlCodePointBreakIterator_getLastCodePoint arginfo_class_IntlBreakIterator_current
 
 
 ZEND_METHOD(IntlBreakIterator, createCharacterInstance);
diff --git a/ext/intl/breakiterator/breakiterator_iterators.stub.php b/ext/intl/breakiterator/breakiterator_iterators.stub.php
index 9a82640c20e..bf4e42fe383 100644
--- a/ext/intl/breakiterator/breakiterator_iterators.stub.php
+++ b/ext/intl/breakiterator/breakiterator_iterators.stub.php
@@ -4,6 +4,6 @@
 
 class IntlPartsIterator extends IntlIterator
 {
-    /** @return IntlBreakIterator */
-    public function getBreakIterator() {}
+    /** @tentative-return-type */
+    public function getBreakIterator(): IntlBreakIterator {}
 }
diff --git a/ext/intl/breakiterator/breakiterator_iterators_arginfo.h b/ext/intl/breakiterator/breakiterator_iterators_arginfo.h
index 0b7279607cc..9b8503905c9 100644
--- a/ext/intl/breakiterator/breakiterator_iterators_arginfo.h
+++ b/ext/intl/breakiterator/breakiterator_iterators_arginfo.h
@@ -1,7 +1,7 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 5e165fe25d6d13824da9d7c5f0a089ee11626689 */
+ * Stub hash: e99b1e4a81bff12f44d22075d4b9f3f4627b1050 */
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlPartsIterator_getBreakIterator, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_IntlPartsIterator_getBreakIterator, 0, 0, IntlBreakIterator, 0)
 ZEND_END_ARG_INFO()
 
 
diff --git a/ext/intl/breakiterator/breakiterator_methods.cpp b/ext/intl/breakiterator/breakiterator_methods.cpp
index e814a04f8d7..5dfabc99c1e 100644
--- a/ext/intl/breakiterator/breakiterator_methods.cpp
+++ b/ext/intl/breakiterator/breakiterator_methods.cpp
@@ -63,7 +63,6 @@ static void _breakiter_factory(const char *func_name,
 
 	biter = func(Locale::createFromName(locale_str), status);
 	intl_error_set_code(NULL, status);
-	// Todo check if this can happen?
 	if (U_FAILURE(status)) {
 		spprintf(&msg, 0, "%s: error creating BreakIterator",
 				func_name);
diff --git a/ext/intl/calendar/calendar.stub.php b/ext/intl/calendar/calendar.stub.php
index 68a2050c3ad..c98433834f5 100644
--- a/ext/intl/calendar/calendar.stub.php
+++ b/ext/intl/calendar/calendar.stub.php
@@ -8,276 +8,275 @@ class IntlCalendar
 
     /**
      * @param IntlTimeZone|DateTimeZone|string|null $timezone
-     * @return IntlCalendar|null
+     * @tentative-return-type
      * @alias intlcal_create_instance
      */
-    public static function createInstance($timezone = null, ?string $locale = null) {}
+    public static function createInstance($timezone = null, ?string $locale = null): ?IntlCalendar {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias intlcal_equals
      */
-    public function equals(IntlCalendar $other) {}
+    public function equals(IntlCalendar $other): bool {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias intlcal_field_difference
      */
-    public function fieldDifference(float $timestamp, int $field) {}
+    public function fieldDifference(float $timestamp, int $field): int|false {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias intlcal_add
      */
-    public function add(int $field, int $value) {}
+    public function add(int $field, int $value): bool {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias intlcal_after
      */
-    public function after(IntlCalendar $other) {}
+    public function after(IntlCalendar $other): bool {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias intlcal_before
      */
-    public function before(IntlCalendar $other) {}
+    public function before(IntlCalendar $other): bool {}
 
     /**
      * @return bool
      * @alias intlcal_clear
      */
-    public function clear(?int $field = null) {}
+    public function clear(?int $field = null) {} // TODO make return type void
 
     /**
-     * @return IntlCalendar|null
+     * @tentative-return-type
      * @alias intlcal_from_date_time
      */
-    public static function fromDateTime(DateTime|string $datetime, ?string $locale = null) {}
+    public static function fromDateTime(DateTime|string $datetime, ?string $locale = null): ?IntlCalendar {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias intlcal_get
      */
-    public function get(int $field) {}
+    public function get(int $field): int|false {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias intlcal_get_actual_maximum
      */
-    public function getActualMaximum(int $field) {}
+    public function getActualMaximum(int $field): int|false {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias intlcal_get_actual_minimum
      */
-    public function getActualMinimum(int $field) {}
+    public function getActualMinimum(int $field): int|false {}
 
     /**
-     * @return array
+     * @tentative-return-type
      * @alias intlcal_get_available_locales
      */
-    public static function getAvailableLocales() {}
+    public static function getAvailableLocales(): array {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias intlcal_get_day_of_week_type
      */
-    public function getDayOfWeekType(int $dayOfWeek) {}
+    public function getDayOfWeekType(int $dayOfWeek): int|false {}
 
     /**
-     * @return int|false
+     * @tentative-return-type
      * @alias intlcal_get_error_code
      */
-    public function getErrorCode() {}
+    public function getErrorCode(): int|false {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias intlcal_get_error_message
      */
-    public function getErrorMessage() {}
+    public function getErrorMessage(): string|false {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias intlcal_get_first_day_of_week
      */
-    public function getFirstDayOfWeek() {}
+    public function getFirstDayOfWeek(): int|false {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias intlcal_get_greatest_minimum
      */
-    public function getGreatestMinimum(int $field) {}
+    public function getGreatestMinimum(int $field): int|false {}
 
     /**
-     * @return IntlIterator|false
+     * @tentative-return-type
      * @alias intlcal_get_keyword_values_for_locale
      */
-    public static function getKeywordValuesForLocale(string $keyword, string $locale, bool $onlyCommon) {}
+    public static function getKeywordValuesForLocale(string $keyword, string $locale, bool $onlyCommon): IntlIterator|false {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias intlcal_get_least_maximum
      */
-    public function getLeastMaximum(int $field) {}
+    public function getLeastMaximum(int $field): int|false {}
 
     /**
-     * @return string
+     * @tentative-return-type
      * @alias intlcal_get_locale
      */
-    public function getLocale(int $type) {}
+    public function getLocale(int $type): string|false {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias intlcal_get_maximum
      */
-    public function getMaximum(int $field) {}
+    public function getMaximum(int $field): int|false {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias intlcal_get_minimal_days_in_first_week
      */
-    public function getMinimalDaysInFirstWeek() {}
+    public function getMinimalDaysInFirstWeek(): int|false {}
 
     /**
      * @return bool
      * @alias intlcal_set_minimal_days_in_first_week
      */
-    public function setMinimalDaysInFirstWeek(int $days) {}
+    public function setMinimalDaysInFirstWeek(int $days) {} // TODO make return void
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias intlcal_get_minimum
      */
-    public function getMinimum(int $field) {}
+    public function getMinimum(int $field): int|false {}
 
     /**
-     * @return float
+     * @tentative-return-type
      * @alias intlcal_get_now
      */
-    public static function getNow() {}
+    public static function getNow(): float {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias intlcal_get_repeated_wall_time_option
      */
-    public function getRepeatedWallTimeOption() {}
+    public function getRepeatedWallTimeOption(): int {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias intlcal_get_skipped_wall_time_option
      */
-    public function getSkippedWallTimeOption() {}
+    public function getSkippedWallTimeOption(): int {}
 
     /**
-     * @return float
+     * @tentative-return-type
      * @alias intlcal_get_time
      */
-    public function getTime() {}
+    public function getTime(): float|false {}
 
     /**
-     * @return IntlTimeZone|false
+     * @tentative-return-type
      * @alias intlcal_get_time_zone
      */
-    public function getTimeZone() {}
+    public function getTimeZone(): IntlTimeZone|false {}
 
     /**
-     * @return string
+     * @tentative-return-type
      * @alias intlcal_get_type
      */
-    public function getType() {}
+    public function getType(): string {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias intlcal_get_weekend_transition
      */
-    public function getWeekendTransition(int $dayOfWeek) {}
+    public function getWeekendTransition(int $dayOfWeek): int|false {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias intlcal_in_daylight_time
      */
-    public function inDaylightTime() {}
+    public function inDaylightTime(): bool {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias intlcal_is_equivalent_to
      */
-    public function isEquivalentTo(IntlCalendar $other) {}
+    public function isEquivalentTo(IntlCalendar $other): bool {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias intlcal_is_lenient
      */
-    public function isLenient() {}
+    public function isLenient(): bool {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias intlcal_is_weekend
      */
-    public function isWeekend(?float $timestamp = null) {}
+    public function isWeekend(?float $timestamp = null): bool {}
 
     /**
      * @param int|bool $value
-     * @return bool
      * @alias intlcal_roll
      */
-    public function roll(int $field, $value) {}
+    public function roll(int $field, $value): bool {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias intlcal_is_set
      */
-    public function isSet(int $field) {}
+    public function isSet(int $field): bool {}
 
     /**
      * @return bool
      * @alias intlcal_set
      */
-    public function set(int $year, int $month, int $dayOfMonth = UNKNOWN, int $hour = UNKNOWN, int $minute = UNKNOWN, int $second = UNKNOWN) {}
+    public function set(int $year, int $month, int $dayOfMonth = UNKNOWN, int $hour = UNKNOWN, int $minute = UNKNOWN, int $second = UNKNOWN) {} // TODO make return type void
 
     /**
      * @return bool
      * @alias intlcal_set_first_day_of_week
      */
-    public function setFirstDayOfWeek(int $dayOfWeek) {}
+    public function setFirstDayOfWeek(int $dayOfWeek) {} // TODO make return type void
 
     /**
      * @return bool
      * @alias intlcal_set_lenient
      */
-    public function setLenient(bool $lenient) {}
+    public function setLenient(bool $lenient) {} // TODO make return type void
 
     /**
      * @return bool
      * @alias intlcal_set_repeated_wall_time_option
      */
-    public function setRepeatedWallTimeOption(int $option) {}
+    public function setRepeatedWallTimeOption(int $option) {} // TODO make return type void
 
     /**
      * @return bool
      * @alias intlcal_set_skipped_wall_time_option
      */
-    public function setSkippedWallTimeOption(int $option) {}
+    public function setSkippedWallTimeOption(int $option) {} // TODO make return type void
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias intlcal_set_time
      */
-    public function setTime(float $timestamp) {}
+    public function setTime(float $timestamp): bool {}
 
     /**
      * @param IntlTimeZone|DateTimeZone|string|null $timezone
-     * @return bool
+     * @tentative-return-type
      * @alias intlcal_set_time_zone
      */
-    public function setTimeZone($timezone) {}
+    public function setTimeZone($timezone): bool {}
 
     /**
-     * @return DateTime|false
+     * @tentative-return-type
      * @alias intlcal_to_date_time
      */
-    public function toDateTime() {}
+    public function toDateTime(): DateTime|false {}
 }
 
 class IntlGregorianCalendar extends IntlCalendar
@@ -293,20 +292,20 @@ class IntlGregorianCalendar extends IntlCalendar
     public function __construct($timezoneOrYear = UNKNOWN, $localeOrMonth = UNKNOWN, $day = UNKNOWN, $hour = UNKNOWN, $minute = UNKNOWN, $second = UNKNOWN) {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias intlgregcal_set_gregorian_change
      */
-    public function setGregorianChange(float $timestamp) {}
+    public function setGregorianChange(float $timestamp): bool {}
 
     /**
-     * @return float
+     * @tentative-return-type
      * @alias intlgregcal_get_gregorian_change
      */
-    public function getGregorianChange() {}
+    public function getGregorianChange(): float {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias intlgregcal_is_leap_year
      */
-    public function isLeapYear(int $year) {}
+    public function isLeapYear(int $year): bool {}
 }
diff --git a/ext/intl/calendar/calendar_arginfo.h b/ext/intl/calendar/calendar_arginfo.h
index 55a0d25f584..ac47ac3180e 100644
--- a/ext/intl/calendar/calendar_arginfo.h
+++ b/ext/intl/calendar/calendar_arginfo.h
@@ -1,24 +1,24 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: a0800bd27fe214cce7420e689e9d7b519a7b6835 */
+ * Stub hash: 1f47fca82af35929e8cbcb9b2b9979c4c03f658c */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_createInstance, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_IntlCalendar_createInstance, 0, 0, IntlCalendar, 1)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timezone, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_equals, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlCalendar_equals, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, other, IntlCalendar, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_fieldDifference, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlCalendar_fieldDifference, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, timestamp, IS_DOUBLE, 0)
 	ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_add, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlCalendar_add, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, value, IS_LONG, 0)
 ZEND_END_ARG_INFO()
@@ -31,12 +31,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_clear, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, field, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_fromDateTime, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_IntlCalendar_fromDateTime, 0, 1, IntlCalendar, 1)
 	ZEND_ARG_OBJ_TYPE_MASK(0, datetime, DateTime, MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_get, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlCalendar_get, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
@@ -44,21 +44,24 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlCalendar_getActualMinimum arginfo_class_IntlCalendar_get
 
-#define arginfo_class_IntlCalendar_getAvailableLocales arginfo_class_IntlCalendar___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlCalendar_getAvailableLocales, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_getDayOfWeekType, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlCalendar_getDayOfWeekType, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, dayOfWeek, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlCalendar_getErrorCode arginfo_class_IntlCalendar___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlCalendar_getErrorCode, 0, 0, MAY_BE_LONG|MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlCalendar_getErrorMessage arginfo_class_IntlCalendar___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlCalendar_getErrorMessage, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlCalendar_getFirstDayOfWeek arginfo_class_IntlCalendar___construct
+#define arginfo_class_IntlCalendar_getFirstDayOfWeek arginfo_class_IntlCalendar_getErrorCode
 
 #define arginfo_class_IntlCalendar_getGreatestMinimum arginfo_class_IntlCalendar_get
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_getKeywordValuesForLocale, 0, 0, 3)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_IntlCalendar_getKeywordValuesForLocale, 0, 3, IntlIterator, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, keyword, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, onlyCommon, _IS_BOOL, 0)
@@ -66,13 +69,13 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlCalendar_getLeastMaximum arginfo_class_IntlCalendar_get
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_getLocale, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlCalendar_getLocale, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlCalendar_getMaximum arginfo_class_IntlCalendar_get
 
-#define arginfo_class_IntlCalendar_getMinimalDaysInFirstWeek arginfo_class_IntlCalendar___construct
+#define arginfo_class_IntlCalendar_getMinimalDaysInFirstWeek arginfo_class_IntlCalendar_getErrorCode
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_setMinimalDaysInFirstWeek, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, days, IS_LONG, 0)
@@ -80,36 +83,44 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlCalendar_getMinimum arginfo_class_IntlCalendar_get
 
-#define arginfo_class_IntlCalendar_getNow arginfo_class_IntlCalendar___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlCalendar_getNow, 0, 0, IS_DOUBLE, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlCalendar_getRepeatedWallTimeOption arginfo_class_IntlCalendar___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlCalendar_getRepeatedWallTimeOption, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlCalendar_getSkippedWallTimeOption arginfo_class_IntlCalendar___construct
+#define arginfo_class_IntlCalendar_getSkippedWallTimeOption arginfo_class_IntlCalendar_getRepeatedWallTimeOption
 
-#define arginfo_class_IntlCalendar_getTime arginfo_class_IntlCalendar___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlCalendar_getTime, 0, 0, MAY_BE_DOUBLE|MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlCalendar_getTimeZone arginfo_class_IntlCalendar___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_IntlCalendar_getTimeZone, 0, 0, IntlTimeZone, MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlCalendar_getType arginfo_class_IntlCalendar___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlCalendar_getType, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlCalendar_getWeekendTransition arginfo_class_IntlCalendar_getDayOfWeekType
 
-#define arginfo_class_IntlCalendar_inDaylightTime arginfo_class_IntlCalendar___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlCalendar_inDaylightTime, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlCalendar_isEquivalentTo arginfo_class_IntlCalendar_equals
 
-#define arginfo_class_IntlCalendar_isLenient arginfo_class_IntlCalendar___construct
+#define arginfo_class_IntlCalendar_isLenient arginfo_class_IntlCalendar_inDaylightTime
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_isWeekend, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlCalendar_isWeekend, 0, 0, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timestamp, IS_DOUBLE, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_roll, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_IntlCalendar_roll, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0)
 	ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlCalendar_isSet arginfo_class_IntlCalendar_get
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlCalendar_isSet, 0, 1, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_set, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, year, IS_LONG, 0)
@@ -120,7 +131,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_set, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, second, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlCalendar_setFirstDayOfWeek arginfo_class_IntlCalendar_getDayOfWeekType
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_setFirstDayOfWeek, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, dayOfWeek, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_setLenient, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, lenient, _IS_BOOL, 0)
@@ -132,15 +145,16 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlCalendar_setSkippedWallTimeOption arginfo_class_IntlCalendar_setRepeatedWallTimeOption
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_setTime, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlCalendar_setTime, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, timestamp, IS_DOUBLE, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_setTimeZone, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlCalendar_setTimeZone, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, timezone)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlCalendar_toDateTime arginfo_class_IntlCalendar___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_IntlCalendar_toDateTime, 0, 0, DateTime, MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlGregorianCalendar___construct, 0, 0, 0)
 	ZEND_ARG_INFO(0, timezoneOrYear)
@@ -153,9 +167,9 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlGregorianCalendar_setGregorianChange arginfo_class_IntlCalendar_setTime
 
-#define arginfo_class_IntlGregorianCalendar_getGregorianChange arginfo_class_IntlCalendar___construct
+#define arginfo_class_IntlGregorianCalendar_getGregorianChange arginfo_class_IntlCalendar_getNow
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlGregorianCalendar_isLeapYear, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlGregorianCalendar_isLeapYear, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, year, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
diff --git a/ext/intl/calendar/calendar_methods.cpp b/ext/intl/calendar/calendar_methods.cpp
index a90d8bd85ef..e846f416bd8 100644
--- a/ext/intl/calendar/calendar_methods.cpp
+++ b/ext/intl/calendar/calendar_methods.cpp
@@ -405,7 +405,6 @@ U_CFUNC PHP_FUNCTION(intlcal_set)
 		co->ucal->set((int32_t)args[0], (int32_t)args[1], (int32_t)args[2], (int32_t)args[3], (int32_t)args[4], (int32_t)args[5]);
 	}
 
-	// TODO Make void?
 	RETURN_TRUE;
 }
 
@@ -614,7 +613,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_minimal_days_in_first_week)
 
 	uint8_t result = co->ucal->getMinimalDaysInFirstWeek();
 	INTL_METHOD_CHECK_STATUS(co,
-		"intlcal_get_first_day_of_week: Call to ICU method has failed");
+		"intlcal_get_first_day_of_week: Call to ICU method has failed"); /* TODO Is it really a failure? */
 
 	RETURN_LONG((zend_long)result);
 }
@@ -910,7 +909,6 @@ U_CFUNC PHP_FUNCTION(intlcal_set_repeated_wall_time_option)
 
 	co->ucal->setRepeatedWallTimeOption((UCalendarWallTimeOption)option);
 
-	// TODO Return void?
 	RETURN_TRUE;
 }
 
@@ -935,7 +933,6 @@ U_CFUNC PHP_FUNCTION(intlcal_set_skipped_wall_time_option)
 
 	co->ucal->setSkippedWallTimeOption((UCalendarWallTimeOption)option);
 
-	// TODO Return void?
 	RETURN_TRUE;
 }
 
diff --git a/ext/intl/collator/collator.stub.php b/ext/intl/collator/collator.stub.php
index 7a987a25aba..e0c8487af79 100644
--- a/ext/intl/collator/collator.stub.php
+++ b/ext/intl/collator/collator.stub.php
@@ -7,80 +7,80 @@ class Collator
     public function __construct(string $locale) {}
 
     /**
-     * @return Collator|null
+     * @tentative-return-type
      * @alias collator_create
      */
-    public static function create(string $locale) {}
+    public static function create(string $locale): ?Collator {}
 
     /**
-     * @return int|false
+     * @tentative-return-type
      * @alias collator_compare
      */
-    public function compare(string $string1, string $string2) {}
+    public function compare(string $string1, string $string2): int|false {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias collator_sort
      */
-    public function sort(array &$array, int $flags = Collator::SORT_REGULAR) {}
+    public function sort(array &$array, int $flags = Collator::SORT_REGULAR): bool {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias collator_sort_with_sort_keys
      */
-    public function sortWithSortKeys(array &$array) {}
+    public function sortWithSortKeys(array &$array): bool {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias collator_asort
      */
-    public function asort(array &$array, int $flags = Collator::SORT_REGULAR) {}
+    public function asort(array &$array, int $flags = Collator::SORT_REGULAR): bool {}
 
     /**
-     * @return int|false
+     * @tentative-return-type
      * @alias collator_get_attribute
      */
-    public function getAttribute(int $attribute) {}
+    public function getAttribute(int $attribute): int|false {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias collator_set_attribute
      */
-    public function setAttribute(int $attribute, int $value) {}
+    public function setAttribute(int $attribute, int $value): bool {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias collator_get_strength
      */
-    public function getStrength() {}
+    public function getStrength(): int {}
 
     /**
      * @return bool
      * @alias collator_set_strength
      */
-    public function setStrength(int $strength) {}
+    public function setStrength(int $strength) {} // TODO make return type void
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias collator_get_locale
      */
-    public function getLocale(int $type) {}
+    public function getLocale(int $type): string|false {}
 
     /**
-     * @return int|false
+     * @tentative-return-type
      * @alias collator_get_error_code
      */
-    public function getErrorCode() {}
+    public function getErrorCode(): int|false {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias collator_get_error_message
      */
-    public function getErrorMessage() {}
+    public function getErrorMessage(): string|false {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias collator_get_sort_key
      */
-    public function getSortKey(string $string) {}
+    public function getSortKey(string $string): string|false {}
 }
diff --git a/ext/intl/collator/collator_arginfo.h b/ext/intl/collator/collator_arginfo.h
index 480541ee1c2..f13e1197dd8 100644
--- a/ext/intl/collator/collator_arginfo.h
+++ b/ext/intl/collator/collator_arginfo.h
@@ -1,53 +1,57 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 9907156bf1d28af7bf6a1858dffc58994c12756f */
+ * Stub hash: 4baf9586ab91f37facc865cf1b3aa6a87e5d732d */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_Collator_create arginfo_class_Collator___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_Collator_create, 0, 1, Collator, 1)
+	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator_compare, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_Collator_compare, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, string1, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, string2, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator_sort, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Collator_sort, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(1, array, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "Collator::SORT_REGULAR")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator_sortWithSortKeys, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Collator_sortWithSortKeys, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(1, array, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_Collator_asort arginfo_class_Collator_sort
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator_getAttribute, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_Collator_getAttribute, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator_setAttribute, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Collator_setAttribute, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, value, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator_getStrength, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Collator_getStrength, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator_setStrength, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, strength, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator_getLocale, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_Collator_getLocale, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_Collator_getErrorCode arginfo_class_Collator_getStrength
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_Collator_getErrorCode, 0, 0, MAY_BE_LONG|MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_Collator_getErrorMessage arginfo_class_Collator_getStrength
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_Collator_getErrorMessage, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Collator_getSortKey, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_Collator_getSortKey, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
diff --git a/ext/intl/common/common.stub.php b/ext/intl/common/common.stub.php
index dc93c1f35d7..0e87db6f519 100644
--- a/ext/intl/common/common.stub.php
+++ b/ext/intl/common/common.stub.php
@@ -4,18 +4,18 @@
 
 class IntlIterator implements Iterator
 {
-    /** @return mixed */
-    public function current() {}
+    /** @tentative-return-type */
+    public function current(): mixed {}
 
-    /** @return mixed */
-    public function key() {}
+    /** @tentative-return-type */
+    public function key(): mixed {}
 
-    /** @return void */
-    public function next() {}
+    /** @tentative-return-type */
+    public function next(): void {}
 
-    /** @return void */
-    public function rewind() {}
+    /** @tentative-return-type */
+    public function rewind(): void {}
 
-    /** @return bool */
-    public function valid() {}
+    /** @tentative-return-type */
+    public function valid(): bool {}
 }
diff --git a/ext/intl/common/common_arginfo.h b/ext/intl/common/common_arginfo.h
index 5a4bc9055b3..79d63aa5f4f 100644
--- a/ext/intl/common/common_arginfo.h
+++ b/ext/intl/common/common_arginfo.h
@@ -1,16 +1,18 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: fb470896fab2e63e898a5d49ff8d7f59257be9e3 */
+ * Stub hash: c4698dbe96a069a63265052e9a105f074e3dda0a */
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlIterator_current, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlIterator_current, 0, 0, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlIterator_key arginfo_class_IntlIterator_current
 
-#define arginfo_class_IntlIterator_next arginfo_class_IntlIterator_current
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlIterator_next, 0, 0, IS_VOID, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlIterator_rewind arginfo_class_IntlIterator_current
+#define arginfo_class_IntlIterator_rewind arginfo_class_IntlIterator_next
 
-#define arginfo_class_IntlIterator_valid arginfo_class_IntlIterator_current
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlIterator_valid, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
 
 
 ZEND_METHOD(IntlIterator, current);
diff --git a/ext/intl/converter/converter.stub.php b/ext/intl/converter/converter.stub.php
index 7d60181355a..7e2b207e44e 100644
--- a/ext/intl/converter/converter.stub.php
+++ b/ext/intl/converter/converter.stub.php
@@ -6,63 +6,63 @@ class UConverter
 {
     public function __construct(?string $destination_encoding = null, ?string $source_encoding = null) {}
 
-    /** @return string|false */
-    public function convert(string $str, bool $reverse = false) {}
+    /** @tentative-return-type */
+    public function convert(string $str, bool $reverse = false): string|false {}
 
     /**
      * @param int $error
-     * @return string|int|array|null
+     * @tentative-return-type
      */
-    public function fromUCallback(int $reason, array $source, int $codePoint, &$error) {}
+    public function fromUCallback(int $reason, array $source, int $codePoint, &$error): string|int|array|null {}
 
-    /** @return array|false|null */
-    public static function getAliases(string $name) {}
+    /** @tentative-return-type */
+    public static function getAliases(string $name): array|false|null {}
 
-    /** @return array */
-    public static function getAvailable() {}
+    /** @tentative-return-type */
+    public static function getAvailable(): array {}
 
-    /** @return string|false|null */
-    public function getDestinationEncoding() {}
+    /** @tentative-return-type */
+    public function getDestinationEncoding(): string|false|null {}
 
-    /** @return int|false|null */
-    public function getDestinationType() {}
+    /** @tentative-return-type */
+    public function getDestinationType(): int|false|null {}
 
-    /** @return int */
-    public function getErrorCode() {}
+    /** @tentative-return-type */
+    public function getErrorCode(): int {}
 
-    /** @return string|null */
-    public function getErrorMessage() {}
+    /** @tentative-return-type */
+    public function getErrorMessage(): ?string {}
 
-    /** @return string|false|null */
-    public function getSourceEncoding() {}
+    /** @tentative-return-type */
+    public function getSourceEncoding(): string|false|null {}
 
-    /** @return int|false|null */
-    public function getSourceType() {}
+    /** @tentative-return-type */
+    public function getSourceType(): int|false|null {}
 
-    /** @return array|null */
-    public static function getStandards() {}
+    /** @tentative-return-type */
+    public static function getStandards(): ?array {}
 
-    /** @return string|false|null */
-    public function getSubstChars() {}
+    /** @tentative-return-type */
+    public function getSubstChars(): string|false|null {}
 
-    /** @return string */
-    public static function reasonText(int $reason) {}
+    /** @tentative-return-type */
+    public static function reasonText(int $reason): string {}
 
-    /** @return bool */
-    public function setDestinationEncoding(string $encoding) {}
+    /** @tentative-return-type */
+    public function setDestinationEncoding(string $encoding): bool {}
 
-    /** @return bool */
-    public function setSourceEncoding(string $encoding) {}
+    /** @tentative-return-type */
+    public function setSourceEncoding(string $encoding): bool {}
 
-    /** @return bool */
-    public function setSubstChars(string $chars) {}
+    /** @tentative-return-type */
+    public function setSubstChars(string $chars): bool {}
 
     /**
      * @param int $error
-     * @return string|int|array|null
+     * @tentative-return-type
      */
-    public function toUCallback(int $reason, string $source, string $codeUnits, &$error) {}
+    public function toUCallback(int $reason, string $source, string $codeUnits, &$error): string|int|array|null {}
 
-    /** @return string|false */
-    public static function transcode(string $str, string $toEncoding, string $fromEncoding, ?array $options = null) {}
+    /** @tentative-return-type */
+    public static function transcode(string $str, string $toEncoding, string $fromEncoding, ?array $options = null): string|false {}
 }
diff --git a/ext/intl/converter/converter_arginfo.h b/ext/intl/converter/converter_arginfo.h
index 2c2bbf2465d..663c68271a5 100644
--- a/ext/intl/converter/converter_arginfo.h
+++ b/ext/intl/converter/converter_arginfo.h
@@ -1,68 +1,73 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: ede345fc0cbc16ca968535b96a93c0479451764e */
+ * Stub hash: a6b352ba1b6ad2367bd4705ac941e763f74c8fac */
 
 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")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, source_encoding, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_UConverter_convert, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_UConverter_convert, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, reverse, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_UConverter_fromUCallback, 0, 0, 4)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_UConverter_fromUCallback, 0, 4, MAY_BE_STRING|MAY_BE_LONG|MAY_BE_ARRAY|MAY_BE_NULL)
 	ZEND_ARG_TYPE_INFO(0, reason, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, source, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, codePoint, IS_LONG, 0)
 	ZEND_ARG_INFO(1, error)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_UConverter_getAliases, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_UConverter_getAliases, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE|MAY_BE_NULL)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_UConverter_getAvailable, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_UConverter_getAvailable, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_UConverter_getDestinationEncoding arginfo_class_UConverter_getAvailable
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_UConverter_getDestinationEncoding, 0, 0, MAY_BE_STRING|MAY_BE_FALSE|MAY_BE_NULL)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_UConverter_getDestinationType arginfo_class_UConverter_getAvailable
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_UConverter_getDestinationType, 0, 0, MAY_BE_LONG|MAY_BE_FALSE|MAY_BE_NULL)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_UConverter_getErrorCode arginfo_class_UConverter_getAvailable
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_UConverter_getErrorCode, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_UConverter_getErrorMessage arginfo_class_UConverter_getAvailable
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_UConverter_getErrorMessage, 0, 0, IS_STRING, 1)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_UConverter_getSourceEncoding arginfo_class_UConverter_getAvailable
+#define arginfo_class_UConverter_getSourceEncoding arginfo_class_UConverter_getDestinationEncoding
 
-#define arginfo_class_UConverter_getSourceType arginfo_class_UConverter_getAvailable
+#define arginfo_class_UConverter_getSourceType arginfo_class_UConverter_getDestinationType
 
-#define arginfo_class_UConverter_getStandards arginfo_class_UConverter_getAvailable
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_UConverter_getStandards, 0, 0, IS_ARRAY, 1)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_UConverter_getSubstChars arginfo_class_UConverter_getAvailable
+#define arginfo_class_UConverter_getSubstChars arginfo_class_UConverter_getDestinationEncoding
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_UConverter_reasonText, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_UConverter_reasonText, 0, 1, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, reason, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_UConverter_setDestinationEncoding, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_UConverter_setDestinationEncoding, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_UConverter_setSourceEncoding arginfo_class_UConverter_setDestinationEncoding
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_UConverter_setSubstChars, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_UConverter_setSubstChars, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, chars, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_UConverter_toUCallback, 0, 0, 4)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_UConverter_toUCallback, 0, 4, MAY_BE_STRING|MAY_BE_LONG|MAY_BE_ARRAY|MAY_BE_NULL)
 	ZEND_ARG_TYPE_INFO(0, reason, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, source, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, codeUnits, IS_STRING, 0)
 	ZEND_ARG_INFO(1, error)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_UConverter_transcode, 0, 0, 3)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_UConverter_transcode, 0, 3, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, toEncoding, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, fromEncoding, IS_STRING, 0)
diff --git a/ext/intl/dateformat/dateformat.stub.php b/ext/intl/dateformat/dateformat.stub.php
index fc866eef8f8..e00e654b131 100644
--- a/ext/intl/dateformat/dateformat.stub.php
+++ b/ext/intl/dateformat/dateformat.stub.php
@@ -19,7 +19,7 @@ class IntlDateFormatter
 
     /**
      * @param IntlTimeZone|DateTimeZone|string|null $timezone
-     * @return IntlDateFormatter|null
+     * @tentative-return-type
      * @alias datefmt_create
      */
     public static function create(
@@ -29,125 +29,125 @@ class IntlDateFormatter
         $timezone = null,
         IntlCalendar|int|null $calendar = null,
         ?string $pattern = null
-    ) {}
+    ): ?IntlDateFormatter {}
 
     /**
-     * @return int|false
+     * @tentative-return-type
      * @alias datefmt_get_datetype
      */
-    public function getDateType() {}
+    public function getDateType(): int|false {}
 
     /**
-     * @return int|false
+     * @tentative-return-type
      * @alias datefmt_get_timetype
      */
-    public function getTimeType() {}
+    public function getTimeType(): int|false {}
 
     /**
-     * @return int|false
+     * @tentative-return-type
      * @alias datefmt_get_calendar
      */
-    public function getCalendar() {}
+    public function getCalendar(): int|false {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias datefmt_set_calendar
      */
-    public function setCalendar(IntlCalendar|int|null $calendar) {}
+    public function setCalendar(IntlCalendar|int|null $calendar): bool {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias datefmt_get_timezone_id
      */
-    public function getTimeZoneId() {}
+    public function getTimeZoneId(): string|false {}
 
     /**
-     * @return IntlCalendar|false|null
+     * @tentative-return-type
      * @alias datefmt_get_calendar_object
      */
-    public function getCalendarObject() {}
+    public function getCalendarObject(): IntlCalendar|false|null {}
 
     /**
-     * @return IntlTimeZone|false
+     * @tentative-return-type
      * @alias datefmt_get_timezone
      */
-    public function getTimeZone() {}
+    public function getTimeZone(): IntlTimeZone|false {}
 
     /**
      * @param IntlTimeZone|DateTimeZone|string|null $timezone
-     * @return bool|null
+     * @tentative-return-type
      * @alias datefmt_set_timezone
      */
-    public function setTimeZone($timezone) {}
+    public function setTimeZone($timezone): ?bool {} // TODO return true on success
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias datefmt_set_pattern
      */
-    public function setPattern(string $pattern) {}
+    public function setPattern(string $pattern): bool {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias datefmt_get_pattern
      */
-    public function getPattern() {}
+    public function getPattern(): string|false {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias datefmt_get_locale
      */
-    public function getLocale(int $type = ULOC_ACTUAL_LOCALE) {}
+    public function getLocale(int $type = ULOC_ACTUAL_LOCALE): string|false {}
 
     /**
-     * @return void
+     * @tentative-return-type
      * @alias datefmt_set_lenient
      */
-    public function setLenient(bool $lenient) {}
+    public function setLenient(bool $lenient): void {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias datefmt_is_lenient
      */
-    public function isLenient() {}
+    public function isLenient(): bool {}
 
     /**
      * @param IntlCalendar|DateTimeInterface|array|string|int|float $datetime
-     * @return string|false
+     * @tentative-return-type
      * @alias datefmt_format
      */
-    public function format($datetime) {}
+    public function format($datetime): string|false {}
 
     /**
      * @param IntlCalendar|DateTime $datetime
      * @param array|int|string|null $format
-     * @return string|false
+     * @tentative-return-type
      * @alias datefmt_format_object
      */
-    public static function formatObject($datetime, $format = null, ?string $locale = null) {}
+    public static function formatObject($datetime, $format = null, ?string $locale = null): string|false {}
 
     /**
      * @param int $offset
-     * @return int|float|false
+     * @tentative-return-type
      * @alias datefmt_parse
      */
-    public function parse(string $string, &$offset = null) {}
+    public function parse(string $string, &$offset = null): int|float|false {}
 
     /**
      * @param int $offset
-     * @return array|false
+     * @tentative-return-type
      * @alias datefmt_localtime
      */
-    public function localtime(string $string, &$offset = null) {}
+    public function localtime(string $string, &$offset = null): array|false {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias datefmt_get_error_code
      */
-    public function getErrorCode() {}
+    public function getErrorCode(): int {}
 
     /**
-     * @return string
+     * @tentative-return-type
      * @alias datefmt_get_error_message
      */
-    public function getErrorMessage() {}
+    public function getErrorMessage(): string {}
 }
diff --git a/ext/intl/dateformat/dateformat_arginfo.h b/ext/intl/dateformat/dateformat_arginfo.h
index 308d9d6ae8f..2ec4da71d29 100644
--- a/ext/intl/dateformat/dateformat_arginfo.h
+++ b/ext/intl/dateformat/dateformat_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 5fd68ae153d18374d33a5c3848a88abc1ab67d38 */
+ * Stub hash: 767e5d064aef6d68f860a79c721eb728436c4eb9 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)
@@ -10,7 +10,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pattern, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_create, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_IntlDateFormatter_create, 0, 1, IntlDateFormatter, 1)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dateType, IS_LONG, 0, "IntlDateFormatter::FULL")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timeType, IS_LONG, 0, "IntlDateFormatter::FULL")
@@ -19,63 +19,72 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_create, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pattern, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_getDateType, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlDateFormatter_getDateType, 0, 0, MAY_BE_LONG|MAY_BE_FALSE)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlDateFormatter_getTimeType arginfo_class_IntlDateFormatter_getDateType
 
 #define arginfo_class_IntlDateFormatter_getCalendar arginfo_class_IntlDateFormatter_getDateType
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_setCalendar, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlDateFormatter_setCalendar, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_TYPE_MASK(0, calendar, IntlCalendar, MAY_BE_LONG|MAY_BE_NULL, NULL)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlDateFormatter_getTimeZoneId arginfo_class_IntlDateFormatter_getDateType
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlDateFormatter_getTimeZoneId, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlDateFormatter_getCalendarObject arginfo_class_IntlDateFormatter_getDateType
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_IntlDateFormatter_getCalendarObject, 0, 0, IntlCalendar, MAY_BE_FALSE|MAY_BE_NULL)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlDateFormatter_getTimeZone arginfo_class_IntlDateFormatter_getDateType
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_IntlDateFormatter_getTimeZone, 0, 0, IntlTimeZone, MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_setTimeZone, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlDateFormatter_setTimeZone, 0, 1, _IS_BOOL, 1)
 	ZEND_ARG_INFO(0, timezone)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_setPattern, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlDateFormatter_setPattern, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlDateFormatter_getPattern arginfo_class_IntlDateFormatter_getDateType
+#define arginfo_class_IntlDateFormatter_getPattern arginfo_class_IntlDateFormatter_getTimeZoneId
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_getLocale, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlDateFormatter_getLocale, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "ULOC_ACTUAL_LOCALE")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_setLenient, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlDateFormatter_setLenient, 0, 1, IS_VOID, 0)
 	ZEND_ARG_TYPE_INFO(0, lenient, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlDateFormatter_isLenient arginfo_class_IntlDateFormatter_getDateType
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlDateFormatter_isLenient, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_format, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlDateFormatter_format, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, datetime)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_formatObject, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlDateFormatter_formatObject, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, datetime)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, format, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlDateFormatter_parse, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlDateFormatter_parse, 0, 1, MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, offset, "null")
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlDateFormatter_localtime arginfo_class_IntlDateFormatter_parse
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlDateFormatter_localtime, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
+	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, offset, "null")
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlDateFormatter_getErrorCode arginfo_class_IntlDateFormatter_getDateType
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlDateFormatter_getErrorCode, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlDateFormatter_getErrorMessage arginfo_class_IntlDateFormatter_getDateType
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlDateFormatter_getErrorMessage, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
 
 ZEND_METHOD(IntlDateFormatter, __construct);
diff --git a/ext/intl/formatter/formatter.stub.php b/ext/intl/formatter/formatter.stub.php
index a16ad53518b..4177778e74d 100644
--- a/ext/intl/formatter/formatter.stub.php
+++ b/ext/intl/formatter/formatter.stub.php
@@ -7,101 +7,101 @@ class NumberFormatter
     public function __construct(string $locale, int $style, ?string $pattern = null) {}
 
     /**
-     * @return NumberFormatter|null
+     * @tentative-return-type
      * @alias numfmt_create
      */
-    public static function create(string $locale, int $style, ?string $pattern = null) {}
+    public static function create(string $locale, int $style, ?string $pattern = null): ?NumberFormatter {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias numfmt_format
      */
-    public function format(int|float $num, int $type = NumberFormatter::TYPE_DEFAULT) {}
+    public function format(int|float $num, int $type = NumberFormatter::TYPE_DEFAULT): string|false {}
 
     /**
      * @param int $offset
-     * @return int|float|false
+     * @tentative-return-type
      * @alias numfmt_parse
      */
-    public function parse(string $string, int $type = NumberFormatter::TYPE_DOUBLE, &$offset = null) {}
+    public function parse(string $string, int $type = NumberFormatter::TYPE_DOUBLE, &$offset = null): int|float|false {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias numfmt_format_currency
      */
-    public function formatCurrency(float $amount, string $currency) {}
+    public function formatCurrency(float $amount, string $currency): string|false {}
 
     /**
      * @param string $currency
      * @param int $offset
-     * @return float|false
+     * @tentative-return-type
      * @alias numfmt_parse_currency
      */
-    public function parseCurrency(string $string, &$currency, &$offset = null) {}
+    public function parseCurrency(string $string, &$currency, &$offset = null): float|false {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias numfmt_set_attribute
      */
-    public function setAttribute(int $attribute, int|float $value) {}
+    public function setAttribute(int $attribute, int|float $value): bool {}
 
     /**
-     * @return int|float|false
+     * @tentative-return-type
      * @alias numfmt_get_attribute
      */
-    public function getAttribute(int $attribute) {}
+    public function getAttribute(int $attribute): int|float|false {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias numfmt_set_text_attribute
      */
-    public function setTextAttribute(int $attribute, string $value) {}
+    public function setTextAttribute(int $attribute, string $value): bool {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias numfmt_get_text_attribute
      */
-    public function getTextAttribute(int $attribute) {}
+    public function getTextAttribute(int $attribute): string|false {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias numfmt_set_symbol
      */
-    public function setSymbol(int $symbol, string $value) {}
+    public function setSymbol(int $symbol, string $value): bool {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias numfmt_get_symbol
      */
-    public function getSymbol(int $symbol) {}
+    public function getSymbol(int $symbol): string|false {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias numfmt_set_pattern
      */
-    public function setPattern(string $pattern) {}
+    public function setPattern(string $pattern): bool {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias numfmt_get_pattern
      */
-    public function getPattern() {}
+    public function getPattern(): string|false {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias numfmt_get_locale
      */
-    public function getLocale(int $type = ULOC_ACTUAL_LOCALE) {}
+    public function getLocale(int $type = ULOC_ACTUAL_LOCALE): string|false {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias numfmt_get_error_code
      */
-    public function getErrorCode() {}
+    public function getErrorCode(): int {}
 
     /**
-     * @return string
+     * @tentative-return-type
      * @alias numfmt_get_error_message
      */
-    public function getErrorMessage() {}
+    public function getErrorMessage(): string {}
 }
diff --git a/ext/intl/formatter/formatter_arginfo.h b/ext/intl/formatter/formatter_arginfo.h
index c06fd4d231f..6aa76da370a 100644
--- a/ext/intl/formatter/formatter_arginfo.h
+++ b/ext/intl/formatter/formatter_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 4fa61766d54f40d3295da0992b16e08ede9aaab1 */
+ * Stub hash: 2e206724ce3c387109b39bcac20af1c35ea7fba2 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter___construct, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
@@ -7,69 +7,77 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter___construct, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pattern, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_NumberFormatter_create arginfo_class_NumberFormatter___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_NumberFormatter_create, 0, 2, NumberFormatter, 1)
+	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, style, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pattern, IS_STRING, 1, "null")
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_format, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_NumberFormatter_format, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_MASK(0, num, MAY_BE_LONG|MAY_BE_DOUBLE, NULL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "NumberFormatter::TYPE_DEFAULT")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_parse, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_NumberFormatter_parse, 0, 1, MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "NumberFormatter::TYPE_DOUBLE")
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, offset, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_formatCurrency, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_NumberFormatter_formatCurrency, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, amount, IS_DOUBLE, 0)
 	ZEND_ARG_TYPE_INFO(0, currency, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_parseCurrency, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_NumberFormatter_parseCurrency, 0, 2, MAY_BE_DOUBLE|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_INFO(1, currency)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, offset, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_setAttribute, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_NumberFormatter_setAttribute, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
 	ZEND_ARG_TYPE_MASK(0, value, MAY_BE_LONG|MAY_BE_DOUBLE, NULL)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_getAttribute, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_NumberFormatter_getAttribute, 0, 1, MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_setTextAttribute, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_NumberFormatter_setTextAttribute, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_NumberFormatter_getTextAttribute arginfo_class_NumberFormatter_getAttribute
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_NumberFormatter_getTextAttribute, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
+	ZEND_ARG_TYPE_INFO(0, attribute, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_setSymbol, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_NumberFormatter_setSymbol, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, symbol, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_getSymbol, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_NumberFormatter_getSymbol, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, symbol, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_setPattern, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_NumberFormatter_setPattern, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_getPattern, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_NumberFormatter_getPattern, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_NumberFormatter_getLocale, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_NumberFormatter_getLocale, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "ULOC_ACTUAL_LOCALE")
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_NumberFormatter_getErrorCode arginfo_class_NumberFormatter_getPattern
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_NumberFormatter_getErrorCode, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_NumberFormatter_getErrorMessage arginfo_class_NumberFormatter_getPattern
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_NumberFormatter_getErrorMessage, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
 
 ZEND_METHOD(NumberFormatter, __construct);
diff --git a/ext/intl/locale/locale.stub.php b/ext/intl/locale/locale.stub.php
index f20d2d3d97a..144cdbc12e0 100644
--- a/ext/intl/locale/locale.stub.php
+++ b/ext/intl/locale/locale.stub.php
@@ -5,110 +5,110 @@
 class Locale
 {
     /**
-     * @return string
+     * @tentative-return-type
      * @alias locale_get_default
      */
-    public static function getDefault() {}
+    public static function getDefault(): string {}
 
     /**
      * @return bool
      * @alias locale_set_default
      */
-    public static function setDefault(string $locale) {}
+    public static function setDefault(string $locale) {} // TODO make return type void
 
     /**
-     * @return string|null
+     * @tentative-return-type
      * @alias locale_get_primary_language
      */
-    public static function getPrimaryLanguage(string $locale) {}
+    public static function getPrimaryLanguage(string $locale): ?string{}
 
     /**
-     * @return string|null
+     * @tentative-return-type
      * @alias locale_get_script
      */
-    public static function getScript(string $locale) {}
+    public static function getScript(string $locale): ?string {}
 
     /**
-     * @return string|null
+     * @tentative-return-type
      * @alias locale_get_region
      */
-    public static function getRegion(string $locale) {}
+    public static function getRegion(string $locale): ?string {}
 
     /**
-     * @return array|false|null
+     * @tentative-return-type
      * @alias locale_get_keywords
      */
-    public static function getKeywords(string $locale) {}
+    public static function getKeywords(string $locale): array|false|null {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias locale_get_display_script
      */
-    public static function getDisplayScript(string $locale, ?string $displayLocale = null) {}
+    public static function getDisplayScript(string $locale, ?string $displayLocale = null): string|false {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias locale_get_display_region
      */
-    public static function getDisplayRegion(string $locale, ?string $displayLocale = null) {}
+    public static function getDisplayRegion(string $locale, ?string $displayLocale = null): string|false {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias locale_get_display_name
      */
-    public static function getDisplayName(string $locale, ?string $displayLocale = null) {}
+    public static function getDisplayName(string $locale, ?string $displayLocale = null): string|false {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias locale_get_display_language
      */
-    public static function getDisplayLanguage(string $locale, ?string $displayLocale = null) {}
+    public static function getDisplayLanguage(string $locale, ?string $displayLocale = null): string|false {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias locale_get_display_variant
      */
-    public static function getDisplayVariant(string $locale, ?string $displayLocale = null) {}
+    public static function getDisplayVariant(string $locale, ?string $displayLocale = null): string|false {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias locale_compose
      */
-    public static function composeLocale(array $subtags) {}
+    public static function composeLocale(array $subtags): string|false {}
 
     /**
-     * @return array|null
+     * @tentative-return-type
      * @alias locale_parse
      */
-    public static function parseLocale(string $locale) {}
+    public static function parseLocale(string $locale): ?array {}
 
     /**
-     * @return array|null
+     * @tentative-return-type
      * @alias locale_get_all_variants
      */
-    public static function getAllVariants(string $locale) {}
+    public static function getAllVariants(string $locale): ?array {}
 
     /**
-     * @return bool|null
+     * @tentative-return-type
      * @alias locale_filter_matches
      */
-    public static function filterMatches(string $languageTag, string $locale, bool $canonicalize = false) {}
+    public static function filterMatches(string $languageTag, string $locale, bool $canonicalize = false): ?bool {}
 
     /**
-     * @return string|null
+     * @tentative-return-type
      * @alias locale_lookup
      */
-    public static function lookup(array $languageTag, string $locale, bool $canonicalize = false, ?string $defaultLocale = null) {}
+    public static function lookup(array $languageTag, string $locale, bool $canonicalize = false, ?string $defaultLocale = null): ?string {}
 
     /**
-     * @return string|null
+     * @tentative-return-type
      * @alias locale_canonicalize
      */
-    public static function canonicalize(string $locale) {}
+    public static function canonicalize(string $locale): ?string {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias locale_accept_from_http
      */
-    public static function acceptFromHttp(string $header) {}
+    public static function acceptFromHttp(string $header): string|false {}
 }
diff --git a/ext/intl/locale/locale_arginfo.h b/ext/intl/locale/locale_arginfo.h
index cf61cfa9d12..57544eba306 100644
--- a/ext/intl/locale/locale_arginfo.h
+++ b/ext/intl/locale/locale_arginfo.h
@@ -1,22 +1,26 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 6b873a68045fb5cf75e23991a3c77aa01a8893ee */
+ * Stub hash: a0c2cf74b0d2e8309f0cd39fd9969d14586d0988 */
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Locale_getDefault, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Locale_getDefault, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Locale_setDefault, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_Locale_getPrimaryLanguage arginfo_class_Locale_setDefault
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Locale_getPrimaryLanguage, 0, 1, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_Locale_getScript arginfo_class_Locale_setDefault
+#define arginfo_class_Locale_getScript arginfo_class_Locale_getPrimaryLanguage
 
-#define arginfo_class_Locale_getRegion arginfo_class_Locale_setDefault
+#define arginfo_class_Locale_getRegion arginfo_class_Locale_getPrimaryLanguage
 
-#define arginfo_class_Locale_getKeywords arginfo_class_Locale_setDefault
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_Locale_getKeywords, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE|MAY_BE_NULL)
+	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Locale_getDisplayScript, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_Locale_getDisplayScript, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, displayLocale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
@@ -29,30 +33,32 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_Locale_getDisplayVariant arginfo_class_Locale_getDisplayScript
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Locale_composeLocale, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_Locale_composeLocale, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, subtags, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_Locale_parseLocale arginfo_class_Locale_setDefault
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Locale_parseLocale, 0, 1, IS_ARRAY, 1)
+	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_Locale_getAllVariants arginfo_class_Locale_setDefault
+#define arginfo_class_Locale_getAllVariants arginfo_class_Locale_parseLocale
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Locale_filterMatches, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Locale_filterMatches, 0, 2, _IS_BOOL, 1)
 	ZEND_ARG_TYPE_INFO(0, languageTag, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, canonicalize, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Locale_lookup, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Locale_lookup, 0, 2, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO(0, languageTag, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, canonicalize, _IS_BOOL, 0, "false")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, defaultLocale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_Locale_canonicalize arginfo_class_Locale_setDefault
+#define arginfo_class_Locale_canonicalize arginfo_class_Locale_getPrimaryLanguage
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Locale_acceptFromHttp, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_Locale_acceptFromHttp, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, header, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
diff --git a/ext/intl/msgformat/msgformat.stub.php b/ext/intl/msgformat/msgformat.stub.php
index f46e663203b..0a2d33080f1 100644
--- a/ext/intl/msgformat/msgformat.stub.php
+++ b/ext/intl/msgformat/msgformat.stub.php
@@ -7,62 +7,62 @@ class MessageFormatter
     public function __construct(string $locale, string $pattern) {}
 
     /**
-     * @return MessageFormatter|null
+     * @tentative-return-type
      * @alias msgfmt_create
      */
-    public static function create(string $locale, string $pattern) {}
+    public static function create(string $locale, string $pattern): ?MessageFormatter {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias msgfmt_format
      */
-    public function format(array $values) {}
+    public function format(array $values): string|false {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias msgfmt_format_message
      */
-    public static function formatMessage(string $locale, string $pattern, array $values) {}
+    public static function formatMessage(string $locale, string $pattern, array $values): string|false {}
 
     /**
-     * @return array|false
+     * @tentative-return-type
      * @alias msgfmt_parse
      */
-    public function parse(string $string) {}
+    public function parse(string $string): array|false {}
 
     /**
-     * @return array|false
+     * @tentative-return-type
      * @alias msgfmt_parse_message
      */
-    public static function parseMessage(string $locale, string $pattern, string $message) {}
+    public static function parseMessage(string $locale, string $pattern, string $message): array|false|null {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias msgfmt_set_pattern
      */
-    public function setPattern(string $pattern) {}
+    public function setPattern(string $pattern): bool {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias msgfmt_get_pattern
      */
-    public function getPattern() {}
+    public function getPattern(): string|false {}
 
     /**
-     * @return string
+     * @tentative-return-type
      * @alias msgfmt_get_locale
      */
-    public function getLocale() {}
+    public function getLocale(): string {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias msgfmt_get_error_code
      */
-    public function getErrorCode() {}
+    public function getErrorCode(): int {}
 
     /**
-     * @return string
+     * @tentative-return-type
      * @alias msgfmt_get_error_message
      */
-    public function getErrorMessage() {}
+    public function getErrorMessage(): string {}
 }
diff --git a/ext/intl/msgformat/msgformat_arginfo.h b/ext/intl/msgformat/msgformat_arginfo.h
index 67bfff9f26e..93b9a02a945 100644
--- a/ext/intl/msgformat/msgformat_arginfo.h
+++ b/ext/intl/msgformat/msgformat_arginfo.h
@@ -1,45 +1,50 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 0d5b34913965434a4015e2b6ac7288edbbafc3f3 */
+ * Stub hash: c55f45648d120c74b84018da9786d49d9c203639 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MessageFormatter___construct, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_MessageFormatter_create arginfo_class_MessageFormatter___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_MessageFormatter_create, 0, 2, MessageFormatter, 1)
+	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MessageFormatter_format, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_MessageFormatter_format, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, values, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MessageFormatter_formatMessage, 0, 0, 3)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_MessageFormatter_formatMessage, 0, 3, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, values, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MessageFormatter_parse, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_MessageFormatter_parse, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MessageFormatter_parseMessage, 0, 0, 3)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_MessageFormatter_parseMessage, 0, 3, MAY_BE_ARRAY|MAY_BE_FALSE|MAY_BE_NULL)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MessageFormatter_setPattern, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_MessageFormatter_setPattern, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MessageFormatter_getPattern, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_MessageFormatter_getPattern, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_MessageFormatter_getLocale arginfo_class_MessageFormatter_getPattern
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_MessageFormatter_getLocale, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_MessageFormatter_getErrorCode arginfo_class_MessageFormatter_getPattern
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_MessageFormatter_getErrorCode, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_MessageFormatter_getErrorMessage arginfo_class_MessageFormatter_getPattern
+#define arginfo_class_MessageFormatter_getErrorMessage arginfo_class_MessageFormatter_getLocale
 
 
 ZEND_METHOD(MessageFormatter, __construct);
diff --git a/ext/intl/normalizer/normalizer.stub.php b/ext/intl/normalizer/normalizer.stub.php
index 0c9e1785dc5..9f931653381 100644
--- a/ext/intl/normalizer/normalizer.stub.php
+++ b/ext/intl/normalizer/normalizer.stub.php
@@ -5,22 +5,22 @@
 class Normalizer
 {
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias normalizer_normalize
      */
-    public static function normalize(string $string, int $form = Normalizer::FORM_C) {}
+    public static function normalize(string $string, int $form = Normalizer::FORM_C): string|false|null {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias normalizer_is_normalized
      */
-    public static function isNormalized(string $string, int $form = Normalizer::FORM_C) {}
+    public static function isNormalized(string $string, int $form = Normalizer::FORM_C): bool {}
 
 #if U_ICU_VERSION_MAJOR_NUM >= 56
     /**
-     * @return string|null
+     * @tentative-return-type
      * @alias normalizer_get_raw_decomposition
      */
-    public static function getRawDecomposition(string $string, int $form = Normalizer::FORM_C) {}
+    public static function getRawDecomposition(string $string, int $form = Normalizer::FORM_C): ?string {}
 #endif
 }
diff --git a/ext/intl/normalizer/normalizer_arginfo.h b/ext/intl/normalizer/normalizer_arginfo.h
index 8f10d9cd868..0f27b031b73 100644
--- a/ext/intl/normalizer/normalizer_arginfo.h
+++ b/ext/intl/normalizer/normalizer_arginfo.h
@@ -1,15 +1,18 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 651065249a99f9ee50126d58223b8f4527e3fc09 */
+ * Stub hash: d2c622731e68d201a72f8c94094ec8263427b6de */
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Normalizer_normalize, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_Normalizer_normalize, 0, 1, MAY_BE_STRING|MAY_BE_FALSE|MAY_BE_NULL)
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, form, IS_LONG, 0, "Normalizer::FORM_C")
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_Normalizer_isNormalized arginfo_class_Normalizer_normalize
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Normalizer_isNormalized, 0, 1, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, form, IS_LONG, 0, "Normalizer::FORM_C")
+ZEND_END_ARG_INFO()
 
 #if U_ICU_VERSION_MAJOR_NUM >= 56
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Normalizer_getRawDecomposition, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Normalizer_getRawDecomposition, 0, 1, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, form, IS_LONG, 0, "Normalizer::FORM_C")
 ZEND_END_ARG_INFO()
diff --git a/ext/intl/php_intl.stub.php b/ext/intl/php_intl.stub.php
index 3838c9b1887..c711d000745 100644
--- a/ext/intl/php_intl.stub.php
+++ b/ext/intl/php_intl.stub.php
@@ -17,9 +17,9 @@ function intlcal_get_now(): float {}
 
 function intlcal_get_available_locales(): array {}
 
-function intlcal_get(IntlCalendar $calendar, int $field): int {}
+function intlcal_get(IntlCalendar $calendar, int $field): int|false {}
 
-function intlcal_get_time(IntlCalendar $calendar): float {}
+function intlcal_get_time(IntlCalendar $calendar): float|false {}
 
 function intlcal_set_time(IntlCalendar $calendar, float $timestamp): bool {}
 
@@ -39,35 +39,35 @@ function intlcal_roll(IntlCalendar $calendar, int $field, $value): bool {}
 
 function intlcal_clear(IntlCalendar $calendar, ?int $field = null): bool {}
 
-function intlcal_field_difference(IntlCalendar $calendar, float $timestamp, int $field): int {}
+function intlcal_field_difference(IntlCalendar $calendar, float $timestamp, int $field): int|false {}
 
-function intlcal_get_actual_maximum(IntlCalendar $calendar, int $field): int {}
+function intlcal_get_actual_maximum(IntlCalendar $calendar, int $field): int|false {}
 
-function intlcal_get_actual_minimum(IntlCalendar $calendar, int $field): int {}
+function intlcal_get_actual_minimum(IntlCalendar $calendar, int $field): int|false {}
 
-function intlcal_get_day_of_week_type(IntlCalendar $calendar, int $dayOfWeek): int {}
+function intlcal_get_day_of_week_type(IntlCalendar $calendar, int $dayOfWeek): int|false {}
 
-function intlcal_get_first_day_of_week(IntlCalendar $calendar): int {}
+function intlcal_get_first_day_of_week(IntlCalendar $calendar): int|false {}
 
-function intlcal_get_least_maximum(IntlCalendar $calendar, int $field): int {}
+function intlcal_get_least_maximum(IntlCalendar $calendar, int $field): int|false {}
 
-function intlcal_get_greatest_minimum(IntlCalendar $calendar, int $field): int {}
+function intlcal_get_greatest_minimum(IntlCalendar $calendar, int $field): int|false {}
 
-function intlcal_get_locale(IntlCalendar $calendar, int $type): string {}
+function intlcal_get_locale(IntlCalendar $calendar, int $type): string|false {}
 
-function intlcal_get_maximum(IntlCalendar $calendar, int $field): int {}
+function intlcal_get_maximum(IntlCalendar $calendar, int $field): int|false {}
 
-function intlcal_get_minimal_days_in_first_week(IntlCalendar $calendar): int {}
+function intlcal_get_minimal_days_in_first_week(IntlCalendar $calendar): int|false {}
 
 function intlcal_set_minimal_days_in_first_week(IntlCalendar $calendar, int $days): bool {}
 
-function intlcal_get_minimum(IntlCalendar $calendar, int $field): int {}
+function intlcal_get_minimum(IntlCalendar $calendar, int $field): int|false {}
 
 function intlcal_get_time_zone(IntlCalendar $calendar): IntlTimeZone|false {}
 
 function intlcal_get_type(IntlCalendar $calendar): string {}
 
-function intlcal_get_weekend_transition(IntlCalendar $calendar, int $dayOfWeek): int {}
+function intlcal_get_weekend_transition(IntlCalendar $calendar, int $dayOfWeek): int|false {}
 
 function intlcal_in_daylight_time(IntlCalendar $calendar): bool {}
 
@@ -330,7 +330,7 @@ function msgfmt_format_message(string $locale, string $pattern, array $values):
 
 function msgfmt_parse(MessageFormatter $formatter, string $string): array|false {}
 
-function msgfmt_parse_message(string $locale, string $pattern, string $message): array|false {}
+function msgfmt_parse_message(string $locale, string $pattern, string $message): array|false|null {}
 
 function msgfmt_set_pattern(MessageFormatter $formatter, string $pattern): bool {}
 
@@ -344,7 +344,7 @@ function msgfmt_get_error_message(MessageFormatter $formatter): string {}
 
 /* normalizer */
 
-function normalizer_normalize(string $string, int $form = Normalizer::FORM_C): string|false {}
+function normalizer_normalize(string $string, int $form = Normalizer::FORM_C): string|false|null {}
 
 function normalizer_is_normalized(string $string, int $form = Normalizer::FORM_C): bool {}
 
diff --git a/ext/intl/php_intl_arginfo.h b/ext/intl/php_intl_arginfo.h
index ebf93cec983..ad4a83ba99a 100644
--- a/ext/intl/php_intl_arginfo.h
+++ b/ext/intl/php_intl_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 0d3e65fea1fbb8f38c3268b4048cb91972a94a1b */
+ * Stub hash: ab16aedec569db2e2ba8d43c86549ef02d2392c4 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_intlcal_create_instance, 0, 0, IntlCalendar, 1)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timezone, "null")
@@ -18,12 +18,12 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_get_available_locales, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_get, 0, 2, IS_LONG, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intlcal_get, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
 	ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_get_time, 0, 1, IS_DOUBLE, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intlcal_get_time, 0, 1, MAY_BE_DOUBLE|MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
 ZEND_END_ARG_INFO()
 
@@ -71,7 +71,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_clear, 0, 1, _IS_BOOL, 0
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, field, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_field_difference, 0, 3, IS_LONG, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intlcal_field_difference, 0, 3, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
 	ZEND_ARG_TYPE_INFO(0, timestamp, IS_DOUBLE, 0)
 	ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0)
@@ -81,12 +81,12 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_intlcal_get_actual_minimum arginfo_intlcal_get
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_get_day_of_week_type, 0, 2, IS_LONG, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intlcal_get_day_of_week_type, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
 	ZEND_ARG_TYPE_INFO(0, dayOfWeek, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_get_first_day_of_week, 0, 1, IS_LONG, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intlcal_get_first_day_of_week, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
 ZEND_END_ARG_INFO()
 
@@ -94,7 +94,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_intlcal_get_greatest_minimum arginfo_intlcal_get
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_get_locale, 0, 2, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intlcal_get_locale, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
 	ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
 ZEND_END_ARG_INFO()
@@ -148,11 +148,13 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set_lenient, 0, 2, _IS_B
 	ZEND_ARG_TYPE_INFO(0, lenient, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_intlcal_get_repeated_wall_time_option arginfo_intlcal_get_first_day_of_week
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_get_repeated_wall_time_option, 0, 1, IS_LONG, 0)
+	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
+ZEND_END_ARG_INFO()
 
 #define arginfo_intlcal_equals arginfo_intlcal_after
 
-#define arginfo_intlcal_get_skipped_wall_time_option arginfo_intlcal_get_first_day_of_week
+#define arginfo_intlcal_get_skipped_wall_time_option arginfo_intlcal_get_repeated_wall_time_option
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set_repeated_wall_time_option, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
@@ -170,9 +172,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_intlcal_to_date_time, 0, 1,
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intlcal_get_error_code, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
-ZEND_END_ARG_INFO()
+#define arginfo_intlcal_get_error_code arginfo_intlcal_get_first_day_of_week
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intlcal_get_error_message, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
@@ -582,7 +582,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_msgfmt_parse, 0, 2, MAY_BE_ARRAY
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_msgfmt_parse_message, 0, 3, MAY_BE_ARRAY|MAY_BE_FALSE)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_msgfmt_parse_message, 0, 3, MAY_BE_ARRAY|MAY_BE_FALSE|MAY_BE_NULL)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
@@ -607,7 +607,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_msgfmt_get_error_message arginfo_msgfmt_get_locale
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_normalizer_normalize, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_normalizer_normalize, 0, 1, MAY_BE_STRING|MAY_BE_FALSE|MAY_BE_NULL)
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, form, IS_LONG, 0, "Normalizer::FORM_C")
 ZEND_END_ARG_INFO()
diff --git a/ext/intl/resourcebundle/resourcebundle.stub.php b/ext/intl/resourcebundle/resourcebundle.stub.php
index c55749b1521..79374e29512 100644
--- a/ext/intl/resourcebundle/resourcebundle.stub.php
+++ b/ext/intl/resourcebundle/resourcebundle.stub.php
@@ -7,41 +7,41 @@ class ResourceBundle implements IteratorAggregate, Countable
     public function __construct(?string $locale, ?string $bundle, bool $fallback = true) {}
 
     /**
-     * @return ResourceBundle|null
+     * @tentative-return-type
      * @alias resourcebundle_create
      */
-    public static function create(?string $locale, ?string $bundle, bool $fallback = true) {}
+    public static function create(?string $locale, ?string $bundle, bool $fallback = true): ?ResourceBundle {}
 
     /**
      * @param string|int $index
-     * @return mixed
+     * @tentative-return-type
      * @alias resourcebundle_get
      */
-    public function get($index, bool $fallback = true) {}
+    public function get($index, bool $fallback = true): mixed {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias resourcebundle_count
      */
-    public function count() {}
+    public function count(): int {}
 
     /**
-     * @return array|false
+     * @tentative-return-type
      * @alias resourcebundle_locales
      */
-    public static function getLocales(string $bundle) {}
+    public static function getLocales(string $bundle): array|false {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias resourcebundle_get_error_code
      */
-    public function getErrorCode() {}
+    public function getErrorCode(): int {}
 
     /**
-     * @return string
+     * @tentative-return-type
      * @alias resourcebundle_get_error_message
      */
-    public function getErrorMessage() {}
+    public function getErrorMessage(): string {}
 
     public function getIterator(): Iterator {}
 }
diff --git a/ext/intl/resourcebundle/resourcebundle_arginfo.h b/ext/intl/resourcebundle/resourcebundle_arginfo.h
index 99468a299aa..6d138768f3f 100644
--- a/ext/intl/resourcebundle/resourcebundle_arginfo.h
+++ b/ext/intl/resourcebundle/resourcebundle_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 23040d115ab2c1900fa537313f3a7ff4a57b9715 */
+ * Stub hash: a299d2a45a3575e6da71560979e2f9301b3c952f */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ResourceBundle___construct, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)
@@ -7,23 +7,28 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ResourceBundle___construct, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fallback, _IS_BOOL, 0, "true")
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_ResourceBundle_create arginfo_class_ResourceBundle___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_ResourceBundle_create, 0, 2, ResourceBundle, 1)
+	ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, bundle, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fallback, _IS_BOOL, 0, "true")
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ResourceBundle_get, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ResourceBundle_get, 0, 1, IS_MIXED, 0)
 	ZEND_ARG_INFO(0, index)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fallback, _IS_BOOL, 0, "true")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ResourceBundle_count, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ResourceBundle_count, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ResourceBundle_getLocales, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_ResourceBundle_getLocales, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, bundle, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_ResourceBundle_getErrorCode arginfo_class_ResourceBundle_count
 
-#define arginfo_class_ResourceBundle_getErrorMessage arginfo_class_ResourceBundle_count
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ResourceBundle_getErrorMessage, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_ResourceBundle_getIterator, 0, 0, Iterator, 0)
 ZEND_END_ARG_INFO()
diff --git a/ext/intl/spoofchecker/spoofchecker.stub.php b/ext/intl/spoofchecker/spoofchecker.stub.php
index a1e49480456..0ff7cc6da7c 100644
--- a/ext/intl/spoofchecker/spoofchecker.stub.php
+++ b/ext/intl/spoofchecker/spoofchecker.stub.php
@@ -8,24 +8,24 @@ class Spoofchecker
 
     /**
      * @param int $errorCode
-     * @return bool
+     * @tentative-return-type
      */
-    public function isSuspicious(string $string, &$errorCode = null) {}
+    public function isSuspicious(string $string, &$errorCode = null): bool {}
 
     /**
      * @param int $errorCode
-     * @return bool
+     * @tentative-return-type
      */
-    public function areConfusable(string $string1, string $string2, &$errorCode = null) {}
+    public function areConfusable(string $string1, string $string2, &$errorCode = null): bool {}
 
-    /** @return void */
-    public function setAllowedLocales(string $locales) {}
+    /** @tentative-return-type */
+    public function setAllowedLocales(string $locales): void {}
 
-    /** @return void */
-    public function setChecks(int $checks) {}
+    /** @tentative-return-type */
+    public function setChecks(int $checks): void {}
 
 #if U_ICU_VERSION_MAJOR_NUM >= 58
-    /** @return void */
-    public function setRestrictionLevel(int $level) {}
+    /** @tentative-return-type */
+    public function setRestrictionLevel(int $level): void {}
 #endif
 }
diff --git a/ext/intl/spoofchecker/spoofchecker_arginfo.h b/ext/intl/spoofchecker/spoofchecker_arginfo.h
index e3d81bf37ae..281ea7f3ed3 100644
--- a/ext/intl/spoofchecker/spoofchecker_arginfo.h
+++ b/ext/intl/spoofchecker/spoofchecker_arginfo.h
@@ -1,30 +1,30 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: b0317673c829b873b95aac34d362cd5ad004aca9 */
+ * Stub hash: d915fb3698e0bde4af2a1175fff882cae1f55668 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Spoofchecker___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Spoofchecker_isSuspicious, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Spoofchecker_isSuspicious, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, errorCode, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Spoofchecker_areConfusable, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Spoofchecker_areConfusable, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, string1, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, string2, IS_STRING, 0)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, errorCode, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Spoofchecker_setAllowedLocales, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Spoofchecker_setAllowedLocales, 0, 1, IS_VOID, 0)
 	ZEND_ARG_TYPE_INFO(0, locales, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Spoofchecker_setChecks, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Spoofchecker_setChecks, 0, 1, IS_VOID, 0)
 	ZEND_ARG_TYPE_INFO(0, checks, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #if U_ICU_VERSION_MAJOR_NUM >= 58
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Spoofchecker_setRestrictionLevel, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Spoofchecker_setRestrictionLevel, 0, 1, IS_VOID, 0)
 	ZEND_ARG_TYPE_INFO(0, level, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 #endif
diff --git a/ext/intl/tests/bug78804.phpt b/ext/intl/tests/bug78804.phpt
index 5add1224abe..c1fb08104db 100644
--- a/ext/intl/tests/bug78804.phpt
+++ b/ext/intl/tests/bug78804.phpt
@@ -12,4 +12,4 @@ if (Locale::filterMatches('en-US', 'und', true)) {
 }
 ?>
 --EXPECT--
-Not matches
\ No newline at end of file
+Not matches
diff --git a/ext/intl/tests/uconverter_oop_callback.phpt b/ext/intl/tests/uconverter_oop_callback.phpt
index 0436e72750e..ec1f7d6e4d4 100644
--- a/ext/intl/tests/uconverter_oop_callback.phpt
+++ b/ext/intl/tests/uconverter_oop_callback.phpt
@@ -10,7 +10,7 @@ class MyConverter extends UConverter {
   /**
    * Called during conversion from source encoding to internal UChar representation
    */
-  public function toUCallback($reason, $source, $codeUnits, &$error) {
+  public function toUCallback($reason, $source, $codeUnits, &$error): string|int|array|null {
     echo "toUCallback(", UConverter::reasonText($reason), ", ...)\n";
     return parent::toUCallback($reason, $source, $codeUnits, $error);
   }
@@ -18,7 +18,7 @@ class MyConverter extends UConverter {
   /**
    * Called during conversion from internal UChar to destination encoding
    */
-  public function fromUCallback($reason, $source, $codePoint, &$error) {
+  public function fromUCallback($reason, $source, $codePoint, &$error): string|int|array|null {
     echo "fromUCallback(", UConverter::reasonText($reason), ", ...)\n";
     return parent::fromUCallback($reason, $source, $codePoint, $error);
   }
diff --git a/ext/intl/tests/uconverter_oop_callback2.phpt b/ext/intl/tests/uconverter_oop_callback2.phpt
index 4996b8e118f..16b2c9c43c6 100644
--- a/ext/intl/tests/uconverter_oop_callback2.phpt
+++ b/ext/intl/tests/uconverter_oop_callback2.phpt
@@ -10,7 +10,7 @@ class MyConverter extends UConverter {
   /**
    * Called during conversion from source encoding to internal UChar representation
    */
-  public function toUCallback($reason, $source, $codeUnits, &$error) {
+  public function toUCallback($reason, $source, $codeUnits, &$error): string|int|array|null {
     echo "toUCallback(", UConverter::reasonText($reason), ", ...)\n";
     return parent::toUCallback($reason, $source, $codeUnits, $error);
   }
@@ -18,7 +18,7 @@ class MyConverter extends UConverter {
   /**
    * Called during conversion from internal UChar to destination encoding
    */
-  public function fromUCallback($reason, $source, $codePoint, &$error) {
+  public function fromUCallback($reason, $source, $codePoint, &$error): string|int|array|null {
     echo "fromUCallback(", UConverter::reasonText($reason), ", ...)\n";
     return parent::fromUCallback($reason, $source, $codePoint, $error);
   }
diff --git a/ext/intl/tests/uconverter_oop_callback_return.phpt b/ext/intl/tests/uconverter_oop_callback_return.phpt
index 226b06b68de..02a0abd652f 100644
--- a/ext/intl/tests/uconverter_oop_callback_return.phpt
+++ b/ext/intl/tests/uconverter_oop_callback_return.phpt
@@ -5,7 +5,7 @@ intl
 --FILE--
 <?php
 class MyConverter extends UConverter {
-  public function toUCallback($reason, $source, $codeUnits, &$error) {
+  public function toUCallback($reason, $source, $codeUnits, &$error): string|int|array|null {
     $error = U_ZERO_ERROR;
     switch ($codeUnits) {
       case "\x80": return NULL;
@@ -13,12 +13,14 @@ class MyConverter extends UConverter {
       case "\x82": return ord('b');
       case "\x83": return array('c');
     }
+
+    return null;
   }
 
   /**
    * Called during conversion from internal UChar to destination encoding
    */
-  public function fromUCallback($reason, $source, $codePoint, &$error) {
+  public function fromUCallback($reason, $source, $codePoint, &$error): string|int|array|null {
     $error = U_ZERO_ERROR;
     switch ($codePoint) {
       case 0x00F1: return "A";
@@ -26,6 +28,8 @@ class MyConverter extends UConverter {
       case 0x00F3: return array("C");
       case 0x00F4: return NULL;
     }
+
+    return null;
   }
 
 }
diff --git a/ext/intl/timezone/timezone.stub.php b/ext/intl/timezone/timezone.stub.php
index e8d46bde870..cc4f6084fd5 100644
--- a/ext/intl/timezone/timezone.stub.php
+++ b/ext/intl/timezone/timezone.stub.php
@@ -7,151 +7,151 @@ class IntlTimeZone
     private function __construct() {}
 
     /**
-     * @return int|false
+     * @tentative-return-type
      * @alias intltz_count_equivalent_ids
      */
-    public static function countEquivalentIDs(string $timezoneId) {}
+    public static function countEquivalentIDs(string $timezoneId): int|false {}
 
     /**
-     * @return IntlTimeZone
+     * @tentative-return-type
      * @alias intltz_create_default
      */
-    public static function createDefault() {}
+    public static function createDefault(): IntlTimeZone {}
 
     /**
      * @param IntlTimeZone|string|int|float|null $countryOrRawOffset
-     * @return IntlIterator|false
+     * @tentative-return-type
      * @alias intltz_create_enumeration
      */
-    public static function createEnumeration($countryOrRawOffset = null) {}
+    public static function createEnumeration($countryOrRawOffset = null): IntlIterator|false {}
 
     /**
-     * @return IntlTimeZone|null
+     * @tentative-return-type
      * @alias intltz_create_time_zone
      */
-    public static function createTimeZone(string $timezoneId) {}
+    public static function createTimeZone(string $timezoneId): ?IntlTimeZone {}
 
     /**
-     * @return IntlIterator|false
+     * @tentative-return-type
      * @alias intltz_create_time_zone_id_enumeration
      */
-    public static function createTimeZoneIDEnumeration(int $type, ?string $region = null, ?int $rawOffset = null) {}
+    public static function createTimeZoneIDEnumeration(int $type, ?string $region = null, ?int $rawOffset = null): IntlIterator|false {}
 
     /**
-     * @return IntlTimeZone|null
+     * @tentative-return-type
      * @alias intltz_from_date_time_zone
      */
-    public static function fromDateTimeZone(DateTimeZone $timezone) {}
+    public static function fromDateTimeZone(DateTimeZone $timezone): ?IntlTimeZone {}
 
     /**
      * @param bool $isSystemId
-     * @return string|false
+     * @tentative-return-type
      * @alias intltz_get_canonical_id
      */
-    public static function getCanonicalID(string $timezoneId, &$isSystemId = null) {}
+    public static function getCanonicalID(string $timezoneId, &$isSystemId = null): string|false {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias intltz_get_display_name
      */
-    public function getDisplayName(bool $dst = false, int $style = IntlTimeZone::DISPLAY_LONG, ?string $locale = null) {}
+    public function getDisplayName(bool $dst = false, int $style = IntlTimeZone::DISPLAY_LONG, ?string $locale = null): string|false {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias intltz_get_dst_savings
      */
-    public function getDSTSavings() {}
+    public function getDSTSavings(): int {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias intltz_get_equivalent_id
      */
-    public static function getEquivalentID(string $timezoneId, int $offset) {}
+    public static function getEquivalentID(string $timezoneId, int $offset): string|false {}
 
     /**
-     * @return int|false
+     * @tentative-return-type
      * @alias intltz_get_error_code
      */
-    public function getErrorCode() {}
+    public function getErrorCode(): int|false {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias intltz_get_error_message
      */
-    public function getErrorMessage() {}
+    public function getErrorMessage(): string|false {}
 
     /**
-     * @return IntlTimeZone
+     * @tentative-return-type
      * @alias intltz_get_gmt
      */
-    public static function getGMT() {}
+    public static function getGMT(): IntlTimeZone {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias intltz_get_id
      */
-    public function getID() {}
+    public function getID(): string|false {}
 
     /**
      * @param int $rawOffset
      * @param int $dstOffset
-     * @return bool
+     * @tentative-return-type
      * @alias intltz_get_offset
      */
-    public function getOffset(float $timestamp, bool $local, &$rawOffset, &$dstOffset) {}
+    public function getOffset(float $timestamp, bool $local, &$rawOffset, &$dstOffset): bool {}
 
     /**
-     * @return int
+     * @tentative-return-type
      * @alias intltz_get_raw_offset
      */
-    public function getRawOffset() {}
+    public function getRawOffset(): int {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias intltz_get_region
      */
-    public static function getRegion(string $timezoneId) {}
+    public static function getRegion(string $timezoneId): string|false {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias intltz_get_tz_data_version
      */
-    public static function getTZDataVersion() {}
+    public static function getTZDataVersion(): string|false {}
 
     /**
-     * @return IntlTimeZone
+     * @tentative-return-type
      * @alias intltz_get_unknown
      */
-    public static function getUnknown() {}
+    public static function getUnknown(): IntlTimeZone {}
 
 #if U_ICU_VERSION_MAJOR_NUM >= 52
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias intltz_get_windows_id
      */
-    public static function getWindowsID(string $timezoneId) {}
+    public static function getWindowsID(string $timezoneId): string|false {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias intltz_get_id_for_windows_id
      */
-    public static function getIDForWindowsID(string $timezoneId, ?string $region = null) {}
+    public static function getIDForWindowsID(string $timezoneId, ?string $region = null): string|false {}
 #endif
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias intltz_has_same_rules
      */
-    public function hasSameRules(IntlTimeZone $other) {}
+    public function hasSameRules(IntlTimeZone $other): bool {}
 
     /**
-     * @return DateTimeZone|false
+     * @tentative-return-type
      * @alias intltz_to_date_time_zone
      */
-    public function toDateTimeZone() {}
+    public function toDateTimeZone(): DateTimeZone|false {}
 
     /**
-     * @return bool
+     * @tentative-return-type
      * @alias intltz_use_daylight_time
      */
-    public function useDaylightTime() {}
+    public function useDaylightTime(): bool {}
 }
diff --git a/ext/intl/timezone/timezone_arginfo.h b/ext/intl/timezone/timezone_arginfo.h
index da54bf3c3a4..c8a77dcb078 100644
--- a/ext/intl/timezone/timezone_arginfo.h
+++ b/ext/intl/timezone/timezone_arginfo.h
@@ -1,92 +1,102 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 02045a0de09413796dd1ca7495b0b1beff14a074 */
+ * Stub hash: 3f945431687a2f45b0ec8c3a6435ef68008c75ad */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_countEquivalentIDs, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlTimeZone_countEquivalentIDs, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlTimeZone_createDefault arginfo_class_IntlTimeZone___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_IntlTimeZone_createDefault, 0, 0, IntlTimeZone, 0)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_createEnumeration, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_IntlTimeZone_createEnumeration, 0, 0, IntlIterator, MAY_BE_FALSE)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, countryOrRawOffset, "null")
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlTimeZone_createTimeZone arginfo_class_IntlTimeZone_countEquivalentIDs
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_IntlTimeZone_createTimeZone, 0, 1, IntlTimeZone, 1)
+	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_createTimeZoneIDEnumeration, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_IntlTimeZone_createTimeZoneIDEnumeration, 0, 1, IntlIterator, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, region, IS_STRING, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, rawOffset, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_fromDateTimeZone, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_IntlTimeZone_fromDateTimeZone, 0, 1, IntlTimeZone, 1)
 	ZEND_ARG_OBJ_INFO(0, timezone, DateTimeZone, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_getCanonicalID, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlTimeZone_getCanonicalID, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, isSystemId, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_getDisplayName, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlTimeZone_getDisplayName, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dst, _IS_BOOL, 0, "false")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, style, IS_LONG, 0, "IntlTimeZone::DISPLAY_LONG")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlTimeZone_getDSTSavings arginfo_class_IntlTimeZone___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlTimeZone_getDSTSavings, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_getEquivalentID, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlTimeZone_getEquivalentID, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlTimeZone_getErrorCode arginfo_class_IntlTimeZone___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlTimeZone_getErrorCode, 0, 0, MAY_BE_LONG|MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlTimeZone_getErrorMessage arginfo_class_IntlTimeZone___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlTimeZone_getErrorMessage, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlTimeZone_getGMT arginfo_class_IntlTimeZone___construct
+#define arginfo_class_IntlTimeZone_getGMT arginfo_class_IntlTimeZone_createDefault
 
-#define arginfo_class_IntlTimeZone_getID arginfo_class_IntlTimeZone___construct
+#define arginfo_class_IntlTimeZone_getID arginfo_class_IntlTimeZone_getErrorMessage
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_getOffset, 0, 0, 4)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlTimeZone_getOffset, 0, 4, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, timestamp, IS_DOUBLE, 0)
 	ZEND_ARG_TYPE_INFO(0, local, _IS_BOOL, 0)
 	ZEND_ARG_INFO(1, rawOffset)
 	ZEND_ARG_INFO(1, dstOffset)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlTimeZone_getRawOffset arginfo_class_IntlTimeZone___construct
+#define arginfo_class_IntlTimeZone_getRawOffset arginfo_class_IntlTimeZone_getDSTSavings
 
-#define arginfo_class_IntlTimeZone_getRegion arginfo_class_IntlTimeZone_countEquivalentIDs
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlTimeZone_getRegion, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
+	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlTimeZone_getTZDataVersion arginfo_class_IntlTimeZone___construct
+#define arginfo_class_IntlTimeZone_getTZDataVersion arginfo_class_IntlTimeZone_getErrorMessage
 
-#define arginfo_class_IntlTimeZone_getUnknown arginfo_class_IntlTimeZone___construct
+#define arginfo_class_IntlTimeZone_getUnknown arginfo_class_IntlTimeZone_createDefault
 
 #if U_ICU_VERSION_MAJOR_NUM >= 52
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_getWindowsID, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlTimeZone_getWindowsID, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 #endif
 
 #if U_ICU_VERSION_MAJOR_NUM >= 52
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_getIDForWindowsID, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlTimeZone_getIDForWindowsID, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, timezoneId, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, region, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 #endif
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlTimeZone_hasSameRules, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlTimeZone_hasSameRules, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_OBJ_INFO(0, other, IntlTimeZone, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlTimeZone_toDateTimeZone arginfo_class_IntlTimeZone___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_IntlTimeZone_toDateTimeZone, 0, 0, DateTimeZone, MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlTimeZone_useDaylightTime arginfo_class_IntlTimeZone___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlTimeZone_useDaylightTime, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
 
 
 ZEND_METHOD(IntlTimeZone, __construct);
diff --git a/ext/intl/transliterator/transliterator.stub.php b/ext/intl/transliterator/transliterator.stub.php
index e8e147ac8ea..4ae7c3a645d 100644
--- a/ext/intl/transliterator/transliterator.stub.php
+++ b/ext/intl/transliterator/transliterator.stub.php
@@ -9,44 +9,44 @@ class Transliterator
     final private function __construct() {}
 
     /**
-     * @return Transliterator|null
+     * @tentative-return-type
      * @alias transliterator_create
      */
-    public static function create(string $id, int $direction = Transliterator::FORWARD) {}
+    public static function create(string $id, int $direction = Transliterator::FORWARD): ?Transliterator {}
 
     /**
-     * @return Transliterator|null
+     * @tentative-return-type
      * @alias transliterator_create_from_rules
      */
-    public static function createFromRules(string $rules, int $direction = Transliterator::FORWARD) {}
+    public static function createFromRules(string $rules, int $direction = Transliterator::FORWARD): ?Transliterator {}
 
     /**
-     * @return Transliterator|null
+     * @tentative-return-type
      * @alias transliterator_create_inverse
      */
-    public function createInverse() {}
+    public function createInverse(): ?Transliterator {}
 
     /**
-     * @return array|false
+     * @tentative-return-type
      * @alias transliterator_list_ids
      */
-    public static function listIDs() {}
+    public static function listIDs(): array|false {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias transliterator_transliterate
      */
-    public function transliterate(string $string, int $start = 0, int $end = -1) {}
+    public function transliterate(string $string, int $start = 0, int $end = -1): string|false {}
 
     /**
-     * @return int|false
+     * @tentative-return-type
      * @alias transliterator_get_error_code
      */
-    public function getErrorCode() {}
+    public function getErrorCode(): int|false {}
 
     /**
-     * @return string|false
+     * @tentative-return-type
      * @alias transliterator_get_error_message
      */
-    public function getErrorMessage() {}
+    public function getErrorMessage(): string|false {}
 }
diff --git a/ext/intl/transliterator/transliterator_arginfo.h b/ext/intl/transliterator/transliterator_arginfo.h
index 94318cb3b7a..76d10000b10 100644
--- a/ext/intl/transliterator/transliterator_arginfo.h
+++ b/ext/intl/transliterator/transliterator_arginfo.h
@@ -1,32 +1,36 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: c34871965e0d58bb15beda1787b7cdd0754bb28f */
+ * Stub hash: fbc9a196271c276e5af658115571cacde2ad3a3a */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Transliterator___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Transliterator_create, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_Transliterator_create, 0, 1, Transliterator, 1)
 	ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, direction, IS_LONG, 0, "Transliterator::FORWARD")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Transliterator_createFromRules, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_Transliterator_createFromRules, 0, 1, Transliterator, 1)
 	ZEND_ARG_TYPE_INFO(0, rules, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, direction, IS_LONG, 0, "Transliterator::FORWARD")
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_Transliterator_createInverse arginfo_class_Transliterator___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_Transliterator_createInverse, 0, 0, Transliterator, 1)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_Transliterator_listIDs arginfo_class_Transliterator___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_Transliterator_listIDs, 0, 0, MAY_BE_ARRAY|MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Transliterator_transliterate, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_Transliterator_transliterate, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, start, IS_LONG, 0, "0")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, end, IS_LONG, 0, "-1")
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_Transliterator_getErrorCode arginfo_class_Transliterator___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_Transliterator_getErrorCode, 0, 0, MAY_BE_LONG|MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_Transliterator_getErrorMessage arginfo_class_Transliterator___construct
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_Transliterator_getErrorMessage, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
 
 
 ZEND_METHOD(Transliterator, __construct);
diff --git a/ext/intl/uchar/uchar.stub.php b/ext/intl/uchar/uchar.stub.php
index 2bb667e44e5..d246c2b25c2 100644
--- a/ext/intl/uchar/uchar.stub.php
+++ b/ext/intl/uchar/uchar.stub.php
@@ -4,185 +4,182 @@
 
 class IntlChar
 {
-    /** @return bool|null */
-    public static function hasBinaryProperty(int|string $codepoint, int $property) {}
+    /** @tentative-return-type */
+    public static function hasBinaryProperty(int|string $codepoint, int $property): ?bool {}
 
-    /** @return array|null */
-    public static function charAge(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function charAge(int|string $codepoint): ?array {}
 
-    /** @return int|null */
-    public static function charDigitValue(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function charDigitValue(int|string $codepoint): ?int {}
 
-    /** @return int|null
-     */
-    public static function charDirection(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function charDirection(int|string $codepoint): ?int {}
 
-    /** @return int|null */
-    public static function charFromName(string $name, int $type = IntlChar::UNICODE_CHAR_NAME) {}
+    /** @tentative-return-type */
+    public static function charFromName(string $name, int $type = IntlChar::UNICODE_CHAR_NAME): ?int {}
 
-    /** @return int|string|null */
-    public static function charMirror(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function charMirror(int|string $codepoint): int|string|null {}
 
-    /** @return string|null */
-    public static function charName(int|string $codepoint, int $type = IntlChar::UNICODE_CHAR_NAME) {}
+    /** @tentative-return-type */
+    public static function charName(int|string $codepoint, int $type = IntlChar::UNICODE_CHAR_NAME): ?string {}
 
-    /** @return int|null */
-    public static function charType(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function charType(int|string $codepoint): ?int {}
 
-    /** @return string|null */
-    public static function chr(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function chr(int|string $codepoint): ?string {}
 
-    /** @return int|false|null */
-    public static function digit(int|string $codepoint, int $base = 10) {}
+    /** @tentative-return-type */
+    public static function digit(int|string $codepoint, int $base = 10): int|false|null {}
 
-    /** @return bool|null */
-    public static function enumCharNames(int|string $start, int|string $end, callable $callback, int $type = IntlChar::UNICODE_CHAR_NAME) {}
+    /** @tentative-return-type */
+    public static function enumCharNames(int|string $start, int|string $end, callable $callback, int $type = IntlChar::UNICODE_CHAR_NAME): ?bool {} // TODO return values just don't make sense
 
-    /** @return void */
-    public static function enumCharTypes(callable $callback) {}
+    /** @tentative-return-type */
+    public static function enumCharTypes(callable $callback): void {}
 
-    /**
-     * @return int|string|null
-     */
-    public static function foldCase(int|string $codepoint, int $options = IntlChar::FOLD_CASE_DEFAULT) {}
+    /** @tentative-return-type */
+    public static function foldCase(int|string $codepoint, int $options = IntlChar::FOLD_CASE_DEFAULT): int|string|null {}
 
-    /** @return int */
-    public static function forDigit(int $digit, int $base = 10) {}
+    /** @tentative-return-type */
+    public static function forDigit(int $digit, int $base = 10): int {}
 
 #if U_ICU_VERSION_MAJOR_NUM >= 52
-    /** @return int|string|null */
-    public static function getBidiPairedBracket(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function getBidiPairedBracket(int|string $codepoint): int|string|null {}
 #endif
 
-    /** @return int|null */
-    public static function getBlockCode(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function getBlockCode(int|string $codepoint): ?int {}
 
-    /** @return int|null */
-    public static function getCombiningClass(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function getCombiningClass(int|string $codepoint): ?int {}
 
-    /** @return string|false|null */
-    public static function getFC_NFKC_Closure(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function getFC_NFKC_Closure(int|string $codepoint): string|false|null {}
 
-    /** @return int */
-    public static function getIntPropertyMaxValue(int $property) {}
+    /** @tentative-return-type */
+    public static function getIntPropertyMaxValue(int $property): int {}
 
-    /** @return int */
-    public static function getIntPropertyMinValue(int $property) {}
+    /** @tentative-return-type */
+    public static function getIntPropertyMinValue(int $property): int {}
 
-    /** @return int|null */
-    public static function getIntPropertyValue(int|string $codepoint, int $property) {}
+    /** @tentative-return-type */
+    public static function getIntPropertyValue(int|string $codepoint, int $property): ?int {}
 
-    /** @return float|null */
-    public static function getNumericValue(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function getNumericValue(int|string $codepoint): ?float {}
 
-    /** @return int */
-    public static function getPropertyEnum(string $alias) {}
+    /** @tentative-return-type */
+    public static function getPropertyEnum(string $alias): int {}
 
-    /** @return string|false */
-    public static function getPropertyName(int $property, int $type = IntlChar::LONG_PROPERTY_NAME) {}
+    /** @tentative-return-type */
+    public static function getPropertyName(int $property, int $type = IntlChar::LONG_PROPERTY_NAME): string|false {}
 
-    /** @return int */
-    public static function getPropertyValueEnum(int $property, string $name) {}
+    /** @tentative-return-type */
+    public static function getPropertyValueEnum(int $property, string $name): int {}
 
-    /** @return string|false */
-    public static function getPropertyValueName(int $property, int $value, int $type = IntlChar::LONG_PROPERTY_NAME) {}
+    /** @tentative-return-type */
+    public static function getPropertyValueName(int $property, int $value, int $type = IntlChar::LONG_PROPERTY_NAME): string|false {}
 
-    /** @return array */
-    public static function getUnicodeVersion() {}
+    /** @tentative-return-type */
+    public static function getUnicodeVersion(): array {}
 
-    /** @return bool|null */
-    public static function isalnum(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isalnum(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isalpha(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isalpha(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isbase(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isbase(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isblank(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isblank(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function iscntrl(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function iscntrl(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isdefined(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isdefined(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isdigit(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isdigit(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isgraph(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isgraph(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isIDIgnorable(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isIDIgnorable(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isIDPart(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isIDPart(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isIDStart(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isIDStart(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isISOControl(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isISOControl(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isJavaIDPart(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isJavaIDPart(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isJavaIDStart(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isJavaIDStart(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isJavaSpaceChar(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isJavaSpaceChar(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function islower(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function islower(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isMirrored(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isMirrored(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isprint(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isprint(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function ispunct(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function ispunct(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isspace(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isspace(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function istitle(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function istitle(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isUAlphabetic(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isUAlphabetic(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isULowercase(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isULowercase(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isupper(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isupper(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isUUppercase(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isUUppercase(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isUWhiteSpace(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isUWhiteSpace(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isWhitespace(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isWhitespace(int|string $codepoint): ?bool {}
 
-    /** @return bool|null */
-    public static function isxdigit(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function isxdigit(int|string $codepoint): ?bool {}
 
-    /** @return int|null */
-    public static function ord(int|string $character) {}
+    /** @tentative-return-type */
+    public static function ord(int|string $character): ?int {}
 
-    /** @return int|string|null */
-    public static function tolower(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function tolower(int|string $codepoint): int|string|null {}
 
-    /** @return int|string|null */
-    public static function totitle(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function totitle(int|string $codepoint): int|string|null {}
 
-    /** @return int|string|null */
-    public static function toupper(int|string $codepoint) {}
+    /** @tentative-return-type */
+    public static function toupper(int|string $codepoint): int|string|null {}
 }
diff --git a/ext/intl/uchar/uchar_arginfo.h b/ext/intl/uchar/uchar_arginfo.h
index 680e336bfbb..9721bbbb8f9 100644
--- a/ext/intl/uchar/uchar_arginfo.h
+++ b/ext/intl/uchar/uchar_arginfo.h
@@ -1,171 +1,186 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 65836ce6bd16316bb022bc75ce5e2fbbdd1880b7 */
+ * Stub hash: 2b8605be915f05929dc0ade2edfb6f6ab942218c */
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_hasBinaryProperty, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlChar_hasBinaryProperty, 0, 2, _IS_BOOL, 1)
 	ZEND_ARG_TYPE_MASK(0, codepoint, MAY_BE_LONG|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO(0, property, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_charAge, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlChar_charAge, 0, 1, IS_ARRAY, 1)
 	ZEND_ARG_TYPE_MASK(0, codepoint, MAY_BE_LONG|MAY_BE_STRING, NULL)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlChar_charDigitValue arginfo_class_IntlChar_charAge
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlChar_charDigitValue, 0, 1, IS_LONG, 1)
+	ZEND_ARG_TYPE_MASK(0, codepoint, MAY_BE_LONG|MAY_BE_STRING, NULL)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlChar_charDirection arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_charDirection arginfo_class_IntlChar_charDigitValue
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_charFromName, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlChar_charFromName, 0, 1, IS_LONG, 1)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "IntlChar::UNICODE_CHAR_NAME")
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlChar_charMirror arginfo_class_IntlChar_charAge
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlChar_charMirror, 0, 1, MAY_BE_LONG|MAY_BE_STRING|MAY_BE_NULL)
+	ZEND_ARG_TYPE_MASK(0, codepoint, MAY_BE_LONG|MAY_BE_STRING, NULL)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_charName, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlChar_charName, 0, 1, IS_STRING, 1)
 	ZEND_ARG_TYPE_MASK(0, codepoint, MAY_BE_LONG|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "IntlChar::UNICODE_CHAR_NAME")
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlChar_charType arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_charType arginfo_class_IntlChar_charDigitValue
 
-#define arginfo_class_IntlChar_chr arginfo_class_IntlChar_charAge
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlChar_chr, 0, 1, IS_STRING, 1)
+	ZEND_ARG_TYPE_MASK(0, codepoint, MAY_BE_LONG|MAY_BE_STRING, NULL)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_digit, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlChar_digit, 0, 1, MAY_BE_LONG|MAY_BE_FALSE|MAY_BE_NULL)
 	ZEND_ARG_TYPE_MASK(0, codepoint, MAY_BE_LONG|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, base, IS_LONG, 0, "10")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_enumCharNames, 0, 0, 3)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlChar_enumCharNames, 0, 3, _IS_BOOL, 1)
 	ZEND_ARG_TYPE_MASK(0, start, MAY_BE_LONG|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_MASK(0, end, MAY_BE_LONG|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "IntlChar::UNICODE_CHAR_NAME")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_enumCharTypes, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlChar_enumCharTypes, 0, 1, IS_VOID, 0)
 	ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_foldCase, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlChar_foldCase, 0, 1, MAY_BE_LONG|MAY_BE_STRING|MAY_BE_NULL)
 	ZEND_ARG_TYPE_MASK(0, codepoint, MAY_BE_LONG|MAY_BE_STRING, NULL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "IntlChar::FOLD_CASE_DEFAULT")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_forDigit, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlChar_forDigit, 0, 1, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, digit, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, base, IS_LONG, 0, "10")
 ZEND_END_ARG_INFO()
 
 #if U_ICU_VERSION_MAJOR_NUM >= 52
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_getBidiPairedBracket, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlChar_getBidiPairedBracket, 0, 1, MAY_BE_LONG|MAY_BE_STRING|MAY_BE_NULL)
 	ZEND_ARG_TYPE_MASK(0, codepoint, MAY_BE_LONG|MAY_BE_STRING, NULL)
 ZEND_END_ARG_INFO()
 #endif
 
-#define arginfo_class_IntlChar_getBlockCode arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_getBlockCode arginfo_class_IntlChar_charDigitValue
 
-#define arginfo_class_IntlChar_getCombiningClass arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_getCombiningClass arginfo_class_IntlChar_charDigitValue
 
-#define arginfo_class_IntlChar_getFC_NFKC_Closure arginfo_class_IntlChar_charAge
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlChar_getFC_NFKC_Closure, 0, 1, MAY_BE_STRING|MAY_BE_FALSE|MAY_BE_NULL)
+	ZEND_ARG_TYPE_MASK(0, codepoint, MAY_BE_LONG|MAY_BE_STRING, NULL)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_getIntPropertyMaxValue, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlChar_getIntPropertyMaxValue, 0, 1, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, property, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_IntlChar_getIntPropertyMinValue arginfo_class_IntlChar_getIntPropertyMaxValue
 
-#define arginfo_class_IntlChar_getIntPropertyValue arginfo_class_IntlChar_hasBinaryProperty
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlChar_getIntPropertyValue, 0, 2, IS_LONG, 1)
+	ZEND_ARG_TYPE_MASK(0, codepoint, MAY_BE_LONG|MAY_BE_STRING, NULL)
+	ZEND_ARG_TYPE_INFO(0, property, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlChar_getNumericValue arginfo_class_IntlChar_charAge
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlChar_getNumericValue, 0, 1, IS_DOUBLE, 1)
+	ZEND_ARG_TYPE_MASK(0, codepoint, MAY_BE_LONG|MAY_BE_STRING, NULL)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_getPropertyEnum, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlChar_getPropertyEnum, 0, 1, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, alias, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_getPropertyName, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlChar_getPropertyName, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, property, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "IntlChar::LONG_PROPERTY_NAME")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_getPropertyValueEnum, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlChar_getPropertyValueEnum, 0, 2, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, property, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_getPropertyValueName, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_IntlChar_getPropertyValueName, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, property, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, value, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "IntlChar::LONG_PROPERTY_NAME")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_getUnicodeVersion, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlChar_getUnicodeVersion, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlChar_isalnum arginfo_class_IntlChar_charAge
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlChar_isalnum, 0, 1, _IS_BOOL, 1)
+	ZEND_ARG_TYPE_MASK(0, codepoint, MAY_BE_LONG|MAY_BE_STRING, NULL)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlChar_isalpha arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isalpha arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isbase arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isbase arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isblank arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isblank arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_iscntrl arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_iscntrl arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isdefined arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isdefined arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isdigit arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isdigit arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isgraph arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isgraph arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isIDIgnorable arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isIDIgnorable arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isIDPart arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isIDPart arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isIDStart arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isIDStart arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isISOControl arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isISOControl arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isJavaIDPart arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isJavaIDPart arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isJavaIDStart arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isJavaIDStart arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isJavaSpaceChar arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isJavaSpaceChar arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_islower arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_islower arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isMirrored arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isMirrored arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isprint arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isprint arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_ispunct arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_ispunct arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isspace arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isspace arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_istitle arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_istitle arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isUAlphabetic arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isUAlphabetic arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isULowercase arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isULowercase arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isupper arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isupper arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isUUppercase arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isUUppercase arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isUWhiteSpace arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isUWhiteSpace arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isWhitespace arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isWhitespace arginfo_class_IntlChar_isalnum
 
-#define arginfo_class_IntlChar_isxdigit arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_isxdigit arginfo_class_IntlChar_isalnum
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlChar_ord, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlChar_ord, 0, 1, IS_LONG, 1)
 	ZEND_ARG_TYPE_MASK(0, character, MAY_BE_LONG|MAY_BE_STRING, NULL)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_IntlChar_tolower arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_tolower arginfo_class_IntlChar_charMirror
 
-#define arginfo_class_IntlChar_totitle arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_totitle arginfo_class_IntlChar_charMirror
 
-#define arginfo_class_IntlChar_toupper arginfo_class_IntlChar_charAge
+#define arginfo_class_IntlChar_toupper arginfo_class_IntlChar_charMirror
 
 
 ZEND_METHOD(IntlChar, hasBinaryProperty);