Skip to content

Commit cf523fa

Browse files
Merge branch 'php:master' into master
2 parents 8de0e9d + 48db342 commit cf523fa

File tree

14 files changed

+167
-135
lines changed

14 files changed

+167
-135
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ PHP NEWS
8686
- Reflection:
8787
. Fix GH-9470 (ReflectionMethod constructor should not find private parent
8888
method). (ilutov)
89+
. Fix GH-10259 (ReflectionClass::getStaticProperties doesn't need null return
90+
type). (kocsismate)
8991

9092
- Sockets:
9193
. Added SO_ATTACH_REUSEPORT_CBPF socket option, to give tighter control

UPGRADING

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ PHP 8.3 UPGRADE NOTES
9696
a random seed, 0 will use zero as the seed. The functions are now consistent
9797
with Mt19937::__construct().
9898

99+
- Reflection:
100+
. Return type of ReflectionClass::getStaticProperties() is no longer nullable.
101+
99102
- Sockets:
100103
. Added socket_atmark to checks if the socket is OOB marked.
101104

Zend/zend_execute.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,7 @@ static zend_never_inline ZEND_ATTRIBUTE_UNUSED bool zend_verify_internal_arg_typ
12281228
* trust that arginfo matches what is enforced by zend_parse_parameters. */
12291229
ZEND_API bool zend_internal_call_should_throw(zend_function *fbc, zend_execute_data *call)
12301230
{
1231-
if (fbc->internal_function.handler == ZEND_FN(pass) || (fbc->internal_function.fn_flags | ZEND_ACC_FAKE_CLOSURE)) {
1231+
if (fbc->internal_function.handler == ZEND_FN(pass) || (fbc->internal_function.fn_flags & ZEND_ACC_FAKE_CLOSURE)) {
12321232
/* Be lenient about the special pass function and about fake closures. */
12331233
return 0;
12341234
}

0 commit comments

Comments
 (0)