Commit b30ccf9

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 b30ccf9Copy full SHA for b30ccf9

File tree

-1

lines changed

-1

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,10 @@ PHP NEWS`
`15`	`15`	`- GD:`
`16`	`16`	`. Fix incorrect comparison with result of php_stream_can_cast(). (Girgias)`
`17`	`17`
	`18`	`+- Intl:`
	`19`	`+ . Fix return value on failure for resourcebundle count handler. (Girgias)`
	`20`	`+`
	`21`	`+`
`18`	`22`	`- OPcache:`
`19`	`23`	`. Disallow changing opcache.memory_consumption when SHM is already set up.`
`20`	`24`	`(timwolla)`

Lines changed: 1 addition & 1 deletion

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 );`

Comments

(0)