From c58b12334df9980b8832925c3920b992593eb09a Mon Sep 17 00:00:00 2001
From: =?utf8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Sat, 16 Nov 2019 18:40:06 +0100
Subject: [PATCH] Add union return types with one class

---
 ext/curl/curl.stub.php                 |   6 +-
 ext/gd/gd.stub.php                     |  66 ++++--------
 ext/gd/gd_arginfo.h                    |  34 +++----
 ext/gmp/gmp.stub.php                   | 136 ++++++++-----------------
 ext/gmp/gmp_arginfo.h                  |  29 +++---
 ext/imap/php_imap.stub.php             |  21 ++--
 ext/imap/php_imap_arginfo.h            |   6 +-
 ext/intl/timezone/timezone.stub.php    |   6 +-
 ext/intl/timezone/timezone_arginfo.h   |   8 +-
 ext/libxml/libxml.stub.php             |   3 +-
 ext/libxml/libxml_arginfo.h            |   2 +-
 ext/odbc/odbc.stub.php                 |   7 +-
 ext/odbc/odbc_arginfo.h                |   2 +-
 ext/reflection/reflection.stub.php     |  18 ++--
 ext/reflection/reflection_arginfo.h    |   5 +-
 ext/simplexml/simplexml.stub.php       |   6 +-
 ext/simplexml/simplexml_arginfo.h      |   4 +-
 ext/standard/basic_functions.stub.php  |  18 +---
 ext/standard/basic_functions_arginfo.h |   7 +-
 ext/tidy/tidy.stub.php                 |  26 ++---
 ext/tidy/tidy_arginfo.h                |  16 +--
 ext/xml/xml.stub.php                   |   6 +-
 ext/xml/xml_arginfo.h                  |   4 +-
 ext/xmlwriter/xmlwriter.stub.php       |   9 +-
 ext/xmlwriter/xmlwriter_arginfo.h      |   6 +-
 25 files changed, 172 insertions(+), 279 deletions(-)

diff --git a/ext/curl/curl.stub.php b/ext/curl/curl.stub.php
index 4d9f3ad049..08ad7f6340 100644
--- a/ext/curl/curl.stub.php
+++ b/ext/curl/curl.stub.php
@@ -88,13 +88,9 @@ function curl_pause($handle, int $bitmask): int {}
 /** @param resource $handle */
 function curl_reset($handle): void {}
 
-/**
- * @param resource $handle
- * @param array $options
- */
+/** @param resource $handle */
 function curl_setopt_array($handle, array $options): bool {}
 
-
 /**
  * @param resource $handle
  * @param mixed $value
diff --git a/ext/gd/gd.stub.php b/ext/gd/gd.stub.php
index 5c54c08bc0..a1c9a2f74a 100644
--- a/ext/gd/gd.stub.php
+++ b/ext/gd/gd.stub.php
@@ -6,8 +6,7 @@ function imageloadfont(string $filename): int|false {}
 
 function imagesetstyle($im, array $styles): bool {}
 
-/** @return GdImage|false */
-function imagecreatetruecolor(int $x_size, int $y_size) {}
+function imagecreatetruecolor(int $x_size, int $y_size): GdImage|false {}
 
 function imageistruecolor(GdImage $im): bool {}
 
