Skip to content

Commit cc4402b

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Fix GH-17234: Numeric parent hook call fails with assertion
2 parents e40543a + 7149362 commit cc4402b

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed
+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--TEST--
2+
GH-17234 (Numeric parent hook call fails with assertion)
3+
--FILE--
4+
<?php
5+
class ParentC {}
6+
class Child extends ParentC {
7+
public $a {
8+
get {
9+
return parent::${0}::get ();
10+
}
11+
}
12+
}
13+
?>
14+
--EXPECTF--
15+
Fatal error: Must not use parent::$0::get() in a different property ($a) in %s on line %d

Zend/zend_compile.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -5094,7 +5094,8 @@ static bool zend_compile_parent_property_hook_call(znode *result, zend_ast *ast,
50945094
zend_error_noreturn(E_COMPILE_ERROR, "Cannot create Closure for parent property hook call");
50955095
}
50965096

5097-
zend_string *property_name = zend_ast_get_str(class_ast->child[1]);
5097+
zval *property_hook_name_zv = zend_ast_get_zval(class_ast->child[1]);
5098+
zend_string *property_name = zval_get_string(property_hook_name_zv);
50985099
zend_string *hook_name = zend_ast_get_str(method_ast);
50995100
zend_property_hook_kind hook_kind = zend_get_property_hook_kind_from_name(hook_name);
51005101
ZEND_ASSERT(hook_kind != (uint32_t)-1);
@@ -5118,7 +5119,6 @@ static bool zend_compile_parent_property_hook_call(znode *result, zend_ast *ast,
51185119
zend_op *opline = get_next_op();
51195120
opline->opcode = ZEND_INIT_PARENT_PROPERTY_HOOK_CALL;
51205121
opline->op1_type = IS_CONST;
5121-
zend_string_copy(property_name);
51225122
opline->op1.constant = zend_add_literal_string(&property_name);
51235123
opline->op2.num = hook_kind;
51245124

0 commit comments

Comments
 (0)