From e1ff6fe881131ea86d140ade76d30594c190f0de Mon Sep 17 00:00:00 2001
From: Antony Dovgal <tony2001@php.net>
Date: Tue, 19 Sep 2006 09:35:27 +0000
Subject: [PATCH] support objects in array_walk*()

---
 ext/standard/array.c                             |   4 ++--
 ext/standard/tests/array/array_walk.phpt         |   4 ++--
 ext/standard/tests/array/array_walk_objects.phpt | Bin 0 -> 1100 bytes
 .../tests/array/array_walk_rec_objects.phpt      | Bin 0 -> 1170 bytes
 .../tests/array/array_walk_recursive1.phpt       |   4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 ext/standard/tests/array/array_walk_objects.phpt
 create mode 100644 ext/standard/tests/array/array_walk_rec_objects.phpt

diff --git a/ext/standard/array.c b/ext/standard/array.c
index b7bf6b4549..9d986137d1 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -1138,7 +1138,7 @@ PHP_FUNCTION(array_walk)
 	HashTable *target_hash;
 
 	old_walk_func_name = BG(array_walk_func_name);
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "az|z", &array, &tmp, &userdata) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz|z", &array, &tmp, &userdata) == FAILURE) {
 		return;
 	}
 	target_hash = HASH_OF(array);
@@ -1169,7 +1169,7 @@ PHP_FUNCTION(array_walk_recursive)
 	HashTable *target_hash;
 
 	old_walk_func_name = BG(array_walk_func_name);
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "az|z", &array, &tmp, &userdata) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz|z", &array, &tmp, &userdata) == FAILURE) {
 		return;
 	}
 	target_hash = HASH_OF(array);
diff --git a/ext/standard/tests/array/array_walk.phpt b/ext/standard/tests/array/array_walk.phpt
index 7c0969eb96..a0e2098311 100644
--- a/ext/standard/tests/array/array_walk.phpt
+++ b/ext/standard/tests/array/array_walk.phpt
@@ -34,8 +34,8 @@ echo "Done\n";
 Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
-Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d
-NULL
+Warning: array_walk(): The argument should be an array in %s on line %d
+bool(false)
 bool(true)
 int(1)
 int(0)
diff --git a/ext/standard/tests/array/array_walk_objects.phpt b/ext/standard/tests/array/array_walk_objects.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..40d50b19cc3cd81abc463c6c491266198a29f249
GIT binary patch
literal 1100
zcmcJNPfNo<5XF1#eu^PfXrv291);U|pe+a<1S5J7$|hNDG~F%9Zc8bCcW093Un#wL
zN_O6F=4IZ7bAS5cbIwGXitT(OlApc{LPem1ZyB15aXx!|nj&#~w_2<i`?M-Fu~v|?
zy&t(9KyNJ)D_z(D>#jvQkL+^QFN!E4;*Nm*G8QHx%fQIYz>alSX}lIjQg=GX1B}5T
zjowLcM#N}?pCO}?(hX`a<(v(YINU=vsG+=$1iJS!6BS=D1|>I89!IspC!acZzy~%}
z9efgql!oF1>y5A~WB?8&;<zJpGRTqzt<%O$i^I*4%*XYyu{jr|21*%`|ABcMVlrH4
za2~Xh9}3C43EtlH{ds!t&p7Y0%%rjU>R-9w(0-@Rv}aRqo;@1Sq18I*Pq$T}-X%({
zJ1mEI7u0mV@2Jha>$;=7&$8zRrQE>=wS!mj#nm$QCQ^la4T~K2|L_p}g~ZC2T}ovj
zTWFg^5MW6a9K;IFGQb}>iIs%2h*54B*lU#-vnmdCB<sXZ7V?amM5}NtwGuuOTO}Rl
SRtd*~E5%lFWzqZR=>7l?FI@rv

literal 0
HcmV?d00001

diff --git a/ext/standard/tests/array/array_walk_rec_objects.phpt b/ext/standard/tests/array/array_walk_rec_objects.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..380d83ee03d12f54bb9b2e22d6c7bb6cb594e614
GIT binary patch
literal 1170
zcmcgqO>5gg5Y5&5D+b|!RJ>3%fk0f_ht`2Y4~4iihk#j0Yg@IlYxct-g#P!;NY+=P
z<k*w6^WK{``(`;`EpJzxGhvK)T0e?nzcw=U#^y&EMj%uMI{7P8XBp==KYlKe`*m^H
z9T?kqmAYIjAXPZt%clv9kD~B0f@ff(qcH2tKODlUh#*p;DX@QxrG>B-oU{&}+2~;M
zqi~YcW{n4!K|mP&6A(;^qaBVRvznzltP@o7d{X4;iR6=(RMwG!?qln+YJwRk`3UuK
z+9G_u(WL`^P}C^+JQ0SP;s@)4u{Gog1e8q>P0`b#ip=O@?+IN`foY(ov<R`quosd#
zB1({^dv~-xoyl~kA^5J9yjQ4M%yG-hyI;$1s~gTo%sP{+ZFmtuKskJLraZcM_Z(A$
zGrIU0`qNe$YWxME-mdE=@n;f!Iw@N7__9^hd#^QD2$c>#X&vH*Up)cF{s^P+Ue{H&
zZ(jX1tacKyt$&cpf!%3eWRPG<RSL)zoLj)BU*t-{dB!L~jP7@n9rG$rbtc>FJ}i`J
fbs4?FP<}OeAixHConQkDMOcHq4C`Y2-$Hx=!f$$m

literal 0
HcmV?d00001

diff --git a/ext/standard/tests/array/array_walk_recursive1.phpt b/ext/standard/tests/array/array_walk_recursive1.phpt
index c3326581ce..8505b70e98 100644
--- a/ext/standard/tests/array/array_walk_recursive1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive1.phpt
@@ -34,8 +34,8 @@ echo "Done\n";
 Warning: array_walk_recursive() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
-Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d
-NULL
+Warning: array_walk_recursive(): The argument should be an array in %s on line %d
+bool(false)
 bool(true)
 int(1)
 int(0)
-- 
2.50.1