@@ -41,75 +40,58 @@ function imagecopyresampled(GdImage $dst_im, GdImage $src_im, int $dst_x, int $d
 
 #ifdef PHP_WIN32
 
-/** @return GdImage|false */
-function imagegrabwindow(int $handle, int $client_area = 0) {}
+function imagegrabwindow(int $handle, int $client_area = 0): GdImage|false {}
 
-/** @return GdImage|false */
-function imagegrabscreen() {}
+function imagegrabscreen(): GdImage|false {}
 
 #endif
 
-/** @return GdImage|false */
-function imagerotate(GdImage $im, float $angle, int $bgdcolor, int $ignoretransparent = 0) {}
+function imagerotate(GdImage $im, float $angle, int $bgdcolor, int $ignoretransparent = 0): GdImage|false {}
 
 function imagesettile(GdImage $im, $tile): bool {}
 
 function imagesetbrush(GdImage $im, $brush): bool {}
 
-/** @return GdImage|false */
-function imagecreate(int $x_size, int $y_size) {}
+function imagecreate(int $x_size, int $y_size): GdImage|false {}
 
 function imagetypes(): int {}
 
-/** @return GdImage|false */
-function imagecreatefromstring(string $image) {}
+function imagecreatefromstring(string $image): GdImage|false {}
 
-/** @return GdImage|false */
-function imagecreatefromgif(string $filename) {}
+function imagecreatefromgif(string $filename): GdImage|false {}
 
 #ifdef HAVE_GD_JPG
-/** @return GdImage|false */
-function imagecreatefromjpeg(string $filename) {}
+function imagecreatefromjpeg(string $filename): GdImage|false {}
 #endif
 
 #ifdef HAVE_GD_PNG
-/** @return GdImage|false */
-function imagecreatefrompng(string $filename) {}
+function imagecreatefrompng(string $filename): GdImage|false {}
 #endif
 
 #ifdef HAVE_GD_WEBP
-/** @return GdImage|false */
-function imagecreatefromwebp(string $filename) {}
+function imagecreatefromwebp(string $filename): GdImage|false {}
 #endif
 
-/** @return GdImage|false */
-function imagecreatefromxbm(string $filename) {}
+function imagecreatefromxbm(string $filename): GdImage|false {}
 
 #ifdef HAVE_GD_XPM
-/** @return GdImage|false */
-function imagecreatefromxpm(string $filename) {}
+function imagecreatefromxpm(string $filename): GdImage|false {}
 #endif
 
-/** @return GdImage|false */
-function imagecreatefromwbmp(string $filename) {}
+function imagecreatefromwbmp(string $filename): GdImage|false {}
 
-/** @return GdImage|false */
-function imagecreatefromgd(string $filename) {}
+function imagecreatefromgd(string $filename): GdImage|false {}
 
-/** @return GdImage|false */
-function imagecreatefromgd2(string $filename) {}
+function imagecreatefromgd2(string $filename): GdImage|false {}
 
-/** @return GdImage|false */
-function imagecreatefromgd2part(string $filename, int $srcX, int $srcY, int $width, int $height) {}
+function imagecreatefromgd2part(string $filename, int $srcX, int $srcY, int $width, int $height): GdImage|false {}
 
 #ifdef HAVE_GD_BMP
-/** @return GdImage|false */
-function imagecreatefrombmp(string $filename) {}
+function imagecreatefrombmp(string $filename): GdImage|false {}
 #endif
 
 #ifdef HAVE_GD_TGA
-/** @return GdImage|false */
-function imagecreatefromtga(string $filename) {}
+function imagecreatefromtga(string $filename): GdImage|false {}
 #endif
 
 function imagexbm(GdImage $im, ?string $filename, int $foreground = UNKNOWN): bool {}
@@ -238,17 +220,13 @@ function imageflip(GdImage $im, int $mode): bool {}
 
 function imageantialias(GdImage $im, bool $on): bool {}
 
-/** @return GdImage|false */
-function imagecrop(GdImage $im, array $rect) {}
+function imagecrop(GdImage $im, array $rect): GdImage|false {}
 
-/** @return GdImage|false */
-function imagecropauto(GdImage $im, int $mode = IMG_CROP_DEFAULT, float $threshold = 0.5, int $color = -1) {}
+function imagecropauto(GdImage $im, int $mode = IMG_CROP_DEFAULT, float $threshold = 0.5, int $color = -1): GdImage|false {}
 
-/** @return GdImage|false */
-function imagescale(GdImage $im, int $new_width, int $new_height = UNKNOWN, int $mode = IMG_BILINEAR_FIXED) {}
+function imagescale(GdImage $im, int $new_width, int $new_height = UNKNOWN, int $mode = IMG_BILINEAR_FIXED): GdImage|false {}
 
-/** @return GdImage|false */
-function imageaffine(GdImage $im, array $affine, array $clip = UNKNOWN) {}
+function imageaffine(GdImage $im, array $affine, array $clip = UNKNOWN): GdImage|false {}
 
 function imageaffinematrixget(int $type, $options = UNKNOWN): array|false {}
 
diff --git a/ext/gd/gd_arginfo.h b/ext/gd/gd_arginfo.h
index 42e6fd699d..2ef5857048 100644
--- a/ext/gd/gd_arginfo.h
+++ b/ext/gd/gd_arginfo.h
@@ -12,7 +12,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagesetstyle, 0, 2, _IS_BOOL, 0
 	ZEND_ARG_TYPE_INFO(0, styles, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatetruecolor, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatetruecolor, 0, 2, GdImage, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, x_size, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, y_size, IS_LONG, 0)
 ZEND_END_ARG_INFO()
@@ -103,18 +103,18 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagecopyresampled, 0, 10, _IS_B
 ZEND_END_ARG_INFO()
 
 #if defined(PHP_WIN32)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegrabwindow, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagegrabwindow, 0, 1, GdImage, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, handle, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, client_area, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 #endif
 
 #if defined(PHP_WIN32)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegrabscreen, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagegrabscreen, 0, 0, GdImage, MAY_BE_FALSE)
 ZEND_END_ARG_INFO()
 #endif
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imagerotate, 0, 0, 3)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagerotate, 0, 3, GdImage, MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
 	ZEND_ARG_TYPE_INFO(0, angle, IS_DOUBLE, 0)
 	ZEND_ARG_TYPE_INFO(0, bgdcolor, IS_LONG, 0)
@@ -136,28 +136,28 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imagetypes, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefromstring, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefromstring, 0, 1, GdImage, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, image, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefromgif, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefromgif, 0, 1, GdImage, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #if defined(HAVE_GD_JPG)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefromjpeg, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefromjpeg, 0, 1, GdImage, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_GD_PNG)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefrompng, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefrompng, 0, 1, GdImage, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_GD_WEBP)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefromwebp, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefromwebp, 0, 1, GdImage, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 #endif
@@ -165,7 +165,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_imagecreatefromxbm arginfo_imagecreatefromgif
 
 #if defined(HAVE_GD_XPM)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefromxpm, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefromxpm, 0, 1, GdImage, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 #endif
@@ -176,7 +176,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_imagecreatefromgd2 arginfo_imagecreatefromgif
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefromgd2part, 0, 0, 5)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefromgd2part, 0, 5, GdImage, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, srcX, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, srcY, IS_LONG, 0)
@@ -185,13 +185,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefromgd2part, 0, 0, 5)
 ZEND_END_ARG_INFO()
 
 #if defined(HAVE_GD_BMP)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefrombmp, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefrombmp, 0, 1, GdImage, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_GD_TGA)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecreatefromtga, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecreatefromtga, 0, 1, GdImage, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 #endif
