Add proper return types to final phar methods

As these are final, we can add return types to them.

2 files changed, 62 insertions, 80 deletions

diff --git a/ext/phar/phar_object.stub.php b/ext/phar/phar_object.stub.php
index 2af9d5bc5e..44ec4732da 100644
--- a/ext/phar/phar_object.stub.php
+++ b/ext/phar/phar_object.stub.php
@@ -142,50 +142,39 @@ class Phar extends RecursiveDirectoryIterator implements Countable, ArrayAccess
     /** @return void */
     public function stopBuffering() {}
 
-    /** @return string */
-    final public static function apiVersion() {}
+    final public static function apiVersion(): string {}
 
-    /** @return bool */
-    final public static function canCompress(int $method = 0) {}
+    final public static function canCompress(int $method = 0): bool {}
 
-    /** @return bool */
-    final public static function canWrite() {}
+    final public static function canWrite(): bool {}
 
-    /** @return string */
-    final public static function createDefaultStub(string $index = UNKNOWN, string $webindex = UNKNOWN) {}
+    final public static function createDefaultStub(
+        string $index = UNKNOWN, string $webindex = UNKNOWN): string {}
 
-    /** @return array */
-    final public static function getSupportedCompression() {}
+    final public static function getSupportedCompression(): array {}
 
-    /** @return array */
-    final public static function getSupportedSignatures() {}
+    final public static function getSupportedSignatures(): array {}
 
-    /** @return void */
-    final public static function interceptFileFuncs() {}
+    final public static function interceptFileFuncs(): void {}
 
-    /** @return bool */
-    final public static function isValidPharFilename(string $filename, bool $executable = true) {}
+    final public static function isValidPharFilename(
+        string $filename, bool $executable = true): bool {}
 
-    /** @return bool */
-    final public static function loadPhar(string $filename, ?string $alias = null) {}
+    final public static function loadPhar(string $filename, ?string $alias = null): bool {}
 
-    /** @return bool */
-    final public static function mapPhar(?string $alias = null, int $offset = 0) {}
+    final public static function mapPhar(?string $alias = null, int $offset = 0): bool {}
 
-    /** @return string */
-    final public static function running(bool $retphar = true) {}
+    final public static function running(bool $retphar = true): string {}
 
-    /** @return void */
-    final public static function mount(string $inphar, string $externalfile) {}
+    final public static function mount(string $inphar, string $externalfile): void {}
 
-    /** @return void */
-    final public static function mungServer(array $munglist) {}
+    final public static function mungServer(array $munglist): void {}
 
-    /** @return bool */
-    final public static function unlinkArchive(string $archive) {}
+    final public static function unlinkArchive(string $archive): bool {}
 
-    /** @return void */
-    final public static function webPhar(?string $alias = null, ?string $index = null, string $f404 = UNKNOWN, array $mimetypes = [], $rewrites = UNKNOWN) {}
+    final public static function webPhar(
+        ?string $alias = null, ?string $index = null, string $f404 = UNKNOWN,
+        array $mimetypes = [], $rewrites = UNKNOWN): void {}
 }
 
 class PharData extends RecursiveDirectoryIterator implements Countable, ArrayAccess
@@ -330,50 +319,39 @@ class PharData extends RecursiveDirectoryIterator implements Countable, ArrayAcc
     /** @return void */
     public function stopBuffering() {}
 
-    /** @return string */
-    final public static function apiVersion() {}
+    final public static function apiVersion(): string {}
 
-    /** @return bool */
-    final public static function canCompress(int $method = 0) {}
+    final public static function canCompress(int $method = 0): bool {}
 
-    /** @return bool */
-    final public static function canWrite() {}
+    final public static function canWrite(): bool {}
 
-    /** @return string */
-    final public static function createDefaultStub(string $index = UNKNOWN, string $webindex = UNKNOWN) {}
+    final public static function createDefaultStub(
+        string $index = UNKNOWN, string $webindex = UNKNOWN): string {}
 
-    /** @return array */
-    final public static function getSupportedCompression() {}
+    final public static function getSupportedCompression(): array {}
 
-    /** @return array */
-    final public static function getSupportedSignatures() {}
+    final public static function getSupportedSignatures(): array {}
 
-    /** @return void */
-    final public static function interceptFileFuncs() {}
+    final public static function interceptFileFuncs(): void {}
 
-    /** @return bool */
-    final public static function isValidPharFilename(string $filename, bool $executable = true) {}
+    final public static function isValidPharFilename(
+        string $filename, bool $executable = true): bool {}
 
-    /** @return bool */
-    final public static function loadPhar(string $filename, ?string $alias = null) {}
+    final public static function loadPhar(string $filename, ?string $alias = null): bool {}
 
