Merge branch 'PHP-8.0'

* Add a few missing RETURN_THROWS();
* Fix a few ext/phar return types

Author: kocsismate

ext/phar/phar_object.c

@@ -4519,8 +4519,8 @@ PHP_METHOD(PharFileInfo, isCompressed)
 		case PHAR_ENT_COMPRESSED_BZ2:
 			RETURN_BOOL(entry_obj->entry->flags & PHAR_ENT_COMPRESSED_BZ2);
 		default:
-			zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, \
-				"Unknown compression type specified"); \
+			zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "Unknown compression type specified");
+			RETURN_THROWS();
 	}
 }
 /* }}} */
@@ -4543,8 +4543,8 @@ PHP_METHOD(PharFileInfo, getCRC32)
 	if (entry_obj->entry->is_crc_checked) {
 		RETURN_LONG(entry_obj->entry->crc32);
 	} else {
-		zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, \
-			"Phar entry was not CRC checked"); \
+		zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "Phar entry was not CRC checked");
+		RETURN_THROWS();
 	}
 }
 /* }}} */
@@ -4932,8 +4932,8 @@ PHP_METHOD(PharFileInfo, compress)
 			entry_obj->entry->flags |= PHAR_ENT_COMPRESSED_BZ2;
 			break;
 		default:
-			zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, \
-				"Unknown compression type specified"); \
+			zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "Unknown compression type specified");
+			RETURN_THROWS();
 	}
 
 	entry_obj->entry->phar->is_modified = 1;

ext/phar/phar_object.stub.php

@@ -42,7 +42,7 @@ public function decompress(?string $extension = null) {}
     /** @return Phar|null */
     public function convertToExecutable(?int $format = null, ?int $compression = null, ?string $extension = null) {}
 
-    /** @return Phar|null */
+    /** @return PharData|null */
     public function convertToData(?int $format = null, ?int $compression = null, ?string $extension = null) {}
 
     /** @return bool */
@@ -232,14 +232,16 @@ public function compressFiles(int $compression) {}
     public function decompressFiles() {}
 
     /**
-     * @return Phar|null
+     * @return PharData|null
      * @implementation-alias Phar::compress
+     * @no-verify
      */
     public function compress(int $compression, ?string $extension = null) {}
 
     /**
-     * @return Phar|null
+     * @return PharData|null
      * @implementation-alias Phar::decompress
+     * @no-verify
      */
     public function decompress(?string $extension = null) {}
 
@@ -250,7 +252,7 @@ public function decompress(?string $extension = null) {}
     public function convertToExecutable(?int $format = null, ?int $compression = null, ?string $extension = null) {}
 
     /**
-     * @return Phar|null
+     * @return PharData|null
      * @implementation-alias Phar::convertToData
      */
     public function convertToData(?int $format = null, ?int $compression = null, ?string $extension = null) {}

ext/phar/phar_object_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 8f6974078c7b16fd452a34a9e1b5c509699a2037 */
+ * Stub hash: a9525838eb14f6ad832b56bd07d64c2363f90001 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)