@@ -521,26 +521,26 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_imageantialias, 0, 2, _IS_BOOL,
 	ZEND_ARG_TYPE_INFO(0, on, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecrop, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecrop, 0, 2, GdImage, MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
 	ZEND_ARG_TYPE_INFO(0, rect, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecropauto, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagecropauto, 0, 1, GdImage, MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
 	ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, threshold, IS_DOUBLE, 0)
 	ZEND_ARG_TYPE_INFO(0, color, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imagescale, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imagescale, 0, 2, GdImage, MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
 	ZEND_ARG_TYPE_INFO(0, new_width, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, new_height, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imageaffine, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imageaffine, 0, 2, GdImage, MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, im, GdImage, 0)
 	ZEND_ARG_TYPE_INFO(0, affine, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, clip, IS_ARRAY, 0)
diff --git a/ext/gmp/gmp.stub.php b/ext/gmp/gmp.stub.php
index e05fb4bf53..7f576ca0c1 100644
--- a/ext/gmp/gmp.stub.php
+++ b/ext/gmp/gmp.stub.php
@@ -1,13 +1,9 @@
 <?php
 
-/**
- * @param int|bool|string $number
- * @return GMP|false
- */
-function gmp_init($number, int $base = 0) {}
+/** @param int|bool|string $number */
+function gmp_init($number, int $base = 0): GMP|false {}
 
-/** @return GMP|false */
-function gmp_import(string $data, int $word_size = 1, int $options = GMP_MSW_FIRST | GMP_NATIVE_ENDIAN) {}
+function gmp_import(string $data, int $word_size = 1, int $options = GMP_MSW_FIRST | GMP_NATIVE_ENDIAN): GMP|false {}
 
 /** @param GMP|int|bool|string $gmpnumber */
 function gmp_export($gmpnumber, int $word_size = 1, int $options = GMP_MSW_FIRST | GMP_NATIVE_ENDIAN): string|false {}
@@ -15,32 +11,26 @@ function gmp_export($gmpnumber, int $word_size = 1, int $options = GMP_MSW_FIRST
 /** @param GMP|int|bool|string $gmpnumber */
 function gmp_intval($gmpnumber): int {}
 
-/**
- * @param GMP|int|bool|string $gmpnumber
- * @return GMP|false
- */
-function gmp_strval($gmpnumber, int $base = 10) {}
+/** @param GMP|int|bool|string $gmpnumber */
+function gmp_strval($gmpnumber, int $base = 10): string|false {}
 
-    /**
+/**
  * @param GMP|int|bool|string $a
  * @param GMP|int|bool|string $b
- * @return GMP|false
  */
-function gmp_add($a, $b) {}
+function gmp_add($a, $b): GMP|false {}
 
 /**
  * @param GMP|int|bool|string $a
  * @param GMP|int|bool|string $b
- * @return GMP|false
  */
-function gmp_sub($a, $b) {}
+function gmp_sub($a, $b): GMP|false {}
 
 /**
  * @param GMP|int|bool|string $a
  * @param GMP|int|bool|string $b
- * @return GMP|false
  */
-function gmp_mul($a, $b) {}
+function gmp_mul($a, $b): GMP|false {}
 
 /**
  * @param GMP|int|bool|string $a
@@ -51,87 +41,63 @@ function gmp_div_qr($a, $b, int $round = GMP_ROUND_ZERO): array|false {}
 /**
  * @param GMP|int|bool|string $a
  * @param GMP|int|bool|string $b
- * @return GMP|false
  */
-function gmp_div_q($a, $b, int $round = GMP_ROUND_ZERO) {}
+function gmp_div_q($a, $b, int $round = GMP_ROUND_ZERO): GMP|false {}
 
 /**
  * @param GMP|int|bool|string $a
  * @param GMP|int|bool|string $b
- * @return GMP|false
  */
-function gmp_div_r($a, $b, int $round = GMP_ROUND_ZERO) {}
+function gmp_div_r($a, $b, int $round = GMP_ROUND_ZERO): GMP|false {}
 
 /**
  * @param GMP|int|bool|string $a
  * @param GMP|int|bool|string $b
- * @return GMP|false
  */
-function gmp_div($a, $b, int $round = GMP_ROUND_ZERO) {}
+function gmp_div($a, $b, int $round = GMP_ROUND_ZERO): GMP|false {}
 
 /**
  * @param GMP|int|bool|string $a
  * @param GMP|int|bool|string $b
- * @return GMP|false
  */
-function gmp_mod($a, $b) {}
+function gmp_mod($a, $b): GMP|false {}
 
 /**
  * @param GMP|int|bool|string $a
  * @param GMP|int|bool|string $b
- * @return GMP|false
  */
-function gmp_divexact($a, $b) {}
+function gmp_divexact($a, $b): GMP|false {}
 
-/**
- * @param GMP|int|bool|string $a
- * @return GMP|false
- */
-function gmp_neg($a) {}
+/** @param GMP|int|bool|string $a */
+function gmp_neg($a): GMP|false {}
 
-/**
- * @param GMP|int|bool|string $a
- * @return GMP|false
- */
-function gmp_abs($a) {}
+/** @param GMP|int|bool|string $a */
+function gmp_abs($a): GMP|false {}
 
-/**
- * @param GMP|int $a
- * @return GMP|false
- */
-function gmp_fact($a) {}
+/** @param GMP|int $a */
+function gmp_fact($a): GMP|false {}
 
-/**
- * @param GMP|int|bool|string $a
- * @return GMP|false
- */
-function gmp_sqrt($a) {}
+/** @param GMP|int|bool|string $a */
+function gmp_sqrt($a): GMP|false {}
 
 /** @param GMP|int|bool|string $a */
 function gmp_sqrtrem($a): array|false {}
 
-/**
- * @param GMP|int|bool|string $a
- * @return GMP|false
- **/
-function gmp_root($a, int $nth) {}
+/** @param GMP|int|bool|string $a **/
+function gmp_root($a, int $nth): GMP|false {}
 
 /** @param GMP|int|bool|string $a **/
 function gmp_rootrem($a, int $nth): array|false {}
 
-/**
- * @param GMP|int|bool|string $base
- * @return GMP|false
- **/
-function gmp_pow($base, int $exp) {}
+/** @param GMP|int|bool|string $base **/
+function gmp_pow($base, int $exp): GMP|false {}
 
 /**
  * @param GMP|int|bool|string $base
  * @param GMP|int|bool|string $exp
  * @param GMP|int|bool|string $mod
- * @return GMP|false
  **/
-function gmp_powm($base, $exp, $mod) {}
+function gmp_powm($base, $exp, $mod): GMP|false {}
 
 /** @param GMP|int|bool|string $a **/
 function gmp_perfect_square($a): bool {}
@@ -145,30 +111,26 @@ function gmp_prob_prime($a, int $reps = 10): int|false {}
 /**
  * @param GMP|int|bool|string $a
  * @param GMP|int|bool|string $b
- * @return GMP|false
  */
-function gmp_gcd($a, $b) {}
+function gmp_gcd($a, $b): GMP|false {}
 
 /**
  * @param GMP|int|bool|string $a
  * @param GMP|int|bool|string $b
- * @return GMP
  */
-function gmp_gcdext($a, $b) {}
+function gmp_gcdext($a, $b): array|false {}
 
 /**
  * @param GMP|int|bool|string $a
  * @param GMP|int|bool|string $b
- * @return GMP|false
  */
-function gmp_lcm($a, $b) {}
+function gmp_lcm($a, $b): GMP|false {}
 
 /**
  * @param GMP|int|bool|string $a
  * @param GMP|int|bool|string $b
- * @return GMP|false
  */
-function gmp_invert($a, $b) {}
+function gmp_invert($a, $b): GMP|false {}
 
 /**
  * @param GMP|int|bool|string $a
@@ -200,42 +162,34 @@ function gmp_sign($a): int|false {}
 /** @param GMP|int|bool|string $seed */
 function gmp_random_seed($seed): ?bool {}
 
-/** @return GMP|false */
-function gmp_random_bits(int $bits) {}
+function gmp_random_bits(int $bits): GMP|false {}
 
 /**
  * @param GMP|int|bool|string $min
  * @param GMP|int|bool|string $max
- * @return GMP|false
  **/
-function gmp_random_range($min, $max) {}
+function gmp_random_range($min, $max): GMP|false {}
 
 /**
  * @param GMP|int|bool|string $a
  * @param GMP|int|bool|string $b
- * @return GMP|false
  */
-function gmp_and($a, $b) {}
+function gmp_and($a, $b): GMP|false {}
 
 /**
  * @param GMP|int|bool|string $a
  * @param GMP|int|bool|string $b
- * @return GMP|false
  */
-function gmp_or($a, $b) {}
+function gmp_or($a, $b): GMP|false {}
 
-/**
- * @param GMP|int|bool|string $a
- * @return GMP|false
- */
-function gmp_com($a) {}
+/** @param GMP|int|bool|string $a */
+function gmp_com($a): GMP|false {}
 
 /**
  * @param GMP|int|bool|string $a
  * @param GMP|int|bool|string $b
- * @return GMP|false
  */
-function gmp_xor($a, $b) {}
+function gmp_xor($a, $b): GMP|false {}
 
 function gmp_setbit(GMP $a, int $index, bool $set_clear = true): ?bool {}
 
@@ -259,14 +213,8 @@ function gmp_popcount($a): int|false {}
  */
 function gmp_hamdist($a, $b): int|false {}
 
-/**
- * @param GMP|int|bool|string $a
- * @return GMP|false
- */
-function gmp_nextprime($a) {}
+/** @param GMP|int|bool|string $a */
+function gmp_nextprime($a): GMP|false {}
 
-/**
- * @param GMP|int|bool|string $a
- * @return GMP|false
- */
-function gmp_binomial($a, int $b) {}
+/** @param GMP|int|bool|string $a */
+function gmp_binomial($a, int $b): GMP|false {}
diff --git a/ext/gmp/gmp_arginfo.h b/ext/gmp/gmp_arginfo.h
index c1729432ba..714bd046e2 100644
--- a/ext/gmp/gmp_arginfo.h
+++ b/ext/gmp/gmp_arginfo.h
@@ -1,11 +1,11 @@
 /* This is a generated file, edit the .stub.php file instead. */
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_init, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_gmp_init, 0, 1, GMP, MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, number)
 	ZEND_ARG_TYPE_INFO(0, base, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_import, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_gmp_import, 0, 1, GMP, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, word_size, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0)
@@ -21,12 +21,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_intval, 0, 1, IS_LONG, 0)
 	ZEND_ARG_INFO(0, gmpnumber)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_strval, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_gmp_strval, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, gmpnumber)
 	ZEND_ARG_TYPE_INFO(0, base, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_add, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_gmp_add, 0, 2, GMP, MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, a)
 	ZEND_ARG_INFO(0, b)
 ZEND_END_ARG_INFO()
