Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix ArrayObject::exchangeArray() return type

Author: nikic

ext/spl/spl_array.c

@@ -1252,7 +1252,7 @@ PHP_METHOD(ArrayObject, exchangeArray)
 
 	if (intern->nApplyCount > 0) {
 		zend_throw_error(NULL, "Modification of ArrayObject during sorting is prohibited");
-		return;
+		RETURN_THROWS();
 	}
 
 	RETVAL_ARR(zend_array_dup(spl_array_get_hash_table(intern)));

ext/spl/spl_array.stub.php

@@ -78,7 +78,7 @@ public function __unserialize(array $data) {}
     /** @return Iterator */
     public function getIterator() {}
 
-    /** @return array|null */
+    /** @return array */
     public function exchangeArray(array|object $array) {}
 
     /** @return void */

ext/spl/spl_array_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 38cb41de1caa42ba96573cbbd33e5ae971065b8a */
+ * Stub hash: e1f39b5dcb4da47427d5a1a13c9949c8b0a7ba8b */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ArrayObject___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_MASK(0, array, MAY_BE_ARRAY|MAY_BE_OBJECT, "[]")