Skip to content

Commit 9352d56

Browse files
committed
Fix failing test
1 parent f8846fd commit 9352d56

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

Zend/zend_compile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6996,7 +6996,7 @@ static zend_type zend_compile_single_typename(zend_ast *ast)
69966996
}
69976997

69986998
return (zend_type) ZEND_TYPE_INIT_CODE(ast->attr, 0, 0);
6999-
} else if (ast->kind == ZEND_AST_CLASS_CONST) {
6999+
} else if (ast->kind == ZEND_AST_CLASS_CONST || ast->kind == ZEND_AST_INNER_CLASS) {
70007000
zval cnz;
70017001
zend_try_compile_const_expr_resolve_class_name(&cnz, ast->child[0]);
70027002
zend_string *class_name = Z_STR(cnz);

Zend/zend_vm_def.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1847,7 +1847,7 @@ ZEND_VM_INLINE_HELPER(zend_fetch_static_prop_helper, ANY, ANY, int type)
18471847
prop = &EG(uninitialized_zval);
18481848
}
18491849

1850-
if (type == BP_VAR_R || type == BP_VAR_IS) {
1850+
if (type == BP_VAR_R || type == BP_VAR_INNER_CLASS || type == BP_VAR_IS) {
18511851
ZVAL_COPY_DEREF(EX_VAR(opline->result.var), prop);
18521852
} else {
18531853
ZVAL_INDIRECT(EX_VAR(opline->result.var), prop);

Zend/zend_vm_execute.h

Lines changed: 1 addition & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)