@@ -41,7 +41,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_gmp_div_qr, 0, 2, MAY_BE_ARRAY|M
 	ZEND_ARG_TYPE_INFO(0, round, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_div_q, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_gmp_div_q, 0, 2, GMP, MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, a)
 	ZEND_ARG_INFO(0, b)
 	ZEND_ARG_TYPE_INFO(0, round, IS_LONG, 0)
@@ -55,7 +55,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_gmp_divexact arginfo_gmp_add
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_neg, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_gmp_neg, 0, 1, GMP, MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, a)
 ZEND_END_ARG_INFO()
 
@@ -69,7 +69,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_gmp_sqrtrem, 0, 1, MAY_BE_ARRAY|
 	ZEND_ARG_INFO(0, a)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_root, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_gmp_root, 0, 2, GMP, MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, a)
 	ZEND_ARG_TYPE_INFO(0, nth, IS_LONG, 0)
 ZEND_END_ARG_INFO()
@@ -79,12 +79,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_gmp_rootrem, 0, 2, MAY_BE_ARRAY|
 	ZEND_ARG_TYPE_INFO(0, nth, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_pow, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_gmp_pow, 0, 2, GMP, MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, base)
 	ZEND_ARG_TYPE_INFO(0, exp, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_powm, 0, 0, 3)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_gmp_powm, 0, 3, GMP, MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, base)
 	ZEND_ARG_INFO(0, exp)
 	ZEND_ARG_INFO(0, mod)
@@ -103,7 +103,10 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_gmp_gcd arginfo_gmp_add
 
-#define arginfo_gmp_gcdext arginfo_gmp_add
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_gmp_gcdext, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE)
+	ZEND_ARG_INFO(0, a)
+	ZEND_ARG_INFO(0, b)
+ZEND_END_ARG_INFO()
 
 #define arginfo_gmp_lcm arginfo_gmp_add
 
@@ -128,11 +131,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gmp_random_seed, 0, 1, _IS_BOOL,
 	ZEND_ARG_INFO(0, seed)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_random_bits, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_gmp_random_bits, 0, 1, GMP, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, bits, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_random_range, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_gmp_random_range, 0, 2, GMP, MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, min)
 	ZEND_ARG_INFO(0, max)
 ZEND_END_ARG_INFO()
@@ -174,7 +177,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_gmp_nextprime arginfo_gmp_neg
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_binomial, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_gmp_binomial, 0, 2, GMP, MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, a)
 	ZEND_ARG_TYPE_INFO(0, b, IS_LONG, 0)
 ZEND_END_ARG_INFO()
diff --git a/ext/imap/php_imap.stub.php b/ext/imap/php_imap.stub.php
index 241edd6b47..e1b1534008 100644
--- a/ext/imap/php_imap.stub.php
+++ b/ext/imap/php_imap.stub.php
@@ -24,11 +24,8 @@ function imap_num_recent($stream_id): int|false {}
 /** @param resource $stream_id */
 function imap_headers($stream_id): array|false {}
 
