mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
Merge branch 'PHP-8.4'
* PHP-8.4: ext/intl: Fix return value on failure for resourcebundle count handler
This commit is contained in:
commit
b30ccf9158
2 changed files with 5 additions and 1 deletions
4
NEWS
4
NEWS
|
@ -15,6 +15,10 @@ PHP NEWS
|
|||
- GD:
|
||||
. Fix incorrect comparison with result of php_stream_can_cast(). (Girgias)
|
||||
|
||||
- Intl:
|
||||
. Fix return value on failure for resourcebundle count handler. (Girgias)
|
||||
|
||||
|
||||
- OPcache:
|
||||
. Disallow changing opcache.memory_consumption when SHM is already set up.
|
||||
(timwolla)
|
||||
|
|
|
@ -308,7 +308,7 @@ static zend_result resourcebundle_array_count(zend_object *object, zend_long *co
|
|||
if (rb->me == NULL) {
|
||||
intl_errors_set(&rb->error, U_ILLEGAL_ARGUMENT_ERROR,
|
||||
"Found unconstructed ResourceBundle", 0);
|
||||
return 0;
|
||||
return FAILURE;
|
||||
}
|
||||
|
||||
*count = ures_getSize( rb->me );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue