archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.0'

Browse source 
* PHP-8.0:
  Fix some more ext/spl return types
This commit is contained in:
Máté Kocsis 2021-07-15 16:41:52 +02:00
commit fae7cec6fb
No known key found for this signature in database
GPG key ID: FD055E41728BF310
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/spl/spl_iterators.stub.php
View file

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

2
ext/spl/spl_iterators_arginfo.h
View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead. /* 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_BEGIN_ARG_INFO_EX(arginfo_class_EmptyIterator_current, 0, 0, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()