Use ZEND_TOSTRING_FUNC_NAME

moliata · nikic · commit 48e16a9dba12 · 2020-06-18T17:06:19.000+02:00
Closes GH-5736.
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -6465,7 +6465,7 @@ void zend_compile_func_decl(znode *result, zend_ast *ast, zend_bool toplevel) /*
 	}
 
 	zend_compile_params(params_ast, return_type_ast,
-		is_method && zend_string_equals_literal_ci(decl->name, "__toString") ? IS_STRING : 0);
+		is_method && zend_string_equals_literal(method_lcname, ZEND_TOSTRING_FUNC_NAME) ? IS_STRING : 0);
 	if (CG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) {
 		zend_mark_function_as_generator();
 		zend_emit_op(NULL, ZEND_GENERATOR_CREATE, NULL, NULL);

Original file line number	Diff line number	Diff line change
`@@ -6465,7 +6465,7 @@ void zend_compile_func_decl(znode result, zend_ast ast, zend_bool toplevel) /*`
`6465`	`6465`	`}`
`6466`	`6466`
`6467`	`6467`	`zend_compile_params(params_ast, return_type_ast,`
`6468`		`- is_method && zend_string_equals_literal_ci(decl->name, "__toString") ? IS_STRING : 0);`
	`6468`	`+ is_method && zend_string_equals_literal(method_lcname, ZEND_TOSTRING_FUNC_NAME) ? IS_STRING : 0);`
`6469`	`6469`	`if (CG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) {`
`6470`	`6470`	`zend_mark_function_as_generator();`
`6471`	`6471`	`zend_emit_op(NULL, ZEND_GENERATOR_CREATE, NULL, NULL);`