diff --git a/ext/zip/php_zip.stub.php b/ext/zip/php_zip.stub.php
index e2d473cb239df..775054d4fdbfb 100644
--- a/ext/zip/php_zip.stub.php
+++ b/ext/zip/php_zip.stub.php
@@ -79,164 +79,162 @@ class ZipArchive implements Countable
     /** @readonly */
     public string $comment;
 
-    /** @return bool|int */
-    public function open(string $filename, int $flags = 0) {}
+    /** @tentative-return-type */
+    public function open(string $filename, int $flags = 0): bool|int {}
 
-    /** @return bool */
-    public function setPassword(string $password) {}
+    /** @tentative-return-type */
+    public function setPassword(string $password): bool {}
 
-    /** @return bool */
-    public function close() {}
+    /** @tentative-return-type */
+    public function close(): bool {}
 
-    /** @return int */
-    public function count() {}
+    /** @tentative-return-type */
+    public function count(): int {}
 
-    /** @return string */
-    public function getStatusString() {}
+    /** @tentative-return-type */
+    public function getStatusString(): string {}
 
-    /** @return bool */
-    public function addEmptyDir(string $dirname, int $flags = 0) {}
+    /** @tentative-return-type */
+    public function addEmptyDir(string $dirname, int $flags = 0): bool {}
 
-    /** @return bool */
-    public function addFromString(string $name, string $content, int $flags = ZipArchive::FL_OVERWRITE) {}
+    /** @tentative-return-type */
+    public function addFromString(string $name, string $content, int $flags = ZipArchive::FL_OVERWRITE): bool {}
 
-    /** @return bool */
-    public function addFile(string $filepath, string $entryname = "", int $start = 0, int $length = 0, int $flags = ZipArchive::FL_OVERWRITE) {}
+    /** @tentative-return-type */
+    public function addFile(string $filepath, string $entryname = "", int $start = 0, int $length = 0, int $flags = ZipArchive::FL_OVERWRITE): bool {}
 
-    /** @return bool */
-    public function replaceFile(string $filepath, string $index, int $start = 0, int $length = 0, int $flags = 0) {}
+    /** @tentative-return-type */
+    public function replaceFile(string $filepath, string $index, int $start = 0, int $length = 0, int $flags = 0): bool {}
 
-    /** @return array|false */
-    public function addGlob(string $pattern, int $flags = 0, array $options = []) {}
+    /** @tentative-return-type */
+    public function addGlob(string $pattern, int $flags = 0, array $options = []): array|false {}
 
-    /** @return array|false */
-    public function addPattern(string $pattern, string $path = ".", array $options = []) {}
+    /** @tentative-return-type */
+    public function addPattern(string $pattern, string $path = ".", array $options = []): array|false {}
 
-    /** @return bool */
-    public function renameIndex(int $index, string $new_name) {}
+    /** @tentative-return-type */
+    public function renameIndex(int $index, string $new_name): bool {}
 
-    /** @return bool */
-    public function renameName(string $name, string $new_name) {}
+    /** @tentative-return-type */
+    public function renameName(string $name, string $new_name): bool {}
 
-    /** @return bool */
-    public function setArchiveComment(string $comment) {}
+    /** @tentative-return-type */
+    public function setArchiveComment(string $comment): bool {}
 
-    /** @return string|false */
-    public function getArchiveComment(int $flags = 0) {}
+    /** @tentative-return-type */
+    public function getArchiveComment(int $flags = 0): string|false {}
 
-    /** @return bool */
-    public function setCommentIndex(int $index, string $comment) {}
+    /** @tentative-return-type */
+    public function setCommentIndex(int $index, string $comment): bool {}
 
-    /** @return bool */
-    public function setCommentName(string $name, string $comment) {}
+    /** @tentative-return-type */
+    public function setCommentName(string $name, string $comment): bool {}
 
 #ifdef HAVE_SET_MTIME