-/**
- * @param resource $stream_id
- * @return \stdClass|false
- */
-function imap_headerinfo($stream_id, int $msg_no, int $from_length = 0, int $subject_length = 0, string $default_host = UNKNOWN) {}
+/** @param resource $stream_id */
+function imap_headerinfo($stream_id, int $msg_no, int $from_length = 0, int $subject_length = 0, string $default_host = UNKNOWN): stdClass|false {}
 
 function imap_rfc822_parse_headers(string $headers, string $default_host = 'UNKNOWN'): \stdClass {}
 
@@ -60,11 +57,8 @@ function imap_savebody($stream_id, $file, int $msg_no, string $section = '', int
 /** @param resource $stream_id */
 function imap_fetchheader($stream_id, int $msg_no, int $options = 0): string|false {}
 
-/**
- * @param resource $stream_id
- * @return \stdClass|false
- */
-function imap_fetchstructure($stream_id, int $msg_no, int $options = 0) {}
+/** @param resource $stream_id */
+function imap_fetchstructure($stream_id, int $msg_no, int $options = 0): stdClass|false {}
 
 /**
  * @param resource $stream_id
@@ -86,11 +80,8 @@ function imap_delete($stream_id, string $msg_no, int $options = 0): bool {}
  */
 function imap_undelete($stream_id, string $msg_no, int $options = 0): bool {}
 
-/**
- * @param resource $stream_id
- * @return \stdClass|false
- */
-function imap_check($stream_id) {}
+/** @param resource $stream_id */
+function imap_check($stream_id): stdClass|false {}
 
 /** @param resource $stream_id */
 function imap_listscan($stream_id, string $ref, string $pattern, string $content): array|false {}
diff --git a/ext/imap/php_imap_arginfo.h b/ext/imap/php_imap_arginfo.h
index cef03f3cf6..74fb1f7afb 100644
--- a/ext/imap/php_imap_arginfo.h
+++ b/ext/imap/php_imap_arginfo.h
@@ -31,7 +31,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_imap_headers, 0, 1, MAY_BE_ARRAY
 	ZEND_ARG_INFO(0, stream_id)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_headerinfo, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imap_headerinfo, 0, 2, stdClass, MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, stream_id)
 	ZEND_ARG_TYPE_INFO(0, msg_no, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, from_length, IS_LONG, 0)
@@ -86,7 +86,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_imap_fetchheader arginfo_imap_body
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_fetchstructure, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imap_fetchstructure, 0, 2, stdClass, MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, stream_id)
 	ZEND_ARG_TYPE_INFO(0, msg_no, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0)
@@ -109,7 +109,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_imap_undelete arginfo_imap_delete
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_check, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imap_check, 0, 1, stdClass, MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, stream_id)
 ZEND_END_ARG_INFO()
 
diff --git a/ext/intl/timezone/timezone.stub.php b/ext/intl/timezone/timezone.stub.php
index 2a9a2be39c..06f5424aa4 100644
--- a/ext/intl/timezone/timezone.stub.php
+++ b/ext/intl/timezone/timezone.stub.php
@@ -93,8 +93,7 @@ function intltz_create_enumeration($countryOrRawOffset = null) {}
 
 function intltz_create_time_zone(string $zoneId): ?IntlTimeZone {}
 
-/** @return IntlIterator|false */
-function intltz_create_time_zone_id_enumeration(int $zoneType, ?string $region = null, ?int $rawOffset = null) {}
+function intltz_create_time_zone_id_enumeration(int $zoneType, ?string $region = null, ?int $rawOffset = null): IntlIterator|false {}
 
 function intltz_from_date_time_zone(DateTimeZone $zone): ?IntlTimeZone {}
 
@@ -132,7 +131,6 @@ function intltz_get_id_for_windows_id(string $timezone, string $region = UNKNOWN
 
 function intltz_has_same_rules(IntlTimeZone $tz, IntlTimeZone $otherTimeZone): bool {}
 
-/** @return DateTimeZone|false */
-function intltz_to_date_time_zone(IntlTimeZone $tz) {}
+function intltz_to_date_time_zone(IntlTimeZone $tz): DateTimeZone|false {}
 
 function intltz_use_daylight_time(IntlTimeZone $tz): bool {}
diff --git a/ext/intl/timezone/timezone_arginfo.h b/ext/intl/timezone/timezone_arginfo.h
index 72a3c964c6..8cf82ef56a 100644
--- a/ext/intl/timezone/timezone_arginfo.h
+++ b/ext/intl/timezone/timezone_arginfo.h
@@ -100,7 +100,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_intltz_create_time_zone, 0, 1, In
 	ZEND_ARG_TYPE_INFO(0, zoneId, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_intltz_create_time_zone_id_enumeration arginfo_class_IntlTimeZone_createTimeZoneIDEnumeration
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_intltz_create_time_zone_id_enumeration, 0, 1, IntlIterator, MAY_BE_FALSE)
+	ZEND_ARG_TYPE_INFO(0, zoneType, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, region, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, rawOffset, IS_LONG, 1)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_intltz_from_date_time_zone, 0, 1, IntlTimeZone, 1)
 	ZEND_ARG_OBJ_INFO(0, zone, DateTimeZone, 0)
@@ -174,7 +178,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intltz_has_same_rules, 0, 2, _IS
 	ZEND_ARG_OBJ_INFO(0, otherTimeZone, IntlTimeZone, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_intltz_to_date_time_zone, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_intltz_to_date_time_zone, 0, 1, DateTimeZone, MAY_BE_FALSE)
 	ZEND_ARG_OBJ_INFO(0, tz, IntlTimeZone, 0)
 ZEND_END_ARG_INFO()
 
diff --git a/ext/libxml/libxml.stub.php b/ext/libxml/libxml.stub.php
index 0e02c39deb..7022b2e1f8 100644
--- a/ext/libxml/libxml.stub.php
+++ b/ext/libxml/libxml.stub.php
@@ -5,8 +5,7 @@ function libxml_set_streams_context($context): void {}
 
 function libxml_use_internal_errors(bool $use_errors = UNKNOWN): bool {}
 
