From 714d9fc358640069bda5540c2b1136a6241c4c94 Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Wed, 8 May 2019 16:42:02 -0300
Subject: [PATCH] Make chr ZPP failure message consistent with ext/standard

---
 ext/standard/string.c                         |   6 +---
 .../tests/array/array_filter_variation9.phpt  |   2 ++
 ext/standard/tests/strings/chr_error.phpt     | Bin 783 -> 823 bytes
 ext/standard/tests/strings/chr_ord.phpt       | Bin 3171 -> 0 bytes
 .../tests/strings/chr_variation1.phpt         |  29 +++---------------
 5 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 ext/standard/tests/strings/chr_ord.phpt

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 446de009086..e0141ffaea2 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2792,11 +2792,7 @@ PHP_FUNCTION(chr)
 {
 	zend_long c;
 
-	if (ZEND_NUM_ARGS() != 1) {
-		WRONG_PARAM_COUNT;
-	}
-
-	ZEND_PARSE_PARAMETERS_START_EX(ZEND_PARSE_PARAMS_QUIET, 1, 1)
+	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(c)
 	ZEND_PARSE_PARAMETERS_END_EX(c = 0);
 
diff --git a/ext/standard/tests/array/array_filter_variation9.phpt b/ext/standard/tests/array/array_filter_variation9.phpt
index ed89d13d35b..a6f5789eaef 100644
--- a/ext/standard/tests/array/array_filter_variation9.phpt
+++ b/ext/standard/tests/array/array_filter_variation9.phpt
@@ -45,6 +45,8 @@ array(6) {
   [5]=>
   int(1000)
 }
+
+Warning: chr() expects parameter 1 to be int, string given in %s on line %d
 array(8) {
   [0]=>
   int(0)
diff --git a/ext/standard/tests/strings/chr_error.phpt b/ext/standard/tests/strings/chr_error.phpt
index d5fb97455921bb7a2e5cf793fae0c0517fc8ebb5..4d595543bb2c3d1cf4968c310d22dd1e26b0702e 100644
GIT binary patch
delta 171
zcmeBY+s?MZoyjvfqew$jA+@3)HMyi1NGB$j<WwpcDikCZCFZ7<q!#HY7$~G?mZjz?
zWacTT7AxfEDdc44r7EbVa21ynW#*-87-}jgF(^&0VG0T*!ZahIOyjb(wRQ3La|Kdd
E0MrsSl>h($

delta 131
zcmdna*3Y)Voyj!3C_gV<p&+p+F*mg&wMZd3zcjBzAuS)s$|%y%RLIOzP%T!-&r`_B
h%u7{JP2utj_3@cJfhow5ES+4owze+*ey%`@3jlE6Dm?%I