-    /** @return bool */
-    public function setMtimeIndex(int $index, int $timestamp, int $flags = 0) {}
+    /** @tentative-return-type */
+    public function setMtimeIndex(int $index, int $timestamp, int $flags = 0): bool {}
 
-    /** @return bool */
-    public function setMtimeName(string $name, int $timestamp, int $flags = 0) {}
+    /** @tentative-return-type */
+    public function setMtimeName(string $name, int $timestamp, int $flags = 0): bool {}
 #endif
 
-    /** @return string|false */
-    public function getCommentIndex(int $index, int $flags = 0) {}
+    /** @tentative-return-type */
+    public function getCommentIndex(int $index, int $flags = 0): string|false {}
 
-    /** @return string|false */
-    public function getCommentName(string $name, int $flags = 0) {}
+    /** @tentative-return-type */
+    public function getCommentName(string $name, int $flags = 0): string|false {}
 
-    /** @return bool */
-    public function deleteIndex(int $index) {}
+    /** @tentative-return-type */
+    public function deleteIndex(int $index): bool {}
 
-    /** @return bool */
-    public function deleteName(string $name) {}
+    /** @tentative-return-type */
+    public function deleteName(string $name): bool {}
 
-    /** @return array|false */
-    public function statName(string $name, int $flags = 0) {}
+    /** @tentative-return-type */
+    public function statName(string $name, int $flags = 0): array|false {}
 
-    /** @return array|false */
-    public function statIndex(int $index, int $flags = 0) {}
+    /** @tentative-return-type */
+    public function statIndex(int $index, int $flags = 0): array|false {}
 
-    /** @return int|false */
-    public function locateName(string $name, int $flags = 0) {}
+    /** @tentative-return-type */
+    public function locateName(string $name, int $flags = 0): int|false {}
 
-    /** @return string|false */
-    public function getNameIndex(int $index, int $flags = 0) {}
+    /** @tentative-return-type */
+    public function getNameIndex(int $index, int $flags = 0): string|false {}
 
-    /** @return bool */
-    public function unchangeArchive() {}
+    /** @tentative-return-type */
+    public function unchangeArchive(): bool {}
 
-    /** @return bool */
-    public function unchangeAll() {}
+    /** @tentative-return-type */
+    public function unchangeAll(): bool {}
 
-    /** @return bool */
-    public function unchangeIndex(int $index) {}
+    /** @tentative-return-type */
+    public function unchangeIndex(int $index): bool {}
 
-    /** @return bool */
-    public function unchangeName(string $name) {}
+    /** @tentative-return-type */
+    public function unchangeName(string $name): bool {}
 
-    /** @return bool */
-    public function extractTo(string $pathto, array|string|null $files = null) {}
+    /** @tentative-return-type */
+    public function extractTo(string $pathto, array|string|null $files = null): bool {}
 
-    /** @return string|false */
-    public function getFromName(string $name, int $len = 0, int $flags = 0) {}
+    /** @tentative-return-type */
+    public function getFromName(string $name, int $len = 0, int $flags = 0): string|false {}
 
-    /** @return string|false */
-    public function getFromIndex(int $index, int $len = 0, int $flags = 0) {}
+    /** @tentative-return-type */
+    public function getFromIndex(int $index, int $len = 0, int $flags = 0): string|false {}
 
     /** @return resource|false */
     public function getStream(string $name) {}
 
 #ifdef ZIP_OPSYS_DEFAULT
-    /** @return bool */
-    public function setExternalAttributesName(string $name, int $opsys, int $attr, int $flags = 0) {}
+    /** @tentative-return-type */
+    public function setExternalAttributesName(string $name, int $opsys, int $attr, int $flags = 0): bool {}
 
-    /** @return bool */
-    public function setExternalAttributesIndex(int $index, int $opsys, int $attr, int $flags = 0) {}
+    /** @tentative-return-type */
+    public function setExternalAttributesIndex(int $index, int $opsys, int $attr, int $flags = 0): bool {}
 
     /**
      * @param int $opsys
      * @param int $attr
-     * @return bool
+     * @tentative-return-type
      */
