Skip to content

Commit b30ccf9

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: ext/intl: Fix return value on failure for resourcebundle count handler
2 parents f63a35d + 5295fc0 commit b30ccf9

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ PHP NEWS
1515
- GD:
1616
. Fix incorrect comparison with result of php_stream_can_cast(). (Girgias)
1717

18+
- Intl:
19+
. Fix return value on failure for resourcebundle count handler. (Girgias)
20+
21+
1822
- OPcache:
1923
. Disallow changing opcache.memory_consumption when SHM is already set up.
2024
(timwolla)

ext/intl/resourcebundle/resourcebundle_class.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ static zend_result resourcebundle_array_count(zend_object *object, zend_long *co
308308
if (rb->me == NULL) {
309309
intl_errors_set(&rb->error, U_ILLEGAL_ARGUMENT_ERROR,
310310
"Found unconstructed ResourceBundle", 0);
311-
return 0;
311+
return FAILURE;
312312
}
313313

314314
*count = ures_getSize( rb->me );

0 commit comments

Comments
 (0)