Skip to content

[pull] master from php:master #1058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 5 commits into from
Sep 2, 2026
Merged

[pull] master from php:master #1058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
386a467
ext/intl: fix build with older ICU (#23539)
oerdnj Sep 2, 2026
a25f0c5
[skip ci] UPGRADING: Fix entry for snmp_init_mib
LamentXU123 Sep 2, 2026
3d3d336
[skip ci] Update UPGRADING with new Sodium constants
LamentXU123 Sep 2, 2026
dab13a0
Keep EG(errors) buffer consistent on erealloc failure (#23257)
edorian Sep 2, 2026
6df1311
Merge branch 'PHP-8.5'
DanielEScherzer Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ PHP NEWS
. It is now possible to use the AES192, AES192C, AES256, and AES256C as
SNMPv3 security protocols if the underlying library supports them.
(eskyuu)
. It is now possible to reset the MIB tree using the new snmp_read_mib()
. It is now possible to reset the MIB tree using the new snmp_init_mib()
function. (eskyuu)
. Additional MIB parsing and output control functionality has been exposed
via the snmp_set_mib_option(), snmp_set_output_option(),
Expand Down
22 changes: 22 additions & 0 deletions UPGRADING
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,28 @@ PHP 8.6 UPGRADE NOTES
. EAI_IDN_ENCODE.
. SO_DETACH_REUSEPORT_BPF (Linux only).

- Sodium:
. SODIUM_CRYPTO_IPCRYPT_BYTES.
. SODIUM_CRYPTO_IPCRYPT_KEYBYTES.
. SODIUM_CRYPTO_IPCRYPT_ND_KEYBYTES.
. SODIUM_CRYPTO_IPCRYPT_ND_TWEAKBYTES.
. SODIUM_CRYPTO_IPCRYPT_ND_INPUTBYTES.
. SODIUM_CRYPTO_IPCRYPT_ND_OUTPUTBYTES.
. SODIUM_CRYPTO_IPCRYPT_NDX_KEYBYTES.
. SODIUM_CRYPTO_IPCRYPT_NDX_TWEAKBYTES.
. SODIUM_CRYPTO_IPCRYPT_NDX_INPUTBYTES.
. SODIUM_CRYPTO_IPCRYPT_NDX_OUTPUTBYTES.
. SODIUM_CRYPTO_IPCRYPT_PFX_KEYBYTES.
. SODIUM_CRYPTO_IPCRYPT_PFX_BYTES.
. SODIUM_CRYPTO_XOF_SHAKE128_BLOCKBYTES.
. SODIUM_CRYPTO_XOF_SHAKE128_STATEBYTES.
. SODIUM_CRYPTO_XOF_SHAKE256_BLOCKBYTES.
. SODIUM_CRYPTO_XOF_SHAKE256_STATEBYTES.
. SODIUM_CRYPTO_XOF_TURBOSHAKE128_BLOCKBYTES.
. SODIUM_CRYPTO_XOF_TURBOSHAKE128_STATEBYTES.
. SODIUM_CRYPTO_XOF_TURBOSHAKE256_BLOCKBYTES.
. SODIUM_CRYPTO_XOF_TURBOSHAKE256_STATEBYTES.

- Standard:
. ARRAY_FILTER_USE_VALUE.
. STREAM_CRYPTO_STATUS_NONE.
Expand Down
7 changes: 4 additions & 3 deletions Zend/zend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1487,13 +1487,14 @@ ZEND_API ZEND_COLD void zend_error_zstr_at(
info->lineno = error_lineno;
info->filename = zend_string_copy(error_filename);
info->message = zend_string_copy(message);
EG(errors).size++;
if (EG(errors).size > EG(errors).capacity) {
uint32_t new_size = EG(errors).size + 1;
if (new_size > EG(errors).capacity) {
uint32_t capacity = EG(errors).capacity ? EG(errors).capacity + (EG(errors).capacity >> 1) : 2;
EG(errors).errors = erealloc(EG(errors).errors, sizeof(zend_error_info *) * capacity);
EG(errors).capacity = capacity;
}
EG(errors).errors[EG(errors).size - 1] = info;
EG(errors).errors[EG(errors).size] = info;
EG(errors).size = new_size;

/* Do not process non-fatal recorded error */
if (!(type & E_FATAL_ERRORS) || (type & E_DONT_BAIL)) {
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/formatter/formatter_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ U_CFUNC zend_object *NumberFormatter_object_clone(zend_object *object)

/* clone formatter object. It may fail, the destruction code must handle this case */
if (FORMATTER_OBJECT(nfo) != nullptr) {
FORMATTER_OBJECT(new_nfo) = FORMATTER_OBJECT(nfo)->clone();
FORMATTER_OBJECT(new_nfo) = static_cast<NumberFormat *>(FORMATTER_OBJECT(nfo)->clone());
if (FORMATTER_OBJECT(new_nfo) == nullptr) {
zend_throw_error(NULL, "Failed to clone NumberFormatter");
}
Expand Down
3 changes: 1 addition & 2 deletions ext/intl/rangeformatter/rangeformatter_class.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@
#ifndef RANGEFORMATTER_CLASS_H
#define RANGEFORMATTER_CLASS_H

#include <unicode/numberrangeformatter.h>

#ifdef __cplusplus
#include <unicode/numberrangeformatter.h>
using icu::number::LocalizedNumberRangeFormatter;
#else
typedef void LocalizedNumberRangeFormatter;
Expand Down