Merge branch 'PHP-8.4'

* PHP-8.4:
  Update NEWS for the intl reference fixes
  Fix reference handling of IntlTimeZone::getCanonicalID/intltz_get_canonical_id
  Fix reference handling of grapheme_extract()
  Fix numfmt_parse_currency() reference handling
This commit is contained in:
Niels Dossche 2025-05-01 10:42:30 +02:00
commit a1e1a7a721
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
6 changed files with 67 additions and 17 deletions

View file

@ -286,9 +286,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_canonical_id)
RETVAL_NEW_STR(u8str);
if (is_systemid) { /* by-ref argument passed */
ZVAL_DEREF(is_systemid);
zval_ptr_dtor(is_systemid);
ZVAL_BOOL(is_systemid, isSystemID);
ZEND_TRY_ASSIGN_REF_BOOL(is_systemid, isSystemID);
}
}