Skip to content

Commit 9ef94bf

Browse files
committed
Add missing tentative-return-type annotation
1 parent 2ea7228 commit 9ef94bf

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

ext/spl/spl_observer.stub.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
interface SplObserver
66
{
7+
/** @tentative-return-type */
78
public function update(SplSubject $subject): void;
89
}
910

@@ -58,7 +59,7 @@ public function valid(): bool {}
5859
public function key(): int {}
5960

6061
/** @tentative-return-type */
61-
public function current(): ?object {}
62+
public function current(): object {}
6263

6364
/** @tentative-return-type */
6465
public function next(): void {}
@@ -141,10 +142,10 @@ public function rewind(): void {}
141142
public function valid(): bool {}
142143

143144
/** @tentative-return-type */
144-
public function key(): array|false {}
145+
public function key(): array {}
145146

146147
/** @tentative-return-type */
147-
public function current(): array|false {}
148+
public function current(): array {}
148149

149150
/** @tentative-return-type */
150151
public function next(): void {}

ext/spl/spl_observer_arginfo.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 7afd0fa1170cb9c21bef514336e6cfb38dccdacd */
2+
* Stub hash: a3c87f5b7edd257e25d6651628dd9896e14f5715 */
33

4-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_SplObserver_update, 0, 1, IS_VOID, 0)
4+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SplObserver_update, 0, 1, IS_VOID, 0)
55
ZEND_ARG_OBJ_INFO(0, subject, SplSubject, 0)
66
ZEND_END_ARG_INFO()
77

@@ -54,7 +54,7 @@ ZEND_END_ARG_INFO()
5454
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SplObjectStorage_key, 0, 0, IS_LONG, 0)
5555
ZEND_END_ARG_INFO()
5656

57-
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SplObjectStorage_current, 0, 0, IS_OBJECT, 1)
57+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SplObjectStorage_current, 0, 0, IS_OBJECT, 0)
5858
ZEND_END_ARG_INFO()
5959

6060
#define arginfo_class_SplObjectStorage_next arginfo_class_SplSubject_notify
@@ -125,10 +125,9 @@ ZEND_END_ARG_INFO()
125125

126126
#define arginfo_class_MultipleIterator_valid arginfo_class_SplObjectStorage_valid
127127

128-
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_MultipleIterator_key, 0, 0, MAY_BE_ARRAY|MAY_BE_FALSE)
129-
ZEND_END_ARG_INFO()
128+
#define arginfo_class_MultipleIterator_key arginfo_class_SplObjectStorage___serialize
130129

131-
#define arginfo_class_MultipleIterator_current arginfo_class_MultipleIterator_key
130+
#define arginfo_class_MultipleIterator_current arginfo_class_SplObjectStorage___serialize
132131

133132
#define arginfo_class_MultipleIterator_next arginfo_class_SplSubject_notify
134133

0 commit comments

Comments
 (0)