Skip to content

[pull] master from php:master #407

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 12 commits into from
Sep 29, 2025
Merged

[pull] master from php:master #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f566312
zend_API: Remove `ZVAL_IS_NULL()` (#19986)
TimWolla Sep 29, 2025
5668b16
Revert "Pdo\Pgsql: Fix getColumnMeta() for GH-15287 Pdo\Pgsql::setAtt…
devnexen Sep 29, 2025
584ae5e
Zend/zend_execute_API.c: add const qualifiers
Girgias Sep 25, 2025
2f6afda
Zend/zend_execute_API.c: reduce variable scope
Girgias Sep 25, 2025
ec31437
Zend/zend_execute_API.c: use uint32_t type instead of int
Girgias Sep 25, 2025
d94846c
Fix GH-19988: zend_string_init with NULL pointer in simplexml (UB)
ndossche Sep 29, 2025
190f427
Fix NEWS order
ndossche Sep 29, 2025
1bda46e
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Sep 29, 2025
c1a6627
Merge branch 'PHP-8.4' into PHP-8.5
ndossche Sep 29, 2025
4db8993
Merge branch 'PHP-8.5'
ndossche Sep 29, 2025
8987c0b
Fix uninitialized soap lang_en string on ZTS
ndossche Sep 12, 2025
8ea4d7b
Merge branch 'PHP-8.5'
ndossche Sep 29, 2025
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
4 changes: 0 additions & 4 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,4 @@ PHP NEWS
with a given skeleton, locale, collapse type and identity fallback.
(BogdanUngureanu)

- PDO_PGSQL:
. Fixed Pdo\Pgsql::getColumnMeta() when Pdo\Pgsql::setAttribute(PDO::ATTR_PREFETCH, 0).
(outtersg)

<<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
1 change: 1 addition & 0 deletions UPGRADING.INTERNALS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ PHP 8.6 INTERNALS UPGRADE NOTES
. ZSTR_INIT_LITERAL(), zend_string_starts_with_literal(), and
zend_string_starts_with_literal_ci() now support strings containing NUL
bytes. Passing non-literal char* is no longer supported.
. The misnamed ZVAL_IS_NULL() has been removed. Use Z_ISNULL() instead.

========================
2. Build system changes
Expand Down
1 change: 0 additions & 1 deletion Zend/zend_API.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,6 @@ static zend_always_inline bool zend_char_has_nul_byte(const char *s, size_t know
#define RETURN_THROWS() do { ZEND_ASSERT(EG(exception)); (void) return_value; return; } while (0)

#define HASH_OF(p) (Z_TYPE_P(p)==IS_ARRAY ? Z_ARRVAL_P(p) : ((Z_TYPE_P(p)==IS_OBJECT ? Z_OBJ_HT_P(p)->get_properties(Z_OBJ_P(p)) : NULL)))
#define ZVAL_IS_NULL(z) (Z_TYPE_P(z) == IS_NULL)

/* For compatibility */
#define ZEND_MINIT ZEND_MODULE_STARTUP_N
Expand Down
8 changes: 4 additions & 4 deletions Zend/zend_execute.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ ZEND_API void zend_init_code_execute_data(zend_execute_data *execute_data, zend_
ZEND_API void zend_execute(zend_op_array *op_array, zval *return_value);
ZEND_API void execute_ex(zend_execute_data *execute_data);
ZEND_API void execute_internal(zend_execute_data *execute_data, zval *return_value);
ZEND_API bool zend_is_valid_class_name(zend_string *name);
ZEND_API bool zend_is_valid_class_name(const zend_string *name);
ZEND_API zend_class_entry *zend_lookup_class(zend_string *name);
ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, zend_string *lcname, uint32_t flags);
ZEND_API zend_class_entry *zend_get_called_scope(zend_execute_data *ex);
ZEND_API zend_object *zend_get_this_object(zend_execute_data *ex);
ZEND_API zend_class_entry *zend_get_called_scope(const zend_execute_data *ex);
ZEND_API zend_object *zend_get_this_object(const zend_execute_data *ex);
ZEND_API zend_result zend_eval_string(const char *str, zval *retval_ptr, const char *string_name);
ZEND_API zend_result zend_eval_stringl(const char *str, size_t str_len, zval *retval_ptr, const char *string_name);
ZEND_API zend_result zend_eval_string_ex(const char *str, zval *retval_ptr, const char *string_name, bool handle_exceptions);
Expand Down Expand Up @@ -453,7 +453,7 @@ ZEND_API const char *get_active_class_name(const char **space);
ZEND_API const char *get_active_function_name(void);
ZEND_API const char *get_active_function_arg_name(uint32_t arg_num);
ZEND_API const char *get_function_arg_name(const zend_function *func, uint32_t arg_num);
ZEND_API zend_function *zend_active_function_ex(zend_execute_data *execute_data);
ZEND_API zend_function *zend_active_function_ex(const zend_execute_data *execute_data);

static zend_always_inline zend_function *zend_active_function(void)
{
Expand Down
61 changes: 30 additions & 31 deletions Zend/zend_execute_API.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ static void zend_handle_sigsegv(void) /* {{{ */
/* }}} */
#endif

static void zend_extension_activator(zend_extension *extension) /* {{{ */
static void zend_extension_activator(const zend_extension *extension) /* {{{ */
{
if (extension->activate) {
extension->activate();
}
}
/* }}} */

static void zend_extension_deactivator(zend_extension *extension) /* {{{ */
static void zend_extension_deactivator(const zend_extension *extension) /* {{{ */
{
if (extension->deactivate) {
extension->deactivate();
Expand All @@ -113,14 +113,14 @@ static int clean_non_persistent_constant_full(zval *zv) /* {{{ */

static int clean_non_persistent_function_full(zval *zv) /* {{{ */
{
zend_function *function = Z_PTR_P(zv);
const zend_function *function = Z_PTR_P(zv);
return (function->type == ZEND_INTERNAL_FUNCTION) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
}
/* }}} */

static int clean_non_persistent_class_full(zval *zv) /* {{{ */
{
zend_class_entry *ce = Z_PTR_P(zv);
const zend_class_entry *ce = Z_PTR_P(zv);
return (ce->type == ZEND_INTERNAL_CLASS) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
}
/* }}} */
Expand Down Expand Up @@ -229,7 +229,7 @@ static void zend_unclean_zval_ptr_dtor(zval *zv) /* {{{ */
}
/* }}} */

static ZEND_COLD void zend_throw_or_error(int fetch_type, zend_class_entry *exception_ce, const char *format, ...) /* {{{ */
static ZEND_COLD void zend_throw_or_error(uint32_t fetch_type, zend_class_entry *exception_ce, const char *format, ...) /* {{{ */
{
va_list va;
char *message = NULL;
Expand Down Expand Up @@ -270,9 +270,6 @@ void shutdown_destructors(void) /* {{{ */
/* Free values held by the executor. */
ZEND_API void zend_shutdown_executor_values(bool fast_shutdown)
{
zend_string *key;
zval *zv;

EG(flags) |= EG_FLAGS_IN_RESOURCE_SHUTDOWN;
zend_try {
zend_close_rsrc_list(&EG(regular_list));
Expand All @@ -282,12 +279,15 @@ ZEND_API void zend_shutdown_executor_values(bool fast_shutdown)
EG(active) = 0;

if (!fast_shutdown) {
zval *zv;

zend_hash_graceful_reverse_destroy(&EG(symbol_table));

/* Constants may contain objects, destroy them before the object store. */
if (EG(full_tables_cleanup)) {
zend_hash_reverse_apply(EG(zend_constants), clean_non_persistent_constant_full);
} else {
zend_string *key;
ZEND_HASH_MAP_REVERSE_FOREACH_STR_KEY_VAL(EG(zend_constants), key, zv) {
zend_constant *c = Z_PTR_P(zv);
if (_idx == EG(persistent_constants_count)) {
Expand Down Expand Up @@ -434,8 +434,6 @@ ZEND_API void zend_shutdown_executor_values(bool fast_shutdown)

void shutdown_executor(void) /* {{{ */
{
zend_string *key;
zval *zv;
#if ZEND_DEBUG
bool fast_shutdown = 0;
#elif defined(__SANITIZE_ADDRESS__)
Expand Down Expand Up @@ -477,6 +475,8 @@ void shutdown_executor(void) /* {{{ */
zend_hash_reverse_apply(EG(function_table), clean_non_persistent_function_full);
zend_hash_reverse_apply(EG(class_table), clean_non_persistent_class_full);
} else {
zend_string *key;
zval *zv;
ZEND_HASH_MAP_REVERSE_FOREACH_STR_KEY_VAL(EG(function_table), key, zv) {
zend_function *func = Z_PTR_P(zv);
if (_idx == EG(persistent_functions_count)) {
Expand Down Expand Up @@ -536,7 +536,7 @@ void shutdown_executor(void) /* {{{ */
/* return class name and "::" or "". */
ZEND_API const char *get_active_class_name(const char **space) /* {{{ */
{
zend_function *func;
const zend_function *func;

if (!zend_is_executing()) {
if (space) {
Expand All @@ -551,7 +551,7 @@ ZEND_API const char *get_active_class_name(const char **space) /* {{{ */
case ZEND_USER_FUNCTION:
case ZEND_INTERNAL_FUNCTION:
{
zend_class_entry *ce = func->common.scope;
const zend_class_entry *ce = func->common.scope;

if (space) {
*space = ce ? "::" : "";
Expand All @@ -569,7 +569,7 @@ ZEND_API const char *get_active_class_name(const char **space) /* {{{ */

ZEND_API const char *get_active_function_name(void) /* {{{ */
{
zend_function *func;
const zend_function *func;

if (!zend_is_executing()) {
return NULL;
Expand All @@ -579,7 +579,7 @@ ZEND_API const char *get_active_function_name(void) /* {{{ */

switch (func->type) {
case ZEND_USER_FUNCTION: {
zend_string *function_name = func->common.function_name;
const zend_string *function_name = func->common.function_name;

if (function_name) {
return ZSTR_VAL(function_name);
Expand All @@ -597,7 +597,7 @@ ZEND_API const char *get_active_function_name(void) /* {{{ */
}
/* }}} */

ZEND_API zend_function *zend_active_function_ex(zend_execute_data *execute_data)
ZEND_API zend_function *zend_active_function_ex(const zend_execute_data *execute_data)
{
zend_function *func = EX(func);

Expand Down Expand Up @@ -636,7 +636,7 @@ ZEND_API const char *get_active_function_arg_name(uint32_t arg_num) /* {{{ */
return NULL;
}

zend_function *func = zend_active_function();
const zend_function *func = zend_active_function();

return get_function_arg_name(func, arg_num);
}
Expand All @@ -658,7 +658,7 @@ ZEND_API const char *get_function_arg_name(const zend_function *func, uint32_t a

ZEND_API const char *zend_get_executed_filename(void) /* {{{ */
{
zend_string *filename = zend_get_executed_filename_ex();
const zend_string *filename = zend_get_executed_filename_ex();
return filename != NULL ? ZSTR_VAL(filename) : "[no active file]";
}
/* }}} */
Expand All @@ -670,7 +670,7 @@ ZEND_API zend_string *zend_get_executed_filename_ex(void) /* {{{ */
return filename_override;
}

zend_execute_data *ex = EG(current_execute_data);
const zend_execute_data *ex = EG(current_execute_data);

while (ex && (!ex->func || !ZEND_USER_CODE(ex->func->type))) {
ex = ex->prev_execute_data;
Expand All @@ -690,7 +690,7 @@ ZEND_API uint32_t zend_get_executed_lineno(void) /* {{{ */
return lineno_override;
}

zend_execute_data *ex = EG(current_execute_data);
const zend_execute_data *ex = EG(current_execute_data);

while (ex && (!ex->func || !ZEND_USER_CODE(ex->func->type))) {
ex = ex->prev_execute_data;
Expand Down Expand Up @@ -739,7 +739,7 @@ ZEND_API zend_result ZEND_FASTCALL zval_update_constant_with_ctx(zval *p, zend_c

if (ast->kind == ZEND_AST_CONSTANT) {
zend_string *name = zend_ast_get_constant_name(ast);
zval *zv = zend_get_constant_ex(name, scope, ast->attr);
const zval *zv = zend_get_constant_ex(name, scope, ast->attr);
if (UNEXPECTED(zv == NULL)) {
return FAILURE;
}
Expand Down Expand Up @@ -808,7 +808,6 @@ zend_result _call_user_function_impl(zval *object, zval *function_name, zval *re

zend_result zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) /* {{{ */
{
uint32_t i;
zend_execute_data *call;
zend_fcall_info_cache fci_cache_local;
zend_function *func;
Expand Down Expand Up @@ -871,7 +870,7 @@ zend_result zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_
}
}

for (i=0; i<fci->param_count; i++) {
for (uint32_t i = 0; i < fci->param_count; i++) {
zval *param = ZEND_CALL_ARG(call, i+1);
zval *arg = &fci->params[i];
bool must_wrap = false;
Expand Down Expand Up @@ -1158,7 +1157,7 @@ static const uint32_t valid_chars[8] = {
0xffffffff,
};

ZEND_API bool zend_is_valid_class_name(zend_string *name) {
ZEND_API bool zend_is_valid_class_name(const zend_string *name) {
for (size_t i = 0; i < ZSTR_LEN(name); i++) {
unsigned char c = ZSTR_VAL(name)[i];
if (!ZEND_BIT_TEST(valid_chars, c)) {
Expand Down Expand Up @@ -1298,7 +1297,7 @@ ZEND_API zend_class_entry *zend_lookup_class(zend_string *name) /* {{{ */
}
/* }}} */

ZEND_API zend_class_entry *zend_get_called_scope(zend_execute_data *ex) /* {{{ */
ZEND_API zend_class_entry *zend_get_called_scope(const zend_execute_data *ex) /* {{{ */
{
while (ex) {
if (Z_TYPE(ex->This) == IS_OBJECT) {
Expand All @@ -1316,7 +1315,7 @@ ZEND_API zend_class_entry *zend_get_called_scope(zend_execute_data *ex) /* {{{ *
}
/* }}} */

ZEND_API zend_object *zend_get_this_object(zend_execute_data *ex) /* {{{ */
ZEND_API zend_object *zend_get_this_object(const zend_execute_data *ex) /* {{{ */
{
while (ex) {
if (Z_TYPE(ex->This) == IS_OBJECT) {
Expand Down Expand Up @@ -1689,7 +1688,7 @@ void zend_unset_timeout(void) /* {{{ */
}
/* }}} */

static ZEND_COLD void report_class_fetch_error(zend_string *class_name, uint32_t fetch_type)
static ZEND_COLD void report_class_fetch_error(const zend_string *class_name, uint32_t fetch_type)
{
if (fetch_type & ZEND_FETCH_CLASS_SILENT) {
return;
Expand Down Expand Up @@ -1858,7 +1857,7 @@ ZEND_API zend_array *zend_rebuild_symbol_table(void) /* {{{ */

ZEND_API void zend_attach_symbol_table(zend_execute_data *execute_data) /* {{{ */
{
zend_op_array *op_array = &execute_data->func->op_array;
const zend_op_array *op_array = &execute_data->func->op_array;
HashTable *ht = execute_data->symbol_table;

/* copy real values from symbol table into CV slots and create
Expand All @@ -1873,7 +1872,7 @@ ZEND_API void zend_attach_symbol_table(zend_execute_data *execute_data) /* {{{ *

if (zv) {
if (Z_TYPE_P(zv) == IS_INDIRECT) {
zval *val = Z_INDIRECT_P(zv);
const zval *val = Z_INDIRECT_P(zv);

ZVAL_COPY_VALUE(var, val);
} else {
Expand All @@ -1893,7 +1892,7 @@ ZEND_API void zend_attach_symbol_table(zend_execute_data *execute_data) /* {{{ *

ZEND_API void zend_detach_symbol_table(zend_execute_data *execute_data) /* {{{ */
{
zend_op_array *op_array = &execute_data->func->op_array;
const zend_op_array *op_array = &execute_data->func->op_array;
HashTable *ht = execute_data->symbol_table;

/* copy real values from CV slots into symbol table */
Expand Down Expand Up @@ -1927,7 +1926,7 @@ ZEND_API zend_result zend_set_local_var(zend_string *name, zval *value, bool for
if (execute_data) {
if (!(EX_CALL_INFO() & ZEND_CALL_HAS_SYMBOL_TABLE)) {
zend_ulong h = zend_string_hash_val(name);
zend_op_array *op_array = &execute_data->func->op_array;
const zend_op_array *op_array = &execute_data->func->op_array;

if (EXPECTED(op_array->last_var)) {
zend_string **str = op_array->vars;
Expand Down Expand Up @@ -1970,7 +1969,7 @@ ZEND_API zend_result zend_set_local_var_str(const char *name, size_t len, zval *
if (execute_data) {
if (!(EX_CALL_INFO() & ZEND_CALL_HAS_SYMBOL_TABLE)) {
zend_ulong h = zend_hash_func(name, len);
zend_op_array *op_array = &execute_data->func->op_array;
const zend_op_array *op_array = &execute_data->func->op_array;
if (EXPECTED(op_array->last_var)) {
zend_string **str = op_array->vars;
zend_string **end = str + op_array->last_var;
Expand Down
Loading