From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 8 Dec 2013 19:52:14 +0000 (-0200)
Subject: - Fix argname printing order
X-Git-Tag: php-5.6.0alpha1~110^2~24^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b655a0bc7ef93b1bfc178033b334d1d3c23b6379;p=php

- Fix argname printing order
---

diff --git a/phpdbg_frame.c b/phpdbg_frame.c
index 1bc1f9ccea..88e2824ea9 100644
--- a/phpdbg_frame.c
+++ b/phpdbg_frame.c
@@ -139,13 +139,14 @@ static void phpdbg_dump_prototype(zval **tmp TSRMLS_DC) /* {{{ */
 		while (zend_hash_get_current_data_ex(Z_ARRVAL_PP(args),
 			(void **) &argstmp, &iterator) == SUCCESS) {
 
+			if (j) {
+				phpdbg_write(", ");
+			}
 			if (m && j < m) {
 				phpdbg_write("%s=", arginfo[j].name);
 			}
+			++j;
 
-			if (j++) {
-				phpdbg_write(", ");
-			}
 			zend_print_flat_zval_r(*argstmp TSRMLS_CC);
 			zend_hash_move_forward_ex(Z_ARRVAL_PP(args), &iterator);
 		}
diff --git a/test.php b/test.php
index 8ced95e7a3..744ed79865 100644
--- a/test.php
+++ b/test.php
@@ -13,7 +13,7 @@ class phpdbg {
     }
 }
 
-function test($x) {
+function test($x, $y = 0) {
 	$var = $x + 1;
 	$var += 2;
 	$var <<= 3;
@@ -32,7 +32,7 @@ $dbg = new phpdbg();
 var_dump(
     $dbg->isGreat("PHP Rocks !!"));
 
-foreach (test(1) as $gen)
+foreach (test(1,2) as $gen)
 	continue;
 
 echo "it works!\n";