Commit c1f4e956daf for php
commit c1f4e956daf4282e289e3912c6907d272c61d2c7
Merge: e8585b83fb9 899b3510fcb
Author: Weilin Du <weilindu@php.net>
Date: Fri Nov 20 15:15:48 2026 +0800
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Windows CI: Fix implicit pointer-to-bool conversions (#25577)
diff --cc Zend/zend_lazy_objects.c
index f8df85efafe,63a91dd4b3c..1b966808bcc
--- a/Zend/zend_lazy_objects.c
+++ b/Zend/zend_lazy_objects.c
@@@ -112,9 -112,9 +112,9 @@@ static zend_lazy_object_info* zend_lazy
return info;
}
-static bool zend_lazy_object_has_stale_info(zend_object *obj)
+static bool zend_lazy_object_has_stale_info(const zend_object *obj)
{
- return zend_hash_index_find_ptr(&EG(lazy_objects_store).infos, obj->handle);
+ return zend_hash_index_find_ptr(&EG(lazy_objects_store).infos, obj->handle) != NULL;
}
zval* zend_lazy_object_get_initializer_zv(zend_object *obj)
diff --cc main/streams/userspace.c
index 888e4c90bba,4b00e86fd95..b3b88994465
--- a/main/streams/userspace.c
+++ b/main/streams/userspace.c
@@@ -1401,10 -1386,14 +1401,10 @@@ static int php_userstreamop_cast(php_st
zval retval;
zval args[1];
php_stream * intstream = NULL;
- int call_result;
int ret = FAILURE;
/* If we are checking if the stream can cast, no return pointer is provided, so do not emit errors */
- bool report_errors = retptr;
+ bool report_errors = retptr != NULL;
- ZVAL_STRINGL(&func_name, USERSTREAM_CAST, sizeof(USERSTREAM_CAST)-1);
-
switch(castas) {
case PHP_STREAM_AS_FD_FOR_SELECT:
ZVAL_LONG(&args[0], PHP_STREAM_AS_FD_FOR_SELECT);