diff --git a/ext/intl/calendar/calendar.stub.php b/ext/intl/calendar/calendar.stub.php
index 97807b139e0..748d5eaf252 100644
--- a/ext/intl/calendar/calendar.stub.php
+++ b/ext/intl/calendar/calendar.stub.php
@@ -244,7 +244,7 @@ class IntlCalendar
     public function before(IntlCalendar $other): bool {}
 
     /**
-     * @return bool
+     * @return true
      * @alias intlcal_clear
      */
     public function clear(?int $field = null) {} // TODO make return type void
@@ -341,7 +341,7 @@ class IntlCalendar
     public function getMinimalDaysInFirstWeek(): int|false {}
 
     /**
-     * @return bool
+     * @return true
      * @alias intlcal_set_minimal_days_in_first_week
      */
     public function setMinimalDaysInFirstWeek(int $days) {} // TODO make return void
@@ -432,31 +432,31 @@ class IntlCalendar
     public function isSet(int $field): bool {}
 
     /**
-     * @return bool
+     * @return true
      * @alias intlcal_set
      */
     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
+     * @return true
      * @alias intlcal_set_first_day_of_week
      */
     public function setFirstDayOfWeek(int $dayOfWeek) {} // TODO make return type void
 
     /**
-     * @return bool
+     * @return true
      * @alias intlcal_set_lenient
      */
     public function setLenient(bool $lenient) {} // TODO make return type void
 
     /**
-     * @return bool
+     * @return true
      * @alias intlcal_set_repeated_wall_time_option
      */
     public function setRepeatedWallTimeOption(int $option) {} // TODO make return type void
 
     /**
-     * @return bool
+     * @return true
      * @alias intlcal_set_skipped_wall_time_option
      */
     public function setSkippedWallTimeOption(int $option) {} // TODO make return type void
diff --git a/ext/intl/calendar/calendar_arginfo.h b/ext/intl/calendar/calendar_arginfo.h
index 6173d128380..b67149915b9 100644
--- a/ext/intl/calendar/calendar_arginfo.h
+++ b/ext/intl/calendar/calendar_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: ef1b6e5e8ff6890ccb176c08c22499048afdfdb5 */
+ * Stub hash: c1d451a668ccab343208ab5cc30ab8457d6802b9 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
diff --git a/ext/intl/php_intl.stub.php b/ext/intl/php_intl.stub.php
index 8980a807919..eab42fcc0ff 100644
--- a/ext/intl/php_intl.stub.php
+++ b/ext/intl/php_intl.stub.php
@@ -201,12 +201,12 @@ function intlcal_after(IntlCalendar $calendar, IntlCalendar $other): bool {}
 
 function intlcal_before(IntlCalendar $calendar, IntlCalendar $other): bool {}
 
-function intlcal_set(IntlCalendar $calendar, int $year, int $month, int $dayOfMonth = UNKNOWN, int $hour = UNKNOWN, int $minute = UNKNOWN, int $second = UNKNOWN): bool {}
+function intlcal_set(IntlCalendar $calendar, int $year, int $month, int $dayOfMonth = UNKNOWN, int $hour = UNKNOWN, int $minute = UNKNOWN, int $second = UNKNOWN): true {}
 
 /** @param int|bool $value */
 function intlcal_roll(IntlCalendar $calendar, int $field, $value): bool {}
 
-function intlcal_clear(IntlCalendar $calendar, ?int $field = null): bool {}
+function intlcal_clear(IntlCalendar $calendar, ?int $field = null): true {}
 
 function intlcal_field_difference(IntlCalendar $calendar, float $timestamp, int $field): int|false {}
 
@@ -228,7 +228,7 @@ function intlcal_get_maximum(IntlCalendar $calendar, int $field): int|false {}
 
 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_set_minimal_days_in_first_week(IntlCalendar $calendar, int $days): true {}
 
 function intlcal_get_minimum(IntlCalendar $calendar, int $field): int|false {}
 
@@ -248,9 +248,9 @@ function intlcal_is_equivalent_to(IntlCalendar $calendar, IntlCalendar $other):
 
 function intlcal_is_weekend(IntlCalendar $calendar, ?float $timestamp = null): bool {}
 
