Skip to content

Commit 1bd779c

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Fix some return types in ext/spl
2 parents 58f3f75 + d618ed0 commit 1bd779c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

ext/spl/spl_observer.stub.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ public function contains(object $object) {}
3434
/** @return int */
3535
public function addAll(SplObjectStorage $storage) {}
3636

37-
/** @return void */
37+
/** @return int */
3838
public function removeAll(SplObjectStorage $storage) {}
3939

40-
/** @return void */
40+
/** @return int */
4141
public function removeAllExcept(SplObjectStorage $storage) {}
4242

4343
/** @return mixed */
@@ -58,7 +58,7 @@ public function valid() {}
5858
/** @return int */
5959
public function key() {}
6060

61-
/** @return object */
61+
/** @return object|null */
6262
public function current() {}
6363

6464
/** @return void */
@@ -141,10 +141,10 @@ public function rewind() {}
141141
/** @return bool */
142142
public function valid() {}
143143

144-
/** @return array */
144+
/** @return array|false */
145145
public function key() {}
146146

147-
/** @return array */
147+
/** @return array|false */
148148
public function current() {}
149149

150150
/** @return void */

ext/spl/spl_observer_arginfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: a469366b28d26706862ecddae69497fe3e06f137 */
2+
* Stub hash: 89437500594aa41fa5cd36f31de07ad65f2bf408 */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplObserver_update, 0, 0, 1)
55
ZEND_ARG_OBJ_INFO(0, subject, SplSubject, 0)

0 commit comments

Comments
 (0)