-/** @return LibXMLError|false */
-function libxml_get_last_error() {}
+function libxml_get_last_error(): LibXMLError|false {}
 
 function libxml_get_errors(): array {}
 
diff --git a/ext/libxml/libxml_arginfo.h b/ext/libxml/libxml_arginfo.h
index de111273d8..0df59c30ca 100644
--- a/ext/libxml/libxml_arginfo.h
+++ b/ext/libxml/libxml_arginfo.h
@@ -8,7 +8,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_libxml_use_internal_errors, 0, 0
 	ZEND_ARG_TYPE_INFO(0, use_errors, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_libxml_get_last_error, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_libxml_get_last_error, 0, 0, LibXMLError, MAY_BE_FALSE)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_libxml_get_errors, 0, 0, IS_ARRAY, 0)
diff --git a/ext/odbc/odbc.stub.php b/ext/odbc/odbc.stub.php
index fa7dedd665..9eafe46ae5 100644
--- a/ext/odbc/odbc.stub.php
+++ b/ext/odbc/odbc.stub.php
@@ -38,11 +38,8 @@ function odbc_exec($connection_id, string $query, int $flags = UNKNOWN) {}
 function odbc_do($connection_id, string $query, int $flags = UNKNOWN) {}
 
 #ifdef PHP_ODBC_HAVE_FETCH_HASH
-/**
- * @param resource $result
- * @return stdClass|false
- */
-function odbc_fetch_object($result, int $rownumber = -1) {}
+/** @param resource $result */
+function odbc_fetch_object($result, int $rownumber = -1): stdClass|false {}
 
 /** @param resource $result */
 function odbc_fetch_array($result, int $rownumber = -1): array|false {}
diff --git a/ext/odbc/odbc_arginfo.h b/ext/odbc/odbc_arginfo.h
index 162d8cfdd1..41f00cb2a0 100644
--- a/ext/odbc/odbc_arginfo.h
+++ b/ext/odbc/odbc_arginfo.h
@@ -43,7 +43,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_odbc_do arginfo_odbc_exec
 
 #if defined(PHP_ODBC_HAVE_FETCH_HASH)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_object, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_odbc_fetch_object, 0, 1, stdClass, MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, result)
 	ZEND_ARG_TYPE_INFO(0, rownumber, IS_LONG, 0)
 ZEND_END_ARG_INFO()
diff --git a/ext/reflection/reflection.stub.php b/ext/reflection/reflection.stub.php
index b9cb156e7d..11bb6c6433 100644
--- a/ext/reflection/reflection.stub.php
+++ b/ext/reflection/reflection.stub.php
@@ -112,7 +112,7 @@ class ReflectionFunction extends ReflectionFunctionAbstract
     public function isDisabled() {}
 
     public function invoke(...$args) {}
-    
+
     public function invokeArgs(array $args) {}
 
     /** @return Closure */
@@ -199,7 +199,7 @@ class ReflectionMethod extends ReflectionFunctionAbstract
 class ReflectionClass implements Reflector
 {
     final private function __clone() {}
-    
+
     public static function export($argument, bool $return = false) {}
 
     /** @param object|string $argument */
@@ -258,7 +258,7 @@ class ReflectionClass implements Reflector
 
     /** @return ReflectionProperty[] */
     public function getProperties(?int $filter = null) {}
-        
+
     /** @return bool */
     public function hasConstant(string $name) {}
 
@@ -607,7 +607,7 @@ class ReflectionZendExtension implements Reflector
     final private function __clone() {}
 
     public static function export($name, bool $return = false) {}
-    
+
     public function __construct(string $name) {}
 
     /** @return string */
@@ -631,14 +631,10 @@ class ReflectionZendExtension implements Reflector
 
 final class ReflectionReference
 {
-    /**
-     * @param int|string $key
-     * @return ?ReflectionReference
-     */
-    public static function fromArrayElement(array $array, $key) {}
+    /** @param int|string $key */
+    public static function fromArrayElement(array $array, $key): ?ReflectionReference {}
 
-    /** @return string */
-    public function getId() {}
+    public function getId(): string {}
 
     private function __clone() {}
 
diff --git a/ext/reflection/reflection_arginfo.h b/ext/reflection/reflection_arginfo.h
index d5404d9b31..078a793c9b 100644
--- a/ext/reflection/reflection_arginfo.h
+++ b/ext/reflection/reflection_arginfo.h
@@ -479,12 +479,13 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_ReflectionZendExtension_getCopyright arginfo_class_Reflector___toString
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ReflectionReference_fromArrayElement, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_ReflectionReference_fromArrayElement, 0, 2, ReflectionReference, 1)
 	ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
 	ZEND_ARG_INFO(0, key)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_ReflectionReference_getId arginfo_class_Reflector___toString
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ReflectionReference_getId, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
 #define arginfo_class_ReflectionReference___clone arginfo_class_Reflector___toString
 
diff --git a/ext/simplexml/simplexml.stub.php b/ext/simplexml/simplexml.stub.php
index dbbbfcba92..3a1d0d51f4 100644
--- a/ext/simplexml/simplexml.stub.php
+++ b/ext/simplexml/simplexml.stub.php
@@ -1,10 +1,8 @@
 <?php
 
-/** @return SimpleXMLElement|false */
-function simplexml_load_file(string $filename, ?string $class_name = SimpleXMLElement::class, int $options = 0, string $ns = '', bool $is_prefix = false) {}
+function simplexml_load_file(string $filename, ?string $class_name = SimpleXMLElement::class, int $options = 0, string $ns = '', bool $is_prefix = false): SimpleXMLElement|false {}
 
-/** @return SimpleXMLElement|false */
-function simplexml_load_string(string $data, ?string $class_name = SimpleXMLElement::class, int $options = 0, string $ns = '', bool $is_prefix = false) {}
+function simplexml_load_string(string $data, ?string $class_name = SimpleXMLElement::class, int $options = 0, string $ns = '', bool $is_prefix = false): SimpleXMLElement|false {}
 
 function simplexml_import_dom(DOMNode $node, ?string $class_name = SimpleXMLElement::class): ?SimpleXMLElement {}
 
diff --git a/ext/simplexml/simplexml_arginfo.h b/ext/simplexml/simplexml_arginfo.h
index ccbbb47d00..b44426beeb 100644
--- a/ext/simplexml/simplexml_arginfo.h
+++ b/ext/simplexml/simplexml_arginfo.h
@@ -1,6 +1,6 @@
 /* This is a generated file, edit the .stub.php file instead. */
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexml_load_file, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_simplexml_load_file, 0, 1, SimpleXMLElement, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, class_name, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0)
@@ -8,7 +8,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexml_load_file, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, is_prefix, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexml_load_string, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_simplexml_load_string, 0, 1, SimpleXMLElement, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, class_name, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0)
diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
index ba7e17d7bc..e4fdec71d4 100755
--- a/ext/standard/basic_functions.stub.php
+++ b/ext/standard/basic_functions.stub.php
@@ -59,8 +59,8 @@ function krsort(array &$arg, int $sort_flags = SORT_REGULAR): bool {}
 
 function ksort(array &$arg, int $sort_flags = SORT_REGULAR): bool {}
 