-function intlcal_set_first_day_of_week(IntlCalendar $calendar, int $dayOfWeek): bool {}
+function intlcal_set_first_day_of_week(IntlCalendar $calendar, int $dayOfWeek): true {}
 
-function intlcal_set_lenient(IntlCalendar $calendar, bool $lenient): bool {}
+function intlcal_set_lenient(IntlCalendar $calendar, bool $lenient): true {}
 
 function intlcal_get_repeated_wall_time_option(IntlCalendar $calendar): int {}
 
@@ -258,9 +258,9 @@ function intlcal_equals(IntlCalendar $calendar, IntlCalendar $other): bool {}
 
 function intlcal_get_skipped_wall_time_option(IntlCalendar $calendar): int {}
 
-function intlcal_set_repeated_wall_time_option(IntlCalendar $calendar, int $option): bool {}
+function intlcal_set_repeated_wall_time_option(IntlCalendar $calendar, int $option): true {}
 
-function intlcal_set_skipped_wall_time_option(IntlCalendar $calendar, int $option): bool {}
+function intlcal_set_skipped_wall_time_option(IntlCalendar $calendar, int $option): true {}
 
 function intlcal_from_date_time(DateTime|string $datetime, ?string $locale = null): ?IntlCalendar {}
 
diff --git a/ext/intl/php_intl_arginfo.h b/ext/intl/php_intl_arginfo.h
index 8f2903315a3..c05ecb7b249 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: 136c14d9162548cd7211985ce9a5d767a90a0b99 */
+ * Stub hash: c32e74bddb55455f69083a302bcaf52f654b1293 */
 
 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")
@@ -50,7 +50,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_intlcal_before arginfo_intlcal_after
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set, 0, 3, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set, 0, 3, IS_TRUE, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
 	ZEND_ARG_TYPE_INFO(0, year, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, month, IS_LONG, 0)
@@ -66,7 +66,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_roll, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_clear, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_clear, 0, 1, IS_TRUE, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, field, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
@@ -103,7 +103,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_intlcal_get_minimal_days_in_first_week arginfo_intlcal_get_first_day_of_week
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set_minimal_days_in_first_week, 0, 2, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set_minimal_days_in_first_week, 0, 2, IS_TRUE, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
 	ZEND_ARG_TYPE_INFO(0, days, IS_LONG, 0)
 ZEND_END_ARG_INFO()
@@ -138,12 +138,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_is_weekend, 0, 1, _IS_BO
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timestamp, IS_DOUBLE, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set_first_day_of_week, 0, 2, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set_first_day_of_week, 0, 2, IS_TRUE, 0)
 	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_set_lenient, 0, 2, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set_lenient, 0, 2, IS_TRUE, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
 	ZEND_ARG_TYPE_INFO(0, lenient, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
@@ -156,7 +156,7 @@ ZEND_END_ARG_INFO()
 
 #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_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set_repeated_wall_time_option, 0, 2, IS_TRUE, 0)
 	ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
 	ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
 ZEND_END_ARG_INFO()
diff --git a/ext/pgsql/pgsql.stub.php b/ext/pgsql/pgsql.stub.php
index fd58fb92c00..f337251d59a 100644
--- a/ext/pgsql/pgsql.stub.php
+++ b/ext/pgsql/pgsql.stub.php
@@ -469,7 +469,7 @@ namespace {
 
     function pg_connect_poll(PgSql\Connection $connection): int {}
 
-    function pg_close(?PgSql\Connection $connection = null): bool {}
+    function pg_close(?PgSql\Connection $connection = null): true {}
 
     /** @refcount 1 */
     function pg_dbname(?PgSql\Connection $connection = null): string {}
@@ -691,7 +691,7 @@ namespace {
 
     function pg_trace(string $filename, string $mode = "w", ?PgSql\Connection $connection = null, int $trace_mode = 0): bool {}
 
-    function pg_untrace(?PgSql\Connection $connection = null): bool {}
+    function pg_untrace(?PgSql\Connection $connection = null): true {}
 
     /**
      * @param PgSql\Connection $connection
diff --git a/ext/pgsql/pgsql_arginfo.h b/ext/pgsql/pgsql_arginfo.h
index 839842bbc39..8fcc2296371 100644
--- a/ext/pgsql/pgsql_arginfo.h
+++ b/ext/pgsql/pgsql_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: f5b563282ffa08a4f79293fcf91df284433a6f5c */
+ * Stub hash: bf714281e441d59e0760e51df9f4050c96319794 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_pg_connect, 0, 1, PgSql\\Connection, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, connection_string, IS_STRING, 0)
@@ -12,7 +12,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_connect_poll, 0, 1, IS_LONG,
 	ZEND_ARG_OBJ_INFO(0, connection, PgSql\\Connection, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_close, 0, 0, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_close, 0, 0, IS_TRUE, 0)
 	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, connection, PgSql\\Connection, 1, "null")
 ZEND_END_ARG_INFO()
 
@@ -41,7 +41,9 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_parameter_status, 0, 1, MAY_B
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_pg_ping arginfo_pg_close
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_ping, 0, 0, _IS_BOOL, 0)
+	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, connection, PgSql\\Connection, 1, "null")
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_pg_query, 0, 1, PgSql\\Result, MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, connection)
@@ -297,7 +299,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_pg_clientencoding arginfo_pg_dbname
 
