diff --git a/Zend/Optimizer/zend_func_infos.h b/Zend/Optimizer/zend_func_infos.h
index 53cc52ac376bb..1d621749ac0ec 100644
--- a/Zend/Optimizer/zend_func_infos.h
+++ b/Zend/Optimizer/zend_func_infos.h
@@ -62,7 +62,7 @@ static const func_info_t func_infos[] = {
     F1("timezone_open", MAY_BE_OBJECT|MAY_BE_FALSE),
     F1("timezone_name_get", MAY_BE_STRING),
     F1("timezone_name_from_abbr", MAY_BE_STRING|MAY_BE_FALSE),
-    F1("timezone_transitions_get", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_FALSE),
+    F1("timezone_transitions_get", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_FALSE),
     F1("timezone_location_get", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_DOUBLE|MAY_BE_ARRAY_OF_STRING|MAY_BE_FALSE),
     F1("timezone_identifiers_list", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING),
     F1("timezone_abbreviations_list", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ARRAY),
@@ -255,7 +255,7 @@ static const func_info_t func_infos[] = {
     F1("mysqli_fetch_object", MAY_BE_OBJECT|MAY_BE_NULL|MAY_BE_FALSE),
     F1("mysqli_fetch_row", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_ANY|MAY_BE_NULL|MAY_BE_FALSE),
 #if defined(MYSQLI_USE_MYSQLND)
-    F1("mysqli_get_connection_stats", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY),
+    F1("mysqli_get_connection_stats", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY),
 #endif
 #if defined(MYSQLI_USE_MYSQLND)
     F1("mysqli_get_client_stats", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_STRING),
@@ -367,7 +367,7 @@ static const func_info_t func_infos[] = {
     F1("pg_result_error_field", MAY_BE_STRING|MAY_BE_FALSE|MAY_BE_NULL),
     F1("pg_get_result", MAY_BE_OBJECT|MAY_BE_FALSE),
     F1("pg_result_status", MAY_BE_STRING|MAY_BE_LONG),
-    F1("pg_get_notify", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY),
+    F1("pg_get_notify", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_STRING),
     F1("pg_socket", MAY_BE_RESOURCE|MAY_BE_FALSE),
     F1("pg_meta_data", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_FALSE),
     F1("pg_convert", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_FALSE),
diff --git a/ext/date/php_date.stub.php b/ext/date/php_date.stub.php
index 3d5b872df4dd3..a311f0fa0fb61 100644
--- a/ext/date/php_date.stub.php
+++ b/ext/date/php_date.stub.php
@@ -124,7 +124,7 @@ function timezone_name_from_abbr(string $abbr, int $utcOffset = -1, int $isDST =
 function timezone_offset_get(DateTimeZone $object, DateTimeInterface $datetime): int {}
 
 /**
- * @return array<int|string, mixed>|false
+ * @return array<int, array>|false
  * @refcount 1
  */
 function timezone_transitions_get(
@@ -414,7 +414,7 @@ public function getName(): string {}
     public function getOffset(DateTimeInterface $datetime): int {}
 
     /**
-     * @return array<int|string, mixed>|false
+     * @return array<int, array>|false
      * @tentative-return-type
      * @alias timezone_transitions_get
      */
diff --git a/ext/date/php_date_arginfo.h b/ext/date/php_date_arginfo.h
index 7c19e6069fded..982534817b8ca 100644
--- a/ext/date/php_date_arginfo.h
+++ b/ext/date/php_date_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: e4821eb3a38823fe1aee397d8e949fdcaa570a4f */
+ * Stub hash: e4585948a8767182f38b553b603e06555e92c372 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strtotime, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, datetime, IS_STRING, 0)
diff --git a/ext/mysqli/mysqli.stub.php b/ext/mysqli/mysqli.stub.php
index 7f681966bcd26..e0c46a5427bcb 100644
--- a/ext/mysqli/mysqli.stub.php
+++ b/ext/mysqli/mysqli.stub.php
@@ -141,7 +141,7 @@ public function get_client_info(): string {}
 
 #if defined(MYSQLI_USE_MYSQLND)
     /**
-     * @return array<int|string, mixed>
+     * @return array<string, mixed>
      * @tentative-return-type
      * @alias mysqli_get_connection_stats
      */
@@ -727,7 +727,7 @@ function mysqli_free_result(mysqli_result $result): void {}
 
 #if defined(MYSQLI_USE_MYSQLND)
 /**
- * @return array<int|string, mixed>
+ * @return array<string, mixed>
  * @refcount 1
  */
 function mysqli_get_connection_stats(mysqli $mysql): array {}
diff --git a/ext/mysqli/mysqli_arginfo.h b/ext/mysqli/mysqli_arginfo.h
index b40800feb6670..4cd285e347f47 100644
--- a/ext/mysqli/mysqli_arginfo.h
+++ b/ext/mysqli/mysqli_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: be02e12b8984705bcaae9ce16a1e90cb64af5784 */
+ * Stub hash: e9f4dd04e7d01864c38033bcaf5e03b63e191deb */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
 	ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)
diff --git a/ext/pgsql/pgsql.stub.php b/ext/pgsql/pgsql.stub.php
index ecc814bbce76f..230996b9bd32b 100644
--- a/ext/pgsql/pgsql.stub.php
+++ b/ext/pgsql/pgsql.stub.php
@@ -470,7 +470,7 @@ function pg_get_result(PgSql\Connection $connection): PgSql\Result|false {}
     function pg_result_status(PgSql\Result $result, int $mode = PGSQL_STATUS_LONG): string|int {}
 
     /**
-     * @return array<int|string, mixed>
+     * @return array<int|string, int|string>
      * @refcount 1
      */
     function pg_get_notify(PgSql\Connection $connection, int $mode = PGSQL_ASSOC): array|false {}
diff --git a/ext/pgsql/pgsql_arginfo.h b/ext/pgsql/pgsql_arginfo.h
index dc25957ac86cc..6f084ba79d80f 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: 23cb6cbb27e6ecf00c5ad4d18e6e8869a33a86bf */
+ * Stub hash: b64120fb9848f9c2784b5b88608fdc532f8f0c15 */
 
 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)