Support __call with named params

nikic · nikic · commit 338535f84f8e · 2020-06-29T14:22:35.000+02:00
diff --git a/Zend/tests/named_params/__call.phpt b/Zend/tests/named_params/__call.phpt
@@ -8,20 +8,30 @@ class Test {
         $this->{'_'.$method}(...$args);
     }
 
+    public static function __callStatic(string $method, array $args) {
+        (new static)->{'_'.$method}(...$args);
+    }
+
     private function _method($a = 'a', $b = 'b') {
         echo "a: $a, b: $b\n";
     }
 }
 
+$obj = new class { public function __toString() { return "STR"; } };
+
 $test = new Test;
-$test->method('A', 'B');
 $test->method(a: 'A', b: 'B');
+$test->method(b: 'B');
+$test->method(b: $obj);
+Test::method(a: 'A', b: 'B');
+Test::method(b: 'B');
+Test::method(b: $obj);
 
 ?>
---EXPECTF--
+--EXPECT--
 a: A, b: B
-
-Fatal error: Uncaught Error: Unknown named parameter $a in %s:%d
-Stack trace:
-#0 {main}
-  thrown in %s on line %d
+a: a, b: B
+a: a, b: STR
+a: A, b: B
+a: a, b: B
+a: a, b: STR
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
@@ -1106,6 +1106,7 @@ ZEND_API zend_function *zend_get_call_trampoline_func(zend_class_entry *ce, zend
 	 * The low bit must be zero, to not be interpreted as a MAP_PTR offset.
 	 */
 	static const void *dummy = (void*)(intptr_t)2;
+	static const zend_arg_info arg_info[1] = {{0}};
 
 	ZEND_ASSERT(fbc);
 
@@ -1119,7 +1120,7 @@ ZEND_API zend_function *zend_get_call_trampoline_func(zend_class_entry *ce, zend
 	func->arg_flags[0] = 0;
 	func->arg_flags[1] = 0;
 	func->arg_flags[2] = 0;
-	func->fn_flags = ZEND_ACC_CALL_VIA_TRAMPOLINE | ZEND_ACC_PUBLIC;
+	func->fn_flags = ZEND_ACC_CALL_VIA_TRAMPOLINE | ZEND_ACC_PUBLIC | ZEND_ACC_VARIADIC;
 	if (is_static) {
 		func->fn_flags |= ZEND_ACC_STATIC;
 	}
@@ -1143,7 +1144,7 @@ ZEND_API zend_function *zend_get_call_trampoline_func(zend_class_entry *ce, zend
 	func->prototype = NULL;
 	func->num_args = 0;
 	func->required_num_args = 0;
-	func->arg_info = 0;
+	func->arg_info = (zend_arg_info *) arg_info;
 
 	return (zend_function*)func;
 }
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -8286,7 +8286,7 @@ ZEND_VM_HANDLER(158, ZEND_CALL_TRAMPOLINE, ANY, ANY)
 	zend_array *args = NULL;
 	zend_function *fbc = EX(func);
 	zval *ret = EX(return_value);
-	uint32_t call_info = EX_CALL_INFO() & (ZEND_CALL_NESTED | ZEND_CALL_TOP | ZEND_CALL_RELEASE_THIS);
+	uint32_t call_info = EX_CALL_INFO() & (ZEND_CALL_NESTED | ZEND_CALL_TOP | ZEND_CALL_RELEASE_THIS | ZEND_CALL_HAS_EXTRA_NAMED_PARAMS);
 	uint32_t num_args = EX_NUM_ARGS();
 	zend_execute_data *call;
 
@@ -8319,6 +8319,10 @@ ZEND_VM_HANDLER(158, ZEND_CALL_TRAMPOLINE, ANY, ANY)
 	} else {
 		ZVAL_EMPTY_ARRAY(ZEND_CALL_ARG(call, 2));
 	}
+	if (UNEXPECTED(call_info & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS)) {
+		SEPARATE_ARRAY(ZEND_CALL_ARG(call, 2));
+		zend_hash_copy(Z_ARRVAL_P(ZEND_CALL_ARG(call, 2)), call->extra_named_params, zval_add_ref);
+	}
 	zend_free_trampoline(fbc);
 	fbc = call->func;
 
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -2804,7 +2804,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CALL_TRAMPOLINE_SPEC_HANDLER(Z
 	zend_array *args = NULL;
 	zend_function *fbc = EX(func);
 	zval *ret = EX(return_value);
-	uint32_t call_info = EX_CALL_INFO() & (ZEND_CALL_NESTED | ZEND_CALL_TOP | ZEND_CALL_RELEASE_THIS);
+	uint32_t call_info = EX_CALL_INFO() & (ZEND_CALL_NESTED | ZEND_CALL_TOP | ZEND_CALL_RELEASE_THIS | ZEND_CALL_HAS_EXTRA_NAMED_PARAMS);
 	uint32_t num_args = EX_NUM_ARGS();
 	zend_execute_data *call;
 
@@ -2837,6 +2837,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CALL_TRAMPOLINE_SPEC_HANDLER(Z
 	} else {
 		ZVAL_EMPTY_ARRAY(ZEND_CALL_ARG(call, 2));
 	}
+	if (UNEXPECTED(call_info & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS)) {
+		SEPARATE_ARRAY(ZEND_CALL_ARG(call, 2));
+		zend_hash_copy(Z_ARRVAL_P(ZEND_CALL_ARG(call, 2)), call->extra_named_params, zval_add_ref);
+	}
 	zend_free_trampoline(fbc);
 	fbc = call->func;
 