-#define arginfo_pg_end_copy arginfo_pg_close
+#define arginfo_pg_end_copy arginfo_pg_ping
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_put_line, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_INFO(0, connection)
diff --git a/ext/snmp/snmp.stub.php b/ext/snmp/snmp.stub.php
index 84fc738354a..b02cfd44ee3 100644
--- a/ext/snmp/snmp.stub.php
+++ b/ext/snmp/snmp.stub.php
@@ -125,11 +125,11 @@ function snmpset(string $hostname, string $community, array|string $object_id, a
 
 function snmp_get_quick_print(): bool {}
 
-function snmp_set_quick_print(bool $enable): bool {}
+function snmp_set_quick_print(bool $enable): true {}
 
-function snmp_set_enum_print(bool $enable): bool {}
+function snmp_set_enum_print(bool $enable): true {}
 
-function snmp_set_oid_output_format(int $format): bool {}
+function snmp_set_oid_output_format(int $format): true {}
 
 /** @alias snmp_set_oid_output_format */
 function snmp_set_oid_numeric_print(int $format): bool {}
@@ -175,7 +175,7 @@ function snmp3_set(
     array|string $object_id, array|string $type, array|string $value,
     int $timeout = -1, int $retries = -1): bool {}
 
-function snmp_set_valueretrieval(int $method): bool {}
+function snmp_set_valueretrieval(int $method): true {}
 
 function snmp_get_valueretrieval(): int {}
 
diff --git a/ext/snmp/snmp_arginfo.h b/ext/snmp/snmp_arginfo.h
index bbe95f1dd2c..f3f52e4bcea 100644
--- a/ext/snmp/snmp_arginfo.h
+++ b/ext/snmp/snmp_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: a79a697fa8c1ab2513bde03e0c2367d0caaec7d8 */
+ * Stub hash: 659db99d46c15b508e992d55a1e421f48b51f6e3 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_snmpget, 0, 3, IS_MIXED, 0)
 	ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0)