-    public function getExternalAttributesName(string $name, &$opsys, &$attr, int $flags = 0) {}
+    public function getExternalAttributesName(string $name, &$opsys, &$attr, int $flags = 0): bool {}
 
     /**
      * @param int $opsys
      * @param int $attr
-     * @return bool
+     * @tentative-return-type
      */
-    public function getExternalAttributesIndex(int $index, &$opsys, &$attr, int $flags = 0) {}
+    public function getExternalAttributesIndex(int $index, &$opsys, &$attr, int $flags = 0): bool {}
 #endif
 
-    /** @return bool */
-    public function setCompressionName(string $name, int $method, int $compflags = 0) {}
+    /** @tentative-return-type */
+    public function setCompressionName(string $name, int $method, int $compflags = 0): bool {}
 
-    /** @return bool */
-    public function setCompressionIndex(int $index, int $method, int $compflags = 0) {}
+    /** @tentative-return-type */
+    public function setCompressionIndex(int $index, int $method, int $compflags = 0): bool {}
 
 #ifdef HAVE_ENCRYPTION
-    /** @return bool */
-    public function setEncryptionName(string $name, int $method, ?string $password = null) {}
+    /** @tentative-return-type */
+    public function setEncryptionName(string $name, int $method, ?string $password = null): bool {}
 
-    /** @return bool */
-    public function setEncryptionIndex(int $index, int $method, ?string $password = null) {}
+    /** @tentative-return-type */
+    public function setEncryptionIndex(int $index, int $method, ?string $password = null): bool {}
 #endif
 
 #ifdef HAVE_PROGRESS_CALLBACK
-    /** @return bool */
-    public function registerProgressCallback(float $rate, callable $callback) {}
+    /** @tentative-return-type */
+    public function registerProgressCallback(float $rate, callable $callback): bool {}
 #endif
 
 #ifdef HAVE_CANCEL_CALLBACK
-    /** @return bool */
-    public function registerCancelCallback(callable $callback) {}
+    /** @tentative-return-type */
+    public function registerCancelCallback(callable $callback): bool {}
 #endif
 
 #ifdef HAVE_METHOD_SUPPORTED
-    /** @return bool */
     public static function isCompressionMethodSupported(int $method, bool $enc = true): bool {}
 
-    /** @return bool */
     public static function isEncryptionMethodSupported(int $method, bool $enc = true): bool {}
 #endif
 }
diff --git a/ext/zip/php_zip_arginfo.h b/ext/zip/php_zip_arginfo.h
index 675e8d064afa4..d2bdd541ed6db 100644
--- a/ext/zip/php_zip_arginfo.h
+++ b/ext/zip/php_zip_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: d0f7d294c92a3d056e38abc92162c19e10329310 */
+ * Stub hash: 93db1517143e903f01e4726a6b6c9bcbe0510f5b */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_open, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
@@ -40,34 +40,36 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_zip_entry_compressionmethod arginfo_zip_entry_name
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_open, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_ZipArchive_open, 0, 1, MAY_BE_BOOL|MAY_BE_LONG)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_setPassword, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_setPassword, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_close, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_close, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_ZipArchive_count arginfo_class_ZipArchive_close
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_count, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_ZipArchive_getStatusString arginfo_class_ZipArchive_close
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_getStatusString, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_addEmptyDir, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_addEmptyDir, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, dirname, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_addFromString, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_addFromString, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, content, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "ZipArchive::FL_OVERWRITE")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_addFile, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_addFile, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, filepath, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, entryname, IS_STRING, 0, "\"\"")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, start, IS_LONG, 0, "0")
@@ -75,7 +77,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_addFile, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "ZipArchive::FL_OVERWRITE")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_replaceFile, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_replaceFile, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, filepath, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, index, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, start, IS_LONG, 0, "0")
@@ -83,48 +85,48 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_replaceFile, 0, 0, 2)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_addGlob, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_ZipArchive_addGlob, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_addPattern, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_ZipArchive_addPattern, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, path, IS_STRING, 0, "\".\"")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_renameIndex, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_renameIndex, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, new_name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_renameName, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_renameName, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, new_name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_setArchiveComment, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_setArchiveComment, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, comment, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_getArchiveComment, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_ZipArchive_getArchiveComment, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_setCommentIndex, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_setCommentIndex, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, comment, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_setCommentName, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_setCommentName, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, comment, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #if defined(HAVE_SET_MTIME)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_setMtimeIndex, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_setMtimeIndex, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, timestamp, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
@@ -132,36 +134,45 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_SET_MTIME)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_setMtimeName, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_setMtimeName, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, timestamp, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 #endif
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_getCommentIndex, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_ZipArchive_getCommentIndex, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_getCommentName, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_ZipArchive_getCommentName, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_deleteIndex, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_deleteIndex, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_deleteName, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_deleteName, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_ZipArchive_statName arginfo_class_ZipArchive_getCommentName
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_ZipArchive_statName, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_ZipArchive_statIndex arginfo_class_ZipArchive_getCommentIndex
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_ZipArchive_statIndex, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
+	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_ZipArchive_locateName arginfo_class_ZipArchive_getCommentName
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_ZipArchive_locateName, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
+ZEND_END_ARG_INFO()
 
 #define arginfo_class_ZipArchive_getNameIndex arginfo_class_ZipArchive_getCommentIndex
 
