Add union return types for function stubs

2 files changed, 34 insertions, 60 deletions

diff --git a/ext/ftp/ftp.stub.php b/ext/ftp/ftp.stub.php
index 83a419e5a7..e01603a99c 100644
--- a/ext/ftp/ftp.stub.php
+++ b/ext/ftp/ftp.stub.php
@@ -11,17 +11,14 @@ function ftp_ssl_connect(string $host, int $port = 21, int $timeout = 90) {}
 /** @param resource $ftp */
 function ftp_login($ftp, string $username, string $password): bool {}
 
-/**
- * @param resource $ftp
- * @return string|false
- */
-function ftp_pwd($ftp) {}
+/** @param resource $ftp */
+function ftp_pwd($ftp): string|false {}
 
 /** @param resource $ftp */
 function ftp_cdup($ftp): bool {}
 
 /** @param resource $ftp */
-function ftp_chdir($ftp, string $directory): bool {} 
+function ftp_chdir($ftp, string $directory): bool {}
 
 /** @param resource $ftp */
 function ftp_exec($ftp, string $command): bool {}
@@ -29,47 +26,29 @@ function ftp_exec($ftp, string $command): bool {}
 /** @param resource $ftp */
 function ftp_raw($ftp, string $command): array {}
 
-/**
- * @param resource $ftp
- * @return string|false
- */
-function ftp_mkdir($ftp, string $directory) {}
+/** @param resource $ftp */
+function ftp_mkdir($ftp, string $directory): string|false {}
 
 /** @param resource $ftp */
 function ftp_rmdir($ftp, string $directory): bool {}
 
-/**
- * @param resource $ftp
- * @return int|false
- */
-function ftp_chmod($ftp, int $mode, string $filename) {}
+/** @param resource $ftp */
+function ftp_chmod($ftp, int $mode, string $filename): int|false {}
 
 /** @param resource $ftp */
 function ftp_alloc($ftp, int $size, &$response = UNKNOWN): bool {}
 
-/**
- * @param resource $ftp
- * @return array|false
- */
-function ftp_nlist($ftp, string $directory) {}
+/** @param resource $ftp */
+function ftp_nlist($ftp, string $directory): array|false {}
 
-/**
- * @param resource $ftp
- * @return array|false
- */
-function ftp_rawlist($ftp, string $directory, bool $recurse = false) {}
+/** @param resource $ftp */
+function ftp_rawlist($ftp, string $directory, bool $recurse = false): array|false {}
 
-/**
- * @param resource $ftp
- * @return array|false
- */
-function ftp_mlsd($ftp, string $directory) {}
+/** @param resource $ftp */
+function ftp_mlsd($ftp, string $directory): array|false {}
 
-/**
- * @param resource $ftp
- * @return string|false
- */
-function ftp_systype($ftp) {}
+/** @param resource $ftp */
+function ftp_systype($ftp): string|false {}
 
 /**
  * @param resource $ftp
@@ -80,9 +59,8 @@ function ftp_fget($ftp, $fp, string $remote_file, int $mode = FTP_BINARY, int $r
 /**
  * @param resource $ftp
  * @param resource $fp
- * @return int|false
  */
-function ftp_nb_fget($ftp, $fp, string $remote_file, int $mode = FTP_BINARY, int $resumpos = 0) {}
+function ftp_nb_fget($ftp, $fp, string $remote_file, int $mode = FTP_BINARY, int $resumpos = 0): int|false {}
 
 /** @param resource $ftp */
 function ftp_pasv($ftp, bool $pasv): bool {}