-/** @param array|Countable $var */
-function count($var, int $mode = COUNT_NORAML): int {}
+/** @param mixed $var */
+function count($var, int $mode = COUNT_NORMAL): int {}
 
 function natsort(array &$arg): bool {}
 
@@ -549,10 +549,6 @@ function explode(string $separator, string $str, int $limit = PHP_INT_MAX): arra
  */
 function implode($glue, $pieces = UNKNOWN): string {}
 
-/**
- * @param string $str Optional - defaults to previous string
- * @param string $token
- */
 function strtok(string $str, string $token = UNKNOWN): string|false {}
 
 function strtoupper(string $str): string {}
@@ -721,11 +717,8 @@ class Directory
  */
 function opendir(string $path, $context = UNKNOWN) {}
 
-/**
- * @param resource $context
- * @return Directory|false
- */
-function dir(string $path, $context = UNKNOWN) {}
+/** @param resource $context */
+function dir(string $path, $context = UNKNOWN): Directory|false {}
 
 /** @param resource $dir_handle */
 function closedir($dir_handle = UNKNOWN): void {}
@@ -865,8 +858,7 @@ function mail(string $to, string $subject, string $message, $additional_headers
 
 /* math.c */
 
-/** @param int|float $number */
-function abs($number): int|float {}
+function abs(int|float $number): int|float {}
 
 function ceil(float $number): float {}
 
diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
index 82d15731cb..37edc1db21 100755
--- a/ext/standard/basic_functions_arginfo.h
+++ b/ext/standard/basic_functions_arginfo.h
@@ -1102,7 +1102,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_opendir, 0, 0, 1)
 	ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-#define arginfo_dir arginfo_opendir
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_dir, 0, 1, Directory, MAY_BE_FALSE)
+	ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 0)
+	ZEND_ARG_INFO(0, context)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_closedir, 0, 0, IS_VOID, 0)
 	ZEND_ARG_INFO(0, dir_handle)
@@ -1313,7 +1316,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mail, 0, 3, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_abs, 0, 1, MAY_BE_LONG|MAY_BE_DOUBLE)
-	ZEND_ARG_INFO(0, number)
+	ZEND_ARG_TYPE_MASK(0, number, MAY_BE_LONG|MAY_BE_DOUBLE)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ceil, 0, 1, IS_DOUBLE, 0)
diff --git a/ext/tidy/tidy.stub.php b/ext/tidy/tidy.stub.php
index 34cbe6fe08..423fecb090 100644
--- a/ext/tidy/tidy.stub.php
+++ b/ext/tidy/tidy.stub.php
@@ -1,28 +1,22 @@
 <?php
 
-/**
- * @param array|string $config_options
- * @return tidy|false
- */
-function tidy_parse_string(string $input, $config_options = UNKNOWN, string $encoding = UNKNOWN) {}
+/** @param array|string $config_options */
+function tidy_parse_string(string $input, $config_options = UNKNOWN, string $encoding = UNKNOWN): tidy|false {}
 
 function tidy_get_error_buffer(tidy $object): string|false {}
 
 function tidy_get_output(tidy $object): string {}
 
-/**
- * @param array|string $config_options
- * @return tidy|false
- */
-function tidy_parse_file(string $file, $config_options = UNKNOWN, string $encoding = UNKNOWN, bool $use_include_path = false) {}
+/** @param array|string $config_options */
+function tidy_parse_file(string $file, $config_options = UNKNOWN, string $encoding = UNKNOWN, bool $use_include_path = false): tidy|false {}
 
 function tidy_clean_repair(tidy $object): bool {}
 
 /** @param array|string $config_options */
-function tidy_repair_string(string $data, $config_file = UNKNOWN, string $encoding = UNKNOWN): string|false {}
+function tidy_repair_string(string $data, $config_options = UNKNOWN, string $encoding = UNKNOWN): string|false {}
 
 /** @param array|string $config_options */
-function tidy_repair_file(string $filename, $config_file = UNKNOWN, string $encoding = UNKNOWN, bool $use_include_path = false): string|false {}
+function tidy_repair_file(string $filename, $config_options = UNKNOWN, string $encoding = UNKNOWN, bool $use_include_path = false): string|false {}
 
 function tidy_diagnose(tidy $object): bool {}
 
