Positional placeholders that run into the variadic portion generate an unnamed parameter

Author: arnaud-lb

Zend/tests/partial_application/magic_001.phpt

@@ -47,7 +47,7 @@ Partial [ <user, prototype Foo> public method method ] {
   @@ %s 12 - 12
 
   - Parameters [1] {
-    Parameter #0 [ <required> $args ]
+    Parameter #0 [ <required> $ ]
   }
 }
 not enough arguments for application of Foo::method, 0 given and exactly 1 expected, declared in %s on line 12
@@ -58,7 +58,7 @@ Partial [ <user, prototype Foo> public method method ] {
   @@ %s 30 - 30
 
   - Parameters [2] {
-    Parameter #0 [ <required> $args ]
+    Parameter #0 [ <required> $ ]
     Parameter #1 [ <optional> ...$args ]
   }
 }

Zend/tests/partial_application/magic_002.phpt

@@ -33,7 +33,7 @@ Partial [ <user, prototype Foo> public method method ] {
   @@ %s 10 - 10
 
   - Parameters [1] {
-    Parameter #0 [ <required> $args ]
+    Parameter #0 [ <required> $ ]
   }
 }
 Foo::method
@@ -42,7 +42,7 @@ Partial [ <user, prototype Foo> public method method ] {
   @@ %s 16 - 16
 
   - Parameters [2] {
-    Parameter #0 [ <required> $args ]
+    Parameter #0 [ <required> $ ]
     Parameter #1 [ <optional> ...$args ]
   }
 }

Zend/tests/partial_application/magic_005.phpt

@@ -24,7 +24,7 @@ object(Closure)#%d (6) {
   }
   ["parameter"]=>
   array(1) {
-    ["$args"]=>
+    ["$"]=>
     string(10) "<required>"
   }
   ["args"]=>

Zend/tests/partial_application/reflection_002.phpt

@@ -43,15 +43,15 @@ Partial [ <user> function foo ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> $a ]
-    Parameter #1 [ <required> $b ]
+    Parameter #1 [ <required> $ ]
   }
 }
 Partial [ <user> function foo ] {
   @@ %s 18 - 18
 
   - Parameters [3] {
     Parameter #0 [ <required> $a ]
-    Parameter #1 [ <required> $b ]
-    Parameter #2 [ <required> $b ]
+    Parameter #1 [ <required> $ ]
+    Parameter #2 [ <required> $ ]
   }
 }

Zend/tests/partial_application/reflection_003.phpt

@@ -37,7 +37,7 @@ Partial [ <user> function sprintf ] {
 
   - Parameters [2] {
     Parameter #0 [ <required> string $format ]
-    Parameter #1 [ <required> mixed $values ]
+    Parameter #1 [ <required> mixed $ ]
   }
   - Return [ string ]
 }

Zend/zend_execute.c

@@ -5395,6 +5395,10 @@ static zend_always_inline uint32_t zend_get_arg_offset_by_name(
 		return *(uintptr_t *)(cache_slot + 1);
 	}
 
+	if (UNEXPECTED(ZSTR_LEN(arg_name) == 0)) {
+		return (uint32_t)-1;
+	}
+
 	// TODO: Use a hash table?
 	uint32_t num_args = fbc->common.num_args;
 	if (EXPECTED(fbc->type == ZEND_USER_FUNCTION)

Zend/zend_partial.c

@@ -139,15 +139,14 @@ static zend_always_inline void zend_partial_signature_create(zend_partial *parti
 				/* Placeholders that run into the variadic portion become
 				 * required and make all params before them required */
 				required = num;
-				// TODO: update arg name
+				info->name = zend_empty_string;
+				info->default_value = NULL;
 				if (ZEND_PARTIAL_IS_CALL_TRAMPOLINE(&partial->func)) {
-					memcpy(info, zend_call_magic_arginfo, sizeof(zend_arg_info));
+					info->type = (zend_type){0};
 				} else {
-					memcpy(info,
-						partial->func.common.arg_info + partial->func.common.num_args,
-						sizeof(zend_arg_info));
+					info->type = (partial->func.common.arg_info + partial->func.common.num_args)->type;
+					ZEND_TYPE_FULL_MASK(info->type) &= ~_ZEND_IS_VARIADIC_BIT;
 				}
-				ZEND_TYPE_FULL_MASK(info->type) &= ~_ZEND_IS_VARIADIC_BIT;
 				if (EXPECTED(num < MAX_ARG_FLAG_NUM)) {
 					uint32_t mode = ZEND_ARG_SEND_MODE(info);
 					if (mode) {
@@ -213,13 +212,15 @@ static zend_always_inline void zend_partial_signature_create(zend_partial *parti
 		if (ZEND_PARTIAL_FUNC_FLAG(&partial->trampoline, ZEND_ACC_HAS_RETURN_TYPE)) {
 			info++;
 		}
-		while (info < end) {
+		for (; info < end; info++) {
 			zend_internal_arg_info *ii = (zend_internal_arg_info*) info;
+			if ((zend_string*)ii->name == zend_empty_string) {
+				continue;
+			}
 			info->name = zend_string_init(ii->name, strlen(ii->name), false);
 			if (ii->default_value) {
 				info->default_value = zend_string_init(ii->default_value, strlen(ii->default_value), false);
 			}
-			info++;
 		}
 	}