Make chr ZPP failure message consistent with ext/standard

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 446de009086d44d00ee00b8ca1f460e2a66c8f0e..e0141ffaea2fd4b0affd81e997fb700dcf8023fa 100644 (file)
--- 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 ed89d13d35b24f966029a23002f19c3e6f7b376a..a6f5789eaef9a4ce2a321d2897bfbf4547a494fa 100644 (file)
--- 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 (file)
Binary files a/ext/standard/tests/strings/chr_error.phpt and b/ext/standard/tests/strings/chr_error.phpt differ

diff --git a/ext/standard/tests/strings/chr_ord.phpt b/ext/standard/tests/strings/chr_ord.phpt
deleted file mode 100644 (file)
index be0b1a3..0000000
Binary files a/ext/standard/tests/strings/chr_ord.phpt and /dev/null differ

diff --git a/ext/standard/tests/strings/chr_variation1.phpt b/ext/standard/tests/strings/chr_variation1.phpt
index 85a2219ecb59b210357274a3421b1841ef4052e4..c962aa0e78b42fb61970ac6713eeb75c952cc0e2 100644 (file)
--- 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===