variadics variation and fixes

Author: krakjoe

Zend/tests/partial_application/variation_variadics_001.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Partial application variation variadics user
+--FILE--
+<?php
+function foo($a, ...$b) {
+    var_dump($a, ...$b);
+}
+
+$foo = foo(10, 100, ...);
+
+echo (string) new ReflectionFunction($foo);
+
+$foo(1000, 10000);
+?>
+--EXPECTF--
+Function [ <user> partial function foo ] {
+  @@ %s 2 - 4
+
+  - Parameters [1] {
+    Parameter #0 [ <optional> ...$b ]
+  }
+}
+int(10)
+int(100)
+int(1000)
+int(10000)

Zend/tests/partial_application/variation_variadics_002.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Partial application variation variadics internal
+--FILE--
+<?php
+$sprintf = sprintf("%d %d %d", 100, ...);
+
+echo (string) new ReflectionFunction($sprintf);
+
+echo $sprintf(1000, 10000);
+?>
+--EXPECTF--
+Function [ <internal:standard> partial function sprintf ] {
+
+  - Parameters [1] {
+    Parameter #0 [ <optional> mixed ...$values ]
+  }
+  - Return [ string ]
+}
+100 1000 10000

Zend/zend_partial.c

@@ -138,9 +138,17 @@ static zend_always_inline void zend_partial_prototype_u(zend_partial *partial, z
 
 	partial->prototype.common.fn_flags |= ZEND_ACC_PARTIAL;
 
-	if (partial->prototype.common.fn_flags & ZEND_ACC_VARIADIC &&
-		partial->prototype.common.num_args > 0) {
-		partial->prototype.common.num_args--;
+	if (partial->prototype.common.fn_flags & ZEND_ACC_VARIADIC) {
+		if (partial->prototype.common.num_args > 0) {
+			partial->prototype.common.num_args--;
+		} else {
+			memcpy(
+				partial->prototype.op_array.arg_info + 
+					partial->prototype.op_array.num_args,
+				partial->func.op_array.arg_info + 
+					partial->func.op_array.num_args, 
+				sizeof(zend_arg_info));
+		}
 	}
 }
 
@@ -204,9 +212,17 @@ static zend_always_inline void zend_partial_prototype_i(zend_partial *partial, z
 
 	partial->prototype.common.fn_flags |= ZEND_ACC_PARTIAL;
 
-	if (partial->prototype.common.fn_flags & ZEND_ACC_VARIADIC &&
-		partial->prototype.common.num_args > 0) {
-		partial->prototype.common.num_args--;
+	if (partial->prototype.common.fn_flags & ZEND_ACC_VARIADIC) {
+		if (partial->prototype.common.num_args > 0) {
+			partial->prototype.common.num_args--;
+		} else {
+			memcpy(
+				partial->prototype.internal_function.arg_info +
+					partial->prototype.internal_function.num_args, 
+				partial->func.internal_function.arg_info +
+					partial->func.internal_function.num_args, 
+				sizeof(zend_internal_arg_info));
+		}
 	}
 }
 
@@ -276,27 +292,27 @@ static zend_always_inline void zend_partial_debug_i(zend_partial *partial, HashT
 	}
 
 	if (partial->func.common.fn_flags & ZEND_ACC_VARIADIC) {
-	    zval variadics;
-	    
-	    array_init(&variadics);
+		zval variadics;
+		
+		array_init(&variadics);
 
-	    zend_hash_str_add(ht, info->name, strlen(info->name), &variadics);
+		zend_hash_str_add(ht, info->name, strlen(info->name), &variadics);
 
-	    while (arg < aend) {
-	        if (ZEND_PARTIAL_IS_NOT_PLACEHOLDER(arg)) {
-	            zend_hash_next_index_insert(Z_ARRVAL(variadics), arg);
-	        
-	            if (Z_OPT_REFCOUNTED_P(arg)) {
-	                Z_ADDREF_P(arg);
-	            }
-	        }
+		while (arg < aend) {
+			if (ZEND_PARTIAL_IS_NOT_PLACEHOLDER(arg)) {
+				zend_hash_next_index_insert(Z_ARRVAL(variadics), arg);
+			
+				if (Z_OPT_REFCOUNTED_P(arg)) {
+					Z_ADDREF_P(arg);
+				}
+			}
 
-	        arg++;
-	    }
+			arg++;
+		}
 
-	    if (partial->named) {
-	        zend_hash_merge(Z_ARRVAL(variadics), partial->named, zval_copy_ctor, true);
-	    }
+		if (partial->named) {
+			zend_hash_merge(Z_ARRVAL(variadics), partial->named, zval_copy_ctor, true);
+		}
 	}
 }
 
@@ -328,27 +344,27 @@ static zend_always_inline void zend_partial_debug_u(zend_partial *partial, HashT
 	}
 
 	if (partial->func.common.fn_flags & ZEND_ACC_VARIADIC) {
-	    zval variadics;
-	    
-	    array_init(&variadics);
-
-	    zend_hash_add(ht, info->name, &variadics);
-	    
-	    while (arg < aend) {
-	        if (ZEND_PARTIAL_IS_NOT_PLACEHOLDER(arg)) {
-	            zend_hash_next_index_insert(Z_ARRVAL(variadics), arg);
-
-	            if (Z_OPT_REFCOUNTED_P(arg)) {
-	                Z_ADDREF_P(arg);
-	            }
-	        }
-
-	        arg++;
-	    }
-	    
-	    if (partial->named) {
-	        zend_hash_merge(Z_ARRVAL(variadics), partial->named, zval_copy_ctor, true);
-	    }
+		zval variadics;
+		
+		array_init(&variadics);
+
+		zend_hash_add(ht, info->name, &variadics);
+		
+		while (arg < aend) {
+			if (ZEND_PARTIAL_IS_NOT_PLACEHOLDER(arg)) {
+				zend_hash_next_index_insert(Z_ARRVAL(variadics), arg);
+
+				if (Z_OPT_REFCOUNTED_P(arg)) {
+					Z_ADDREF_P(arg);
+				}
+			}
+
+			arg++;
+		}
+		
+		if (partial->named) {
+			zend_hash_merge(Z_ARRVAL(variadics), partial->named, zval_copy_ctor, true);
+		}
 	}
 }