Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ PHP NEWS
- MBstring:
. Updated Unicode data tables to Unicode 17.0. (Yuya Hamada)

- Reflection:
. ReflectionConstant is no longer final. (sasezaki)

- Standard:
. Passing strings which are not one byte long to ord() is now deprecated.
(Girgias)
Expand Down
3 changes: 3 additions & 0 deletions UPGRADING
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,9 @@ PHP 8.5 UPGRADE NOTES
readline_callback_handler_install() have been changed to true, rather
than bool.

- Reflection:
. ReflectionConstant is no longer final.

========================================
10. New Global Constants
========================================
Expand Down
3 changes: 3 additions & 0 deletions Zend/zend_closures.c
Original file line number Diff line number Diff line change
Expand Up @@ -866,6 +866,9 @@ ZEND_API void zend_create_fake_closure(zval *res, zend_function *func, zend_clas

closure = (zend_closure *)Z_OBJ_P(res);
closure->func.common.fn_flags |= ZEND_ACC_FAKE_CLOSURE;
if (Z_TYPE(closure->this_ptr) != IS_OBJECT) {
GC_ADD_FLAGS(&closure->std, GC_NOT_COLLECTABLE);
}
}
/* }}} */

Expand Down
1 change: 1 addition & 0 deletions Zend/zend_enum.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ ZEND_API zend_object_handlers zend_enum_object_handlers;
zend_object *zend_enum_new(zval *result, zend_class_entry *ce, zend_string *case_name, zval *backing_value_zv)
{
zend_object *zobj = zend_objects_new(ce);
GC_ADD_FLAGS(zobj, GC_NOT_COLLECTABLE);
ZVAL_OBJ(result, zobj);

zval *zname = OBJ_PROP_NUM(zobj, 0);
Expand Down
2 changes: 1 addition & 1 deletion ext/opcache/jit/ir/ir_aarch64.dasc
Original file line number Diff line number Diff line change
Expand Up @@ -4457,7 +4457,7 @@ static void ir_emit_va_arg(ir_ctx *ctx, ir_ref def, ir_insn *insn)
} else {
IR_ASSERT(ir_rule(ctx, insn->op2) == IR_STATIC_ALLOCA);
op2_reg = (ctx->flags & IR_USE_FRAME_POINTER) ? IR_REG_FRAME_POINTER : IR_REG_STACK_POINTER;
offset = ir_local_offset(ct, &ctx->ir_base[insn->op2]);
offset = ir_local_offset(ctx, &ctx->ir_base[insn->op2]);
}
| ldr Rx(tmp_reg), [Rx(op2_reg), #offset]
ir_emit_load_mem(ctx, type, def_reg, IR_MEM_BO(tmp_reg, 0));
Expand Down
2 changes: 1 addition & 1 deletion ext/reflection/php_reflection.stub.php
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,7 @@ public function getTrace(int $options = DEBUG_BACKTRACE_PROVIDE_OBJECT): array {
* @strict-properties
* @not-serializable
*/
final class ReflectionConstant implements Reflector
class ReflectionConstant implements Reflector
{
public string $name;

Expand Down
4 changes: 2 additions & 2 deletions ext/reflection/php_reflection_arginfo.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.