@@ -105,9 +83,8 @@ function ftp_fput($ftp, string $remote_file, $fp, int $mode = FTP_BINARY, int $s
 /**
  * @param resource $ftp
  * @param resource $fp
- * @return int|false
  */
-function ftp_nb_fput($ftp, string $remote_file, $fp, $mode = FTP_BINARY, $startpos = 0) {}
+function ftp_nb_fput($ftp, string $remote_file, $fp, $mode = FTP_BINARY, $startpos = 0): int|false {}
 
 /** @param resource $ftp */
 function ftp_put($ftp, string $remote_file, string $local_file, int $mode = FTP_BINARY, int $startpos = 0): bool {}
@@ -115,11 +92,8 @@ function ftp_put($ftp, string $remote_file, string $local_file, int $mode = FTP_
 /** @param resource $ftp */
 function ftp_append($ftp, string $remove_file, string $local_file, int $mode = FTP_BINARY): bool {}
 
-/**
- * @param resource $ftp
- * @return int|false
- */
-function ftp_nb_put($ftp, string $remote_file, string $local_file, int $mode = FTP_BINARY, int $startpos = 0) {}
+/** @param resource $ftp */
+function ftp_nb_put($ftp, string $remote_file, string $local_file, int $mode = FTP_BINARY, int $startpos = 0): int|false {}
 
 /** @param resource $ftp */
 function ftp_size($ftp, string $filename): int {}
@@ -142,8 +116,5 @@ function ftp_close($ftp): bool {}
 /** @param resource $ftp */
 function ftp_set_option($ftp, int $option, $value): bool {}
 
-/**
- * @param resource $ftp
- * @return int|bool
- */
-function ftp_get_option($ftp, int $option) {}
+/** @param resource $ftp */
+function ftp_get_option($ftp, int $option): int|bool {}
diff --git a/ext/ftp/ftp_arginfo.h b/ext/ftp/ftp_arginfo.h
index d55b76a686..69a3cd01e9 100644
--- a/ext/ftp/ftp_arginfo.h
+++ b/ext/ftp/ftp_arginfo.h
@@ -20,7 +20,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_login, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_pwd, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_pwd, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, ftp)
 ZEND_END_ARG_INFO()
 
@@ -43,14 +43,14 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_raw, 0, 2, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, command, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_mkdir, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_mkdir, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, ftp)
 	ZEND_ARG_TYPE_INFO(0, directory, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_ftp_rmdir arginfo_ftp_chdir
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_chmod, 0, 0, 3)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_chmod, 0, 3, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, ftp)
 	ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
@@ -62,15 +62,18 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_alloc, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_INFO(1, response)
 ZEND_END_ARG_INFO()
 
-#define arginfo_ftp_nlist arginfo_ftp_mkdir
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_nlist, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE)
+	ZEND_ARG_INFO(0, ftp)
+	ZEND_ARG_TYPE_INFO(0, directory, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_rawlist, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_rawlist, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, ftp)
 	ZEND_ARG_TYPE_INFO(0, directory, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, recurse, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_ftp_mlsd arginfo_ftp_mkdir
+#define arginfo_ftp_mlsd arginfo_ftp_nlist
 
 #define arginfo_ftp_systype arginfo_ftp_pwd
 
@@ -82,7 +85,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_fget, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, resumepos, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_fget, 0, 0, 3)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_nb_fget, 0, 3, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, ftp)
 	ZEND_ARG_INFO(0, fp)
 	ZEND_ARG_TYPE_INFO(0, remote_file, IS_STRING, 0)
@@ -123,7 +126,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_fput, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, startpos, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_fput, 0, 0, 3)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_nb_fput, 0, 3, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, ftp)
 	ZEND_ARG_TYPE_INFO(0, remote_file, IS_STRING, 0)
 	ZEND_ARG_INFO(0, fp)
@@ -146,7 +149,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_append, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_put, 0, 0, 3)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_nb_put, 0, 3, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, ftp)
 	ZEND_ARG_TYPE_INFO(0, remote_file, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, local_file, IS_STRING, 0)
@@ -185,7 +188,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_set_option, 0, 3, _IS_BOOL,
 	ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_get_option, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_get_option, 0, 2, MAY_BE_LONG|MAY_BE_BOOL)
 	ZEND_ARG_INFO(0, ftp)
 	ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
 ZEND_END_ARG_INFO()