Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix some more ext/spl return types

ext/spl/spl_iterators.stub.php

@@ -4,13 +4,13 @@
 
 class EmptyIterator implements Iterator
 {
-    /** @return void */
+    /** @return mixed */
     public function current() {}
 
     /** @return void */
     public function next() {}
 
-    /** @return void */
+    /** @return mixed */
     public function key() {}
 
     /** @return bool */
@@ -109,7 +109,7 @@ class RecursiveIteratorIterator implements OuterIterator
 
 interface OuterIterator extends Iterator
 {
-    /** @return Iterator */
+    /** @return Iterator|null */
     public function getInnerIterator();
 }
 
@@ -303,7 +303,7 @@ class AppendIterator extends IteratorIterator
     /** @return void */
     public function next() {}
 
-    /** @return int */
+    /** @return int|null */
     public function getIteratorIndex() {}
 
     /** @return ArrayIterator */

ext/spl/spl_iterators_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: de49628718b5fff1a3b2516cc89108e01b67c312 */
+ * Stub hash: e2b69f8f12c782da28c95f16e04483bd6588e6ab */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_EmptyIterator_current, 0, 0, 0)
 ZEND_END_ARG_INFO()