@@ -63,7 +57,7 @@ function tidy_get_body(tidy $tidy): ?tidyNode {}
 class tidy
 {
     /** @param array|string $config_options */
-    public function __construct(string $filename = UNKNOWN, $config_file = UNKNOWN, string $encoding = UNKNOWN, bool $use_include_path = false) {}
+    public function __construct(string $filename = UNKNOWN, $config_options = UNKNOWN, string $encoding = UNKNOWN, bool $use_include_path = false) {}
 
     /** @return string|int|bool */
     public function getOpt(string $option) {}
@@ -74,13 +68,13 @@ class tidy
     public function parseFile(string $file, $config_options = UNKNOWN, string $encoding = UNKNOWN, bool $use_include_path = false): bool {}
 
     /** @param array|string $config_options */
-    public function parseString(string $input, $config_optinons = UNKNOWN, string $encoding = UNKNOWN): bool {}
+    public function parseString(string $input, $config_options = UNKNOWN, string $encoding = UNKNOWN): bool {}
 
     /** @param array|string $config_options */
-    public function repairString(string $data, $config_file = UNKNOWN, string $encoding = UNKNOWN): bool {}
+    public function repairString(string $data, $config_options = UNKNOWN, string $encoding = UNKNOWN): bool {}
 
     /** @param array|string $config_options */
-    public function repairFile(string $filename, $config_file = UNKNOWN, string $encoding = UNKNOWN, bool $use_include_path = false): bool {}
+    public function repairFile(string $filename, $config_options = UNKNOWN, string $encoding = UNKNOWN, bool $use_include_path = false): bool {}
 
     public function diagnose(): bool {}
 
diff --git a/ext/tidy/tidy_arginfo.h b/ext/tidy/tidy_arginfo.h
index ab74b91194..7c2d8148d5 100644
--- a/ext/tidy/tidy_arginfo.h
+++ b/ext/tidy/tidy_arginfo.h
@@ -1,6 +1,6 @@
 /* This is a generated file, edit the .stub.php file instead. */
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_parse_string, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_tidy_parse_string, 0, 1, tidy, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
 	ZEND_ARG_INFO(0, config_options)
 	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
@@ -14,7 +14,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_tidy_get_output, 0, 1, IS_STRING
 	ZEND_ARG_OBJ_INFO(0, object, tidy, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_parse_file, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_tidy_parse_file, 0, 1, tidy, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, file, IS_STRING, 0)
 	ZEND_ARG_INFO(0, config_options)
 	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
@@ -27,13 +27,13 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_tidy_repair_string, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
-	ZEND_ARG_INFO(0, config_file)
+	ZEND_ARG_INFO(0, config_options)
 	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_tidy_repair_file, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
-	ZEND_ARG_INFO(0, config_file)
+	ZEND_ARG_INFO(0, config_options)
 	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, use_include_path, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
@@ -91,7 +91,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_tidy___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
-	ZEND_ARG_INFO(0, config_file)
+	ZEND_ARG_INFO(0, config_options)
 	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, use_include_path, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
@@ -112,19 +112,19 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_tidy_parseString, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
-	ZEND_ARG_INFO(0, config_optinons)
+	ZEND_ARG_INFO(0, config_options)
 	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_tidy_repairString, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
-	ZEND_ARG_INFO(0, config_file)
+	ZEND_ARG_INFO(0, config_options)
 	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_tidy_repairFile, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
-	ZEND_ARG_INFO(0, config_file)
+	ZEND_ARG_INFO(0, config_options)
 	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, use_include_path, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
diff --git a/ext/xml/xml.stub.php b/ext/xml/xml.stub.php
index 45adb61f30..0f6ed6b24c 100644
--- a/ext/xml/xml.stub.php
+++ b/ext/xml/xml.stub.php
@@ -1,10 +1,8 @@
 <?php
 
-/** @return XmlParser|false */
-function xml_parser_create(string $encoding = UNKNOWN) {}
+function xml_parser_create(string $encoding = UNKNOWN): XmlParser|false {}
 
-/** @return XmlParser|false */
-function xml_parser_create_ns(string $encoding = UNKNOWN, string $sep = ':') {}
+function xml_parser_create_ns(string $encoding = UNKNOWN, string $sep = ':'): XmlParser|false {}
 
 function xml_set_object(XmlParser $parser, object $obj): bool {}
 
diff --git a/ext/xml/xml_arginfo.h b/ext/xml/xml_arginfo.h
index c49779cac1..06f6fde985 100644
--- a/ext/xml/xml_arginfo.h
+++ b/ext/xml/xml_arginfo.h
@@ -1,10 +1,10 @@
 /* This is a generated file, edit the .stub.php file instead. */
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_create, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_xml_parser_create, 0, 0, XmlParser, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_create_ns, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_xml_parser_create_ns, 0, 0, XmlParser, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, sep, IS_STRING, 0)
 ZEND_END_ARG_INFO()
diff --git a/ext/xmlwriter/xmlwriter.stub.php b/ext/xmlwriter/xmlwriter.stub.php
index a8f6833171..ce476c0705 100644
--- a/ext/xmlwriter/xmlwriter.stub.php
+++ b/ext/xmlwriter/xmlwriter.stub.php
@@ -1,10 +1,8 @@
 <?php
 
-/** @return XMLWriter|false */
-function xmlwriter_open_uri(string $uri) {}
+function xmlwriter_open_uri(string $uri): XMLWriter|false {}
 
-/** @return XMLWriter|false */
-function xmlwriter_open_memory() {}
+function xmlwriter_open_memory(): XMLWriter|false {}
 
 function xmlwriter_set_indent(XMLWriter $xmlwriter, bool $indent): bool {}
 
@@ -170,6 +168,5 @@ class XMLWriter
 
     function outputMemory(bool $flush = true): string {}
 
-    /** @return string|int */
-    function flush(bool $empty = true) {}
+    function flush(bool $empty = true): string|int {}
 }
diff --git a/ext/xmlwriter/xmlwriter_arginfo.h b/ext/xmlwriter/xmlwriter_arginfo.h
index 6daf7e0434..54f571cb34 100644
--- a/ext/xmlwriter/xmlwriter_arginfo.h
+++ b/ext/xmlwriter/xmlwriter_arginfo.h
@@ -1,10 +1,10 @@
 /* This is a generated file, edit the .stub.php file instead. */
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_open_uri, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_xmlwriter_open_uri, 0, 1, XMLWriter, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_open_memory, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_xmlwriter_open_memory, 0, 0, XMLWriter, MAY_BE_FALSE)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xmlwriter_set_indent, 0, 2, _IS_BOOL, 0)
@@ -331,6 +331,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_XMLWriter_outputMemory, 0,
 	ZEND_ARG_TYPE_INFO(0, flush, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_XMLWriter_flush, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_XMLWriter_flush, 0, 0, MAY_BE_STRING|MAY_BE_LONG)
 	ZEND_ARG_TYPE_INFO(0, empty, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
-- 
2.50.1