Merge branch 'PHP-8.3' into PHP-8.4

Girgias · Girgias · commit 5295fc07d598 · 2025-07-28T15:36:02.000+01:00
* PHP-8.3:
  ext/intl: Fix return value on failure for resourcebundle count handler
diff --git a/NEWS b/NEWS
@@ -23,6 +23,7 @@ PHP                                                                        NEWS
 
 - Intl:
   . Fix memleak on failure in collator_get_sort_key(). (nielsdos)
+  . Fix return value on failure for resourcebundle count handler. (Girgias)
 
 - LDAP:
   . Fixed bug GH-18529 (additional inheriting of TLS int options).
diff --git a/ext/intl/resourcebundle/resourcebundle_class.c b/ext/intl/resourcebundle/resourcebundle_class.c
@@ -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 );

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ static zend_result resourcebundle_array_count(zend_object object, zend_long co`
`308`	`308`	`if (rb->me == NULL) {`
`309`	`309`	`intl_errors_set(&rb->error, U_ILLEGAL_ARGUMENT_ERROR,`
`310`	`310`	`"Found unconstructed ResourceBundle", 0);`
`311`		`- return 0;`
	`311`	`+ return FAILURE;`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`*count = ures_getSize( rb->me );`