diff --git a/ext/standard/tests/strings/chr_ord.phpt b/ext/standard/tests/strings/chr_ord.phpt
deleted file mode 100644
index be0b1a32da5430929583f56daae4590c601ca309..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3171
zcmcIm;cnYD5Z?Y0dx)Fiu9h9eq7$ceT(2lv7YGmx#hRf5nxbH2+U8)B0wopAhP~h3
zWe>64k&0r`vE6N$eu$F3yW{EO$K%EE)%5LE9J4E#7mzM(Cjy~oVC)Q^=A}*xWpvKs
z`1Qr*6z!fp&z2eMcj1jSg(+?`c@BADm0plHbU^6>+9FStf@sVD;FZi%t1^mn4nNAG
zv^oa?M$0%|3M<k=+B$^Mg;1KJ6-$W`Ydn*wnkzYjn_F<vj~NBu$bu%uv@wM$pLR9w
zNrNVN@%H7#1$+{#Qi7SgdFRSHHtuG}&psCG_L)qV23p;27l<=T)syvIMc<9cRSG7P
zRygheO|Nxp%;v^++G>)Fp{<?`hG#VPdJ(vQ-%=3bzpbJOCKJTQjCfwFJe8}JG-Zz5
zW@Q0&4%d1!3%__}E*291#;RcUwy^eNL909gd=$4G<gZoOQnrrhX)ac|f242p$$fE{
zw*Wr~Hw;E2f=&jUh97>qyrl8*b@JGGB+e*4;RAZ*gX596kNI&jOcLkId6FdD`L{%P
z-Ta#?-FwZx_^N*NCY@btLHEMl6L+_Cryr(K&KJuK>(7a|2}ZI~zn~pTv7MSyqvR*t
zDME^L*|}dEkwY67FZvBx^FoVbxIlBansDa~aqJ`ow9+4E<vQy)^*LX^@9s={y)pZp
zRjO?&#_M*sV*am8Y2MwLqUNX88Vjk>GgWP&yKUF}0WW#EWnFE!e*af#4XS-nuB9$=
z)+8$;qWXPU8!K_!3k~u!mYD*Jj5fzq3(zxks+a10^5F;zUA3v+^A9fEKBD*J2|E+@
zYxEBjbp+R`J)Edl*DEZ;PD#(d#~MHV`OWm@)oU#Cn}x-vu&=zahW+kBgi~yYnWKuC
zud5v%LF=nl6CWJFPXhew!2dMB!}!Ak_}Kyc$pQRnfcJv@MgjgJz<ClFgg?L!F~|>5
z$U_eQ2y+NY{3bLAS^O(B2x<H?G&sZ~4~g93A!HH_8jAD^eyGqj73cWGKBB|<S=59a
zlMYG-0pvI&=yVhyjyyt=0C1!|1URw?I0<KQED<t#5(IPf5Hbv>alAN$2R>d~1cg3c
zRBoa$1urLpPM?PH?nxMiP|d;?KfLDQbjzz|V%uvs6<#VX`H&@ElR*SF<gxo0VeFl-
z)Q+CRJ8Q7j%djO}OX^tN;Rx8%Rc)Wr@F>Tw7FJ42cr;_wBK&v%?Lz#}F|sj_*SbH+
jay-$nzh2z}zt8*#5?H8DQe!*0Kjkk7HP{=9P8aq!s+O|t

diff --git a/ext/standard/tests/strings/chr_variation1.phpt b/ext/standard/tests/strings/chr_variation1.phpt
index 85a2219ecb5..c962aa0e78b 100644
--- a/ext/standard/tests/strings/chr_variation1.phpt
+++ b/ext/standard/tests/strings/chr_variation1.phpt
@@ -38,11 +38,6 @@ $inputs =  array (
 		  -20.5,
 		  1.1234e6,
 
-		  // array values
-/*8*/	  array(),
-		  array(0),
-		  array(1, 2),
-
 		  // boolean values
 /*11*/	  true,
 		  false,
@@ -53,12 +48,6 @@ $inputs =  array (
 /*15*/	  NULL,
 		  null,
 
-		  // objects
-/*17*/	  new sample(),
-
-		  // resource
-/*18*/	  $file_handle,
-
 		  // undefined variable
 /*19*/	  @$undefined_var,
 
@@ -95,29 +84,19 @@ string(2) "ec"
 -- Iteration 7 --
 string(2) "48"
 -- Iteration 8 --
-string(2) "00"
+string(2) "01"
 -- Iteration 9 --
 string(2) "00"
 -- Iteration 10 --
-string(2) "00"
--- Iteration 11 --
 string(2) "01"
+-- Iteration 11 --
+string(2) "00"
 -- Iteration 12 --
 string(2) "00"
 -- Iteration 13 --
-string(2) "01"
+string(2) "00"
 -- Iteration 14 --
 string(2) "00"
 -- Iteration 15 --
 string(2) "00"
--- Iteration 16 --
-string(2) "00"
--- Iteration 17 --
-string(2) "00"
--- Iteration 18 --
-string(2) "00"
--- Iteration 19 --
-string(2) "00"
--- Iteration 20 --
-string(2) "00"
 ===DONE===