@@ -36,17 +36,19 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_snmp_get_quick_print, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_snmp_set_quick_print, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_snmp_set_quick_print, 0, 1, IS_TRUE, 0)
 	ZEND_ARG_TYPE_INFO(0, enable, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_snmp_set_enum_print arginfo_snmp_set_quick_print
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_snmp_set_oid_output_format, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_snmp_set_oid_output_format, 0, 1, IS_TRUE, 0)
 	ZEND_ARG_TYPE_INFO(0, format, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_snmp_set_oid_numeric_print arginfo_snmp_set_oid_output_format
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_snmp_set_oid_numeric_print, 0, 1, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, format, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
 #define arginfo_snmp2_get arginfo_snmpget
 
@@ -103,7 +105,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_snmp3_set, 0, 10, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, retries, IS_LONG, 0, "-1")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_snmp_set_valueretrieval, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_snmp_set_valueretrieval, 0, 1, IS_TRUE, 0)
 	ZEND_ARG_TYPE_INFO(0, method, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
diff --git a/ext/spl/spl_array.stub.php b/ext/spl/spl_array.stub.php
index 64855f37d2e..8841fb351ae 100644
--- a/ext/spl/spl_array.stub.php
+++ b/ext/spl/spl_array.stub.php
@@ -45,22 +45,22 @@ class ArrayObject implements IteratorAggregate, ArrayAccess, Serializable, Count
     public function setFlags(int $flags): void {}
 
     /** @tentative-return-type */
-    public function asort(int $flags = SORT_REGULAR): bool {}
+    public function asort(int $flags = SORT_REGULAR): true {}
 
     /** @tentative-return-type */
-    public function ksort(int $flags = SORT_REGULAR): bool {}
+    public function ksort(int $flags = SORT_REGULAR): true {}
 
     /** @tentative-return-type */
-    public function uasort(callable $callback): bool {}
+    public function uasort(callable $callback): true {}
 
     /** @tentative-return-type */
-    public function uksort(callable $callback): bool {}
+    public function uksort(callable $callback): true {}
 
     /** @tentative-return-type */
-    public function natsort(): bool {}
+    public function natsort(): true {}
 
     /** @tentative-return-type */
-    public function natcasesort(): bool {}
+    public function natcasesort(): true {}
 
     /** @tentative-return-type */
     public function unserialize(string $data): void {}
@@ -163,37 +163,37 @@ class ArrayIterator implements SeekableIterator, ArrayAccess, Serializable, Coun
      * @tentative-return-type
      * @implementation-alias ArrayObject::asort
      */
-    public function asort(int $flags = SORT_REGULAR): bool {}
+    public function asort(int $flags = SORT_REGULAR): true {}
 
     /**
      * @tentative-return-type
      * @implementation-alias ArrayObject::ksort
      */
-    public function ksort(int $flags = SORT_REGULAR): bool {}
+    public function ksort(int $flags = SORT_REGULAR): true {}
 
     /**
      * @tentative-return-type
      * @implementation-alias ArrayObject::uasort
      */
-    public function uasort(callable $callback): bool {}
+    public function uasort(callable $callback): true {}
 
     /**
      * @tentative-return-type
      * @implementation-alias ArrayObject::uksort
      */
-    public function uksort(callable $callback): bool {}
+    public function uksort(callable $callback): true {}
 
     /**
      * @tentative-return-type
      * @implementation-alias ArrayObject::natsort
      */
-    public function natsort(): bool {}
+    public function natsort(): true {}
 
     /**
      * @tentative-return-type
      * @implementation-alias ArrayObject::natcasesort
      */
-    public function natcasesort(): bool {}
+    public function natcasesort(): true {}
 
     /**
      * @tentative-return-type
diff --git a/ext/spl/spl_array_arginfo.h b/ext/spl/spl_array_arginfo.h
index 9c1bb5b7b20..de2ec5f1efb 100644
--- a/ext/spl/spl_array_arginfo.h
+++ b/ext/spl/spl_array_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 13e1f68463c2abc1a1ce0e1cff5f47a12407cfc1 */
+ * Stub hash: d0ce4612e25d2b8a765544c835fa2347ae9b23f2 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ArrayObject___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_MASK(0, array, MAY_BE_ARRAY|MAY_BE_OBJECT, "[]")
@@ -40,19 +40,19 @@ ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ArrayObject_setF
 	ZEND_ARG_TYPE_INFO(0, flags, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ArrayObject_asort, 0, 0, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ArrayObject_asort, 0, 0, IS_TRUE, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "SORT_REGULAR")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_ArrayObject_ksort arginfo_class_ArrayObject_asort
 
-ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ArrayObject_uasort, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ArrayObject_uasort, 0, 1, IS_TRUE, 0)
 	ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_ArrayObject_uksort arginfo_class_ArrayObject_uasort
 
-ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ArrayObject_natsort, 0, 0, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ArrayObject_natsort, 0, 0, IS_TRUE, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_ArrayObject_natcasesort arginfo_class_ArrayObject_natsort
@@ -139,7 +139,8 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_ArrayIterator_next arginfo_class_ArrayIterator_rewind
 
-#define arginfo_class_ArrayIterator_valid arginfo_class_ArrayObject_natsort
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ArrayIterator_valid, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ArrayIterator_seek, 0, 1, IS_VOID, 0)
 	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