@@ -173,27 +184,29 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_ZipArchive_unchangeName arginfo_class_ZipArchive_deleteName
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_extractTo, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_extractTo, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, pathto, IS_STRING, 0)
 	ZEND_ARG_TYPE_MASK(0, files, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_getFromName, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_ZipArchive_getFromName, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, len, IS_LONG, 0, "0")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_getFromIndex, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_ZipArchive_getFromIndex, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, len, IS_LONG, 0, "0")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_ZipArchive_getStream arginfo_class_ZipArchive_deleteName
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_getStream, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
 #if defined(ZIP_OPSYS_DEFAULT)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_setExternalAttributesName, 0, 0, 3)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_setExternalAttributesName, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, opsys, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, attr, IS_LONG, 0)
@@ -202,7 +215,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if defined(ZIP_OPSYS_DEFAULT)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_setExternalAttributesIndex, 0, 0, 3)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_setExternalAttributesIndex, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, opsys, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, attr, IS_LONG, 0)
@@ -211,7 +224,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if defined(ZIP_OPSYS_DEFAULT)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_getExternalAttributesName, 0, 0, 3)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_getExternalAttributesName, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 	ZEND_ARG_INFO(1, opsys)
 	ZEND_ARG_INFO(1, attr)
@@ -220,7 +233,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if defined(ZIP_OPSYS_DEFAULT)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_getExternalAttributesIndex, 0, 0, 3)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_getExternalAttributesIndex, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
 	ZEND_ARG_INFO(1, opsys)
 	ZEND_ARG_INFO(1, attr)
@@ -228,20 +241,20 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_getExternalAttributesIndex, 0, 0
 ZEND_END_ARG_INFO()
 #endif
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_setCompressionName, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_setCompressionName, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, method, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, compflags, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_setCompressionIndex, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_setCompressionIndex, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, method, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, compflags, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
 #if defined(HAVE_ENCRYPTION)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_setEncryptionName, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_setEncryptionName, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, method, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 1, "null")
@@ -249,7 +262,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_ENCRYPTION)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_setEncryptionIndex, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_setEncryptionIndex, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, method, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 1, "null")
@@ -257,14 +270,14 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_PROGRESS_CALLBACK)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_registerProgressCallback, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_registerProgressCallback, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, rate, IS_DOUBLE, 0)
 	ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
 ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_CANCEL_CALLBACK)
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_registerCancelCallback, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_registerCancelCallback, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
 ZEND_END_ARG_INFO()
 #endif