more variadics

Author: krakjoe

Zend/tests/partial_function/variadics-named-nested-overwrite.phpt

@@ -0,0 +1,28 @@
+--TEST--
+Named variadics nested overwrite param.
+--FILE--
+<?php
+function variadic($one, ...$two) {
+    return [
+        func_num_args(), 
+        func_get_args(), 
+        [$one, $two]];
+}
+
+$variadic = variadic(?, three: 3);
+
+$variadic = 
+    $variadic(?, four: 4);
+
+$partial = $variadic(one: 1, two: [2], four: 5);
+
+if ($partial[2][1]["four"] == 5) {
+    echo "OK\n";
+} else {
+    echo "FAIL\n";
+    
+    var_dump($partial);
+}
+?>
+--EXPECT--
+OK

Zend/tests/partial_function/variadics-named-nested.phpt

@@ -17,7 +17,7 @@ $variadic = $variadic(?, four: 4);
 
 $partial = $variadic(one: 1, two: [2]);
 
-if ($partial !== $zend) {
+if ($partial != $zend) {
     echo "FAIL\n";
     var_dump($partial, $zend);
 } else {

Zend/zend_partial.c

@@ -491,11 +491,14 @@ ZEND_METHOD(Partial, __invoke)
                 partial->frame.named;
             GC_ADDREF(named_args);
         } else {
-            named_args = 
-                zend_array_dup(named_args);
+            HashTable *nested = 
+                zend_array_dup(partial->frame.named);
+            
             zend_hash_merge(
-                named_args,
-                partial->frame.named, NULL, true);
+                nested,
+                named_args, zval_copy_ctor, true);
+            
+            named_args = nested;
         }
         fci.named_params = named_args;
     } else {
@@ -578,7 +581,7 @@ void zend_partial_apply(zval *res, zend_execute_data *call) {
 
                 zend_hash_merge(
                     partial->frame.named,
-                    call->extra_named_params, NULL, 1);
+                    call->extra_named_params, zval_copy_ctor, true);
             } else {
                 partial->frame.named =  
                     call->extra_named_params;

Zend/zend_vm_def.h

@@ -8805,8 +8805,8 @@ ZEND_VM_HANDLER(203, ZEND_PARTIAL_APPLY, ANY, ANY)
     }
 
     zend_partial_apply(result, call);
-    
-    if ((ZEND_CALL_INFO(call) & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS)) {
+
+    if (ZEND_CALL_INFO(call) & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS) {
         zend_array_release(call->extra_named_params);
     }
 

Zend/zend_vm_execute.h

@@ -3514,7 +3514,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_PARTIAL_APPLY_SPEC_HANDLER(ZEN
 
     zend_partial_apply(result, call);
 
-    if ((ZEND_CALL_INFO(call) & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS)) {
+    if (ZEND_CALL_INFO(call) & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS) {
         zend_array_release(call->extra_named_params);
     }