@@ -147,7 +148,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_ArrayIterator___debugInfo arginfo_class_ArrayObject_getArrayCopy
 
-#define arginfo_class_RecursiveArrayIterator_hasChildren arginfo_class_ArrayObject_natsort
+#define arginfo_class_RecursiveArrayIterator_hasChildren arginfo_class_ArrayIterator_valid
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_RecursiveArrayIterator_getChildren, 0, 0, RecursiveArrayIterator, 1)
 ZEND_END_ARG_INFO()
diff --git a/ext/spl/spl_heap.stub.php b/ext/spl/spl_heap.stub.php
index ac9e4151ea3..a1b4dfdbde3 100644
--- a/ext/spl/spl_heap.stub.php
+++ b/ext/spl/spl_heap.stub.php
@@ -23,7 +23,7 @@ class SplPriorityQueue implements Iterator, Countable
     /** @tentative-return-type */
     public function compare(mixed $priority1, mixed $priority2): int {}
 
-    /** @return bool */
+    /** @return true */
     public function insert(mixed $value, mixed $priority) {} // TODO make return type void
 
     /** @tentative-return-type */
diff --git a/ext/spl/spl_heap_arginfo.h b/ext/spl/spl_heap_arginfo.h
index 42d9590fea2..99eda7e0793 100644
--- a/ext/spl/spl_heap_arginfo.h
+++ b/ext/spl/spl_heap_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 8e4784e749d6c70174a0958e73e4e9907adcd4b5 */
+ * Stub hash: 4045035ec5bee0f951fa31df75c3f42c31bd8be2 */
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SplPriorityQueue_compare, 0, 2, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, priority1, IS_MIXED, 0)
diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
index 9124626b5c5..b2270d66d9e 100755
--- a/ext/standard/basic_functions.stub.php
+++ b/ext/standard/basic_functions.stub.php
@@ -1574,9 +1574,9 @@ function count(Countable|array $value, int $mode = COUNT_NORMAL): int {}
 /** @alias count */
 function sizeof(Countable|array $value, int $mode = COUNT_NORMAL): int {}
 
-function natsort(array &$array): bool {}
+function natsort(array &$array): true {}
 
-function natcasesort(array &$array): bool {}
+function natcasesort(array &$array): true {}
 
 function asort(array &$array, int $flags = SORT_REGULAR): true {}
 
@@ -1584,7 +1584,7 @@ function arsort(array &$array, int $flags = SORT_REGULAR): true {}
 
 function sort(array &$array, int $flags = SORT_REGULAR): true {}
 
-function rsort(array &$array, int $flags = SORT_REGULAR): bool {}
+function rsort(array &$array, int $flags = SORT_REGULAR): true {}
 
 function usort(array &$array, callable $callback): true {}
 
diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
index bb46fb87090..f43ca8f98fc 100644
--- a/ext/standard/basic_functions_arginfo.h
+++ b/ext/standard/basic_functions_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 73f82e392f5adf146b9b8dfb39496b3ce8465115 */
+ * Stub hash: 0d2bffd95e986b632f5fd1afbf8f6464e6bc8759 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -88,7 +88,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_sizeof arginfo_count
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_natsort, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_natsort, 0, 1, IS_TRUE, 0)
 	ZEND_ARG_TYPE_INFO(1, array, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
@@ -100,10 +100,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_sort arginfo_krsort
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_rsort, 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, "SORT_REGULAR")
-ZEND_END_ARG_INFO()
+#define arginfo_rsort arginfo_krsort
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_usort, 0, 2, IS_TRUE, 0)
 	ZEND_ARG_TYPE_INFO(1, array, IS_ARRAY, 0)
@@ -189,9 +186,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_range, 0, 2, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_MASK(0, step, MAY_BE_LONG|MAY_BE_DOUBLE, "1")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shuffle, 0, 1, IS_TRUE, 0)
-	ZEND_ARG_TYPE_INFO(1, array, IS_ARRAY, 0)
-ZEND_END_ARG_INFO()
+#define arginfo_shuffle arginfo_natsort
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_pop, 0, 1, IS_MIXED, 0)
 	ZEND_ARG_TYPE_INFO(1, array, IS_ARRAY, 0)