Changed ZEND_FETCH_DEFAULT_ARG OP to call internal reflection method.

Exposed get_parameter_default from reflection API.

Author: Bilge

Zend/tests/default_expression/internal function.phpt

@@ -0,0 +1,10 @@
+--TEST--
+Tests passing default to an internal function parameter
+--FILE--
+<?php
+
+json_encode([], depth: $D = default);
+var_dump($D);
+?>
+--EXPECT--
+int(512)

Zend/zend_vm_def.h

@@ -9815,31 +9815,14 @@ ZEND_VM_HANDLER(210, ZEND_FETCH_DEFAULT_ARG, UNUSED|NUM, UNUSED)
 
 	zend_function *called_func = EX(call)->func;
 
-	/*
-	 * [0]: The function (string) or class method (array) to reflect parameters from.
-	 * [1]: A zero-based integer specifying the parameter position.
-	 */
-	zval constructor_params[2];
-	ZVAL_LONG(&constructor_params[1], opline->op1.num - 1);
-	if (called_func->common.scope == NULL) {
-		ZVAL_STR_COPY(&constructor_params[0], called_func->common.function_name);
-	} else {
-		zval arr;
-		array_init_size(&arr, 2);
-		add_next_index_string(&arr, called_func->common.scope->name->val);
-		add_next_index_string(&arr, called_func->common.function_name->val);
-		ZVAL_ARR(&constructor_params[0], Z_ARR(arr));
-	}
-
-	zval reflection_obj;
-	// TODO: Check result.
-	/*zend_result res =*/ object_init_with_constructor(&reflection_obj, reflection_parameter_ptr, 2, constructor_params, NULL);
-	zval_ptr_dtor(&constructor_params[0]);
-	zval_ptr_dtor(&constructor_params[1]);
+	parameter_reference pr;
+	pr.offset = opline->op1.num - 1;
+	pr.required = pr.offset < called_func->common.required_num_args;
+	pr.arg_info = &called_func->common.arg_info[pr.offset];
+	pr.fptr = called_func;
 
 	zval default_value;
-	zend_call_method_with_0_params(Z_OBJ(reflection_obj), reflection_parameter_ptr, NULL, "getDefaultValue", &default_value);
-	zval_ptr_dtor(&reflection_obj);
+	get_parameter_default(&default_value, &pr);
 
 	ZVAL_COPY(EX_VAR(opline->result.var), &default_value);
 	ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();

Zend/zend_vm_execute.h

@@ -130,14 +130,6 @@ typedef struct _property_reference {
 	zend_string *unmangled_name;
 } property_reference;
 
-/* Struct for parameters */
-typedef struct _parameter_reference {
-	uint32_t offset;
-	bool required;
-	struct _zend_arg_info *arg_info;
-	zend_function *fptr;
-} parameter_reference;
-
 /* Struct for type hints */
 typedef struct _type_reference {
 	zend_type type;
@@ -1536,7 +1528,7 @@ static void reflection_enum_case_factory(zend_class_entry *ce, zend_string *name
 	ZVAL_STR_COPY(reflection_prop_class(object), constant->ce->name);
 }
 
-static int get_parameter_default(zval *result, parameter_reference *param) {
+PHPAPI int get_parameter_default(zval *result, parameter_reference *param) {
 	if (param->fptr->type == ZEND_INTERNAL_FUNCTION) {
 		if (param->fptr->common.fn_flags & ZEND_ACC_USER_ARG_INFO) {
 			/* We don't have a way to determine the default value for this case right now. */

ext/reflection/php_reflection.c

@@ -50,6 +50,16 @@ extern PHPAPI zend_class_entry *reflection_fiber_ptr;
 
 PHPAPI void zend_reflection_class_factory(zend_class_entry *ce, zval *object);
 
+/* Struct for parameters */
+typedef struct _parameter_reference {
+	uint32_t offset;
+	bool required;
+	struct _zend_arg_info *arg_info;
+	zend_function *fptr;
+} parameter_reference;
+
+PHPAPI int get_parameter_default(zval *result, parameter_reference *param);
+
 END_EXTERN_C()
 
 #endif /* PHP_REFLECTION_H */