-    /** @return bool */
-    final public static function mapPhar(?string $alias = null, int $offset = 0) {}
+    final public static function mapPhar(?string $alias = null, int $offset = 0): bool {}
 
-    /** @return string */
-    final public static function running(bool $retphar = true) {}
+    final public static function running(bool $retphar = true): string {}
 
-    /** @return void */
-    final public static function mount(string $inphar, string $externalfile) {}
+    final public static function mount(string $inphar, string $externalfile): void {}
 
-    /** @return void */
-    final public static function mungServer(array $munglist) {}
+    final public static function mungServer(array $munglist): void {}
 
-    /** @return bool */
-    final public static function unlinkArchive(string $archive) {}
+    final public static function unlinkArchive(string $archive): bool {}
 
-    /** @return void */
-    final public static function webPhar(?string $alias = null, ?string $index = null, string $f404 = UNKNOWN, array $mimetypes = [], $rewrites = UNKNOWN) {}
+    final public static function webPhar(
+        ?string $alias = null, ?string $index = null, string $f404 = UNKNOWN,
+        array $mimetypes = [], $rewrites = UNKNOWN): void {}
 }
 
 class PharFileInfo extends SplFileInfo
diff --git a/ext/phar/phar_object_arginfo.h b/ext/phar/phar_object_arginfo.h
index ef19b6e018..8cae13ebe8 100644
--- a/ext/phar/phar_object_arginfo.h
+++ b/ext/phar/phar_object_arginfo.h
@@ -143,58 +143,62 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_Phar_stopBuffering arginfo_class_Phar___destruct
 
-#define arginfo_class_Phar_apiVersion arginfo_class_Phar___destruct
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Phar_apiVersion, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar_canCompress, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Phar_canCompress, 0, 0, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, method, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_Phar_canWrite arginfo_class_Phar___destruct
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Phar_canWrite, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar_createDefaultStub, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Phar_createDefaultStub, 0, 0, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, index, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, webindex, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_Phar_getSupportedCompression arginfo_class_Phar___destruct
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Phar_getSupportedCompression, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_Phar_getSupportedSignatures arginfo_class_Phar___destruct
+#define arginfo_class_Phar_getSupportedSignatures arginfo_class_Phar_getSupportedCompression
 
-#define arginfo_class_Phar_interceptFileFuncs arginfo_class_Phar___destruct
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Phar_interceptFileFuncs, 0, 0, IS_VOID, 0)
+ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar_isValidPharFilename, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Phar_isValidPharFilename, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, executable, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar_loadPhar, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Phar_loadPhar, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, alias, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar_mapPhar, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Phar_mapPhar, 0, 0, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, alias, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar_running, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Phar_running, 0, 0, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, retphar, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar_mount, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Phar_mount, 0, 2, IS_VOID, 0)
 	ZEND_ARG_TYPE_INFO(0, inphar, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, externalfile, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar_mungServer, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Phar_mungServer, 0, 1, IS_VOID, 0)
 	ZEND_ARG_TYPE_INFO(0, munglist, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar_unlinkArchive, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Phar_unlinkArchive, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, archive, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar_webPhar, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Phar_webPhar, 0, 0, IS_VOID, 0)
 	ZEND_ARG_TYPE_INFO(0, alias, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO(0, index, IS_STRING, 1)
 	ZEND_ARG_TYPE_INFO(0, f404, IS_STRING, 0)
@@ -289,19 +293,19 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_PharData_stopBuffering arginfo_class_Phar___destruct
 
-#define arginfo_class_PharData_apiVersion arginfo_class_Phar___destruct
+#define arginfo_class_PharData_apiVersion arginfo_class_Phar_apiVersion
 
 #define arginfo_class_PharData_canCompress arginfo_class_Phar_canCompress
 
-#define arginfo_class_PharData_canWrite arginfo_class_Phar___destruct
+#define arginfo_class_PharData_canWrite arginfo_class_Phar_canWrite
 
 #define arginfo_class_PharData_createDefaultStub arginfo_class_Phar_createDefaultStub
 
-#define arginfo_class_PharData_getSupportedCompression arginfo_class_Phar___destruct
+#define arginfo_class_PharData_getSupportedCompression arginfo_class_Phar_getSupportedCompression
 
-#define arginfo_class_PharData_getSupportedSignatures arginfo_class_Phar___destruct
+#define arginfo_class_PharData_getSupportedSignatures arginfo_class_Phar_getSupportedCompression
 
-#define arginfo_class_PharData_interceptFileFuncs arginfo_class_Phar___destruct
+#define arginfo_class_PharData_interceptFileFuncs arginfo_class_Phar_interceptFileFuncs
 
 #define arginfo_class_PharData_isValidPharFilename arginfo_class_Phar_isValidPharFilename