fix tests

diff --git a/ext/ereg/tests/split_error_001.phpt b/ext/ereg/tests/split_error_001.phpt
index ff8e6cbdd1993b465af1d6640560647e073d4879..cd395f4c2086b2860e22f7d401f71173385f4e16 100644 (file)
--- a/ext/ereg/tests/split_error_001.phpt
+++ b/ext/ereg/tests/split_error_001.phpt
@@ -31,11 +31,11 @@ echo "Done";
 
 -- Testing split() function with more than expected no. of arguments --
 
-Warning: Wrong parameter count for split() in %s on line 17
+Warning: split() expects at most 3 parameters, 4 given in %s on line %d
 NULL
 
 -- Testing split() function with less than expected no. of arguments --
 
-Warning: Wrong parameter count for split() in %s on line 22
+Warning: split() expects at least 2 parameters, 1 given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/split_error_002.phpt b/ext/ereg/tests/split_error_002.phpt
index fed988cc3cd3d00a88d01fe9a54228f2ba124e4a..94df15d9dcbe202edc9bdf4fdccbc456576b9b19 100644 (file)
--- a/ext/ereg/tests/split_error_002.phpt
+++ b/ext/ereg/tests/split_error_002.phpt
@@ -40,49 +40,49 @@ echo "Done";
 --EXPECTF--
 *** Testing split() : error conditions ***
 
-Warning: split(): REG_EMPTY in %s on line 16
+Warning: split(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: split(): REG_EPAREN in %s on line 17
+Warning: split(): REG_EPAREN in %s on line %d
 bool(false)
 
-Warning: split(): REG_EBRACK in %s on line 18
+Warning: split(): REG_EBRACK in %s on line %d
 bool(false)
 
-Warning: split(): REG_EPAREN in %s on line 19
+Warning: split(): REG_EPAREN in %s on line %d
 bool(false)
 
-Warning: split(): REG_BADRPT in %s on line 20
+Warning: split(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: split(): REG_BADRPT in %s on line 21
+Warning: split(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: split(): REG_BADRPT in %s on line 22
+Warning: split(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: split(): REG_BADRPT in %s on line 23
-bool(false)
+Warning: split() expects parameter 3 to be long, binary string given in %s on line %d
+NULL
 
-Warning: split(): REG_BADBR in %s on line 24
+Warning: split(): REG_BADBR in %s on line %d
 bool(false)
 
-Warning: split(): REG_EMPTY in %s on line 25
+Warning: split(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: split(): REG_EMPTY in %s on line 26
+Warning: split(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: split(): REG_BADBR in %s on line 27
+Warning: split(): REG_BADBR in %s on line %d
 bool(false)
 
-Warning: split(): REG_ERANGE in %s on line 28
+Warning: split(): REG_ERANGE in %s on line %d
 bool(false)
 
-Warning: split(): REG_EESCAPE in %s on line 29
+Warning: split(): REG_EESCAPE in %s on line %d
 bool(false)
 
-Warning: split(): REG_ERANGE in %s on line 30
-bool(false)
+Warning: split() expects parameter 3 to be long, binary string given in %s on line %d
+NULL
 string(8) "original"
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/split_variation_001.phpt b/ext/ereg/tests/split_variation_001.phpt
index 397da8724ce0341e0d23750a801c3af678080998..8203d6c842137c0af0c511c14a6c84f29075bc4a 100644 (file)
--- a/ext/ereg/tests/split_variation_001.phpt
+++ b/ext/ereg/tests/split_variation_001.phpt
@@ -81,8 +81,8 @@ echo "Done";
 ?>
 --EXPECTF--
 *** Testing split() : usage variations ***
-Error: 8 - Undefined variable: undefined_var, %s(64)
-Error: 8 - Undefined variable: unset_var, %s(67)
+Error: 8 - Undefined variable: undefined_var, %s(%d)
+Error: 8 - Undefined variable: unset_var, %s(%d)
 
 Arg value 0 
 array(1) {
@@ -143,63 +143,38 @@ array(1) {
   [0]=>
   string(16) "1 a 1 Array 1 c "
 }
-Error: 8 - Array to string conversion, %s(73)
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(2) {
-  [0]=>
-  string(6) "1 a 1 "
-  [1]=>
-  string(5) " 1 c "
-}
-Error: 8 - Array to string conversion, %s(73)
+Error: 2 - split() expects parameter 1 to be binary string, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(2) {
-  [0]=>
-  string(6) "1 a 1 "
-  [1]=>
-  string(5) " 1 c "
-}
-Error: 8 - Array to string conversion, %s(73)
+Error: 2 - split() expects parameter 1 to be binary string, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(2) {
-  [0]=>
-  string(6) "1 a 1 "
-  [1]=>
-  string(5) " 1 c "
-}
-Error: 8 - Array to string conversion, %s(73)
+Error: 2 - split() expects parameter 1 to be binary string, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(2) {
-  [0]=>
-  string(6) "1 a 1 "
-  [1]=>
-  string(5) " 1 c "
-}
-Error: 8 - Array to string conversion, %s(73)
+Error: 2 - split() expects parameter 1 to be binary string, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(2) {
-  [0]=>
-  string(6) "1 a 1 "
-  [1]=>
-  string(5) " 1 c "
-}
+Error: 2 - split() expects parameter 1 to be binary string, array given, %s(%d)
+NULL
 
 Arg value  
-Error: 2 - split(): REG_EMPTY, %s(74)
+Error: 2 - split(): REG_EMPTY, %s(%d)
 bool(false)
 
 Arg value  
-Error: 2 - split(): REG_EMPTY, %s(74)
+Error: 2 - split(): REG_EMPTY, %s(%d)
 bool(false)
 
 Arg value 1 
@@ -215,7 +190,7 @@ array(4) {
 }
 
 Arg value  
-Error: 2 - split(): REG_EMPTY, %s(74)
+Error: 2 - split(): REG_EMPTY, %s(%d)
 bool(false)
 
 Arg value 1 
@@ -231,31 +206,27 @@ array(4) {
 }
 
 Arg value  
-Error: 2 - split(): REG_EMPTY, %s(74)
+Error: 2 - split(): REG_EMPTY, %s(%d)
 bool(false)
 
 Arg value  
-Error: 2 - split(): REG_EMPTY, %s(74)
+Error: 2 - split(): REG_EMPTY, %s(%d)
 bool(false)
 
 Arg value  
-Error: 2 - split(): REG_EMPTY, %s(74)
+Error: 2 - split(): REG_EMPTY, %s(%d)
 bool(false)
-Error: 4096 - Object of class stdClass could not be converted to string, %s(73)
+Error: 4096 - Object of class stdClass could not be converted to string, %s(%d)
 
 Arg value  
-Error: 4096 - Object of class stdClass could not be converted to binary string, %s(74)
-Error: 8 - Object of class stdClass to string conversion, %s(74)
-array(1) {
-  [0]=>
-  string(16) "1 a 1 Array 1 c "
-}
+Error: 2 - split() expects parameter 1 to be binary string, object given, %s(%d)
+NULL
 
 Arg value  
-Error: 2 - split(): REG_EMPTY, %s(74)
+Error: 2 - split(): REG_EMPTY, %s(%d)
 bool(false)
 
 Arg value  
-Error: 2 - split(): REG_EMPTY, %s(74)
+Error: 2 - split(): REG_EMPTY, %s(%d)
 bool(false)
 Done

diff --git a/ext/ereg/tests/split_variation_002.phpt b/ext/ereg/tests/split_variation_002.phpt
index b40d58354deaa18cf825767e2ec48afc4be8fc44..e752e775aee2485e9d18e910e854966be213587d 100644 (file)
--- a/ext/ereg/tests/split_variation_002.phpt
+++ b/ext/ereg/tests/split_variation_002.phpt
@@ -81,8 +81,8 @@ echo "Done";
 ?>
 --EXPECTF--
 *** Testing split() : usage variations ***
-Error: 8 - Undefined variable: undefined_var, %s(64)
-Error: 8 - Undefined variable: unset_var, %s(67)
+Error: 8 - Undefined variable: undefined_var, %s(%d)
+Error: 8 - Undefined variable: unset_var, %s(%d)
 
 Arg value 0 
 array(1) {
@@ -139,66 +139,31 @@ array(1) {
   [0]=>
   string(3) "0.5"
 }
-Error: 8 - Array to string conversion, %s(73)
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(3) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(0) ""
-  [2]=>
-  string(2) "ay"
-}
-Error: 8 - Array to string conversion, %s(73)
+Error: 2 - split() expects parameter 2 to be binary string, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(3) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(0) ""
-  [2]=>
-  string(2) "ay"
-}
-Error: 8 - Array to string conversion, %s(73)
+Error: 2 - split() expects parameter 2 to be binary string, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(3) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(0) ""
-  [2]=>
-  string(2) "ay"
-}
-Error: 8 - Array to string conversion, %s(73)
+Error: 2 - split() expects parameter 2 to be binary string, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(3) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(0) ""
-  [2]=>
-  string(2) "ay"
-}
-Error: 8 - Array to string conversion, %s(73)
+Error: 2 - split() expects parameter 2 to be binary string, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(3) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(0) ""
-  [2]=>
-  string(2) "ay"
-}
+Error: 2 - split() expects parameter 2 to be binary string, array given, %s(%d)
+NULL
 
 Arg value  
 array(1) {
@@ -247,17 +212,11 @@ array(1) {
   [0]=>
   string(0) ""
 }
-Error: 4096 - Object of class stdClass could not be converted to string, %s(73)
+Error: 4096 - Object of class stdClass could not be converted to string, %s(%d)
 
 Arg value  
-Error: 4096 - Object of class stdClass could not be converted to binary string, %s(74)
-Error: 8 - Object of class stdClass to string conversion, %s(74)
-array(2) {
-  [0]=>
-  string(2) "Ob"
-  [1]=>
-  string(3) "ect"
-}
+Error: 2 - split() expects parameter 2 to be binary string, object given, %s(%d)
+NULL
 
 Arg value  
 array(1) {

diff --git a/ext/ereg/tests/split_variation_003.phpt b/ext/ereg/tests/split_variation_003.phpt
index aa8f9c7b0f44c5cb76cf4bb1501e26b57fbaf2a3..262c31f7cdae165d471034a8612395b97b873840 100644 (file)
--- a/ext/ereg/tests/split_variation_003.phpt
+++ b/ext/ereg/tests/split_variation_003.phpt
@@ -112,41 +112,31 @@ array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
-Error: 8 - Array to string conversion, %s(72)
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
-Error: 8 - Array to string conversion, %s(72)
+Error: 2 - split() expects parameter 3 to be long, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
-Error: 8 - Array to string conversion, %s(72)
+Error: 2 - split() expects parameter 3 to be long, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
-Error: 8 - Array to string conversion, %s(72)
+Error: 2 - split() expects parameter 3 to be long, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
-Error: 8 - Array to string conversion, %s(72)
+Error: 2 - split() expects parameter 3 to be long, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
+Error: 2 - split() expects parameter 3 to be long, array given, %s(%d)
+NULL
 
 Arg value  
 array(1) {
@@ -185,36 +175,25 @@ array(1) {
 }
 
 Arg value  
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
+Error: 2 - split() expects parameter 3 to be long, Unicode string given, %s(%d)
+NULL
 
 Arg value  
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
+Error: 2 - split() expects parameter 3 to be long, Unicode string given, %s(%d)
+NULL
 
 Arg value string 
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
+Error: 2 - split() expects parameter 3 to be long, Unicode string given, %s(%d)
+NULL
 
 Arg value string 
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
-Error: 4096 - Object of class stdClass could not be converted to string, %s(72)
+Error: 2 - split() expects parameter 3 to be long, Unicode string given, %s(%d)
+NULL
+Error: 4096 - Object of class stdClass could not be converted to string, %s(%d)
 
 Arg value  
-Error: 8 - Object of class stdClass could not be converted to int, %s(73)
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
+Error: 2 - split() expects parameter 3 to be long, object given, %s(%d)
+NULL
 
 Arg value  
 array(1) {
@@ -227,4 +206,4 @@ array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/spliti_error_001.phpt b/ext/ereg/tests/spliti_error_001.phpt
index 44d2be6185c32cf87cd80a2c1f0dce3f348ea863..104364eec5d58d307d57b7edadfdcb1a6255c35c 100644 (file)
--- a/ext/ereg/tests/spliti_error_001.phpt
+++ b/ext/ereg/tests/spliti_error_001.phpt
@@ -31,11 +31,11 @@ echo "Done";
 
 -- Testing spliti() function with more than expected no. of arguments --
 
-Warning: Wrong parameter count for spliti() in %s on line 17
+Warning: spliti() expects at most 3 parameters, 4 given in %s on line %d
 NULL
 
 -- Testing spliti() function with less than expected no. of arguments --
 
-Warning: Wrong parameter count for spliti() in %s on line 22
+Warning: spliti() expects at least 2 parameters, 1 given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/spliti_error_002.phpt b/ext/ereg/tests/spliti_error_002.phpt
index 3dc3b2edcd95fd6fe79005c5c584479f33b38214..65b6f6b0187a3cbf2d1459792d3f93a5d6d66367 100644 (file)
--- a/ext/ereg/tests/spliti_error_002.phpt
+++ b/ext/ereg/tests/spliti_error_002.phpt
@@ -40,49 +40,49 @@ echo "Done";
 --EXPECTF--
 *** Testing spliti() : error conditions ***
 
-Warning: spliti(): REG_EMPTY in %s on line 16
+Warning: spliti(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_EPAREN in %s on line 17
+Warning: spliti(): REG_EPAREN in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_EBRACK in %s on line 18
+Warning: spliti(): REG_EBRACK in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_EPAREN in %s on line 19
+Warning: spliti(): REG_EPAREN in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_BADRPT in %s on line 20
+Warning: spliti(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_BADRPT in %s on line 21
+Warning: spliti(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_BADRPT in %s on line 22
+Warning: spliti(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_BADRPT in %s on line 23
-bool(false)
+Warning: spliti() expects parameter 3 to be long, binary string given in %s on line %d
+NULL
 
-Warning: spliti(): REG_BADBR in %s on line 24
+Warning: spliti(): REG_BADBR in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_EMPTY in %s on line 25
+Warning: spliti(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_EMPTY in %s on line 26
+Warning: spliti(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_BADBR in %s on line 27
+Warning: spliti(): REG_BADBR in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_ERANGE in %s on line 28
+Warning: spliti(): REG_ERANGE in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_EESCAPE in %s on line 29
+Warning: spliti(): REG_EESCAPE in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_ERANGE in %s on line 30
-bool(false)
+Warning: spliti() expects parameter 3 to be long, binary string given in %s on line %d
+NULL
 string(8) "original"
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/spliti_variation_001.phpt b/ext/ereg/tests/spliti_variation_001.phpt
index a2d43f583699c3825e44d536b07f7b6b75bce54f..e8f2b901e144458b62c825dcc11e9c1192bbd642 100644 (file)
--- a/ext/ereg/tests/spliti_variation_001.phpt
+++ b/ext/ereg/tests/spliti_variation_001.phpt
@@ -81,8 +81,8 @@ echo "Done";
 ?>
 --EXPECTF--
 *** Testing spliti() : usage variations ***
-Error: 8 - Undefined variable: undefined_var, %s(64)
-Error: 8 - Undefined variable: unset_var, %s(67)
+Error: 8 - Undefined variable: undefined_var, %s(%d)
+Error: 8 - Undefined variable: unset_var, %s(%d)
 
 Arg value 0 
 array(1) {
@@ -143,63 +143,38 @@ array(1) {
   [0]=>
   string(16) "1 a 1 Array 1 c "
 }
-Error: 8 - Array to string conversion, %s(73)
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(2) {
-  [0]=>
-  string(6) "1 a 1 "
-  [1]=>
-  string(5) " 1 c "
-}
-Error: 8 - Array to string conversion, %s(73)
+Error: 2 - spliti() expects parameter 1 to be binary string, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(2) {
-  [0]=>
-  string(6) "1 a 1 "
-  [1]=>
-  string(5) " 1 c "
-}
-Error: 8 - Array to string conversion, %s(73)
+Error: 2 - spliti() expects parameter 1 to be binary string, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(2) {
-  [0]=>
-  string(6) "1 a 1 "
-  [1]=>
-  string(5) " 1 c "
-}
-Error: 8 - Array to string conversion, %s(73)
+Error: 2 - spliti() expects parameter 1 to be binary string, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(2) {
-  [0]=>
-  string(6) "1 a 1 "
-  [1]=>
-  string(5) " 1 c "
-}
-Error: 8 - Array to string conversion, %s(73)
+Error: 2 - spliti() expects parameter 1 to be binary string, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(2) {
-  [0]=>
-  string(6) "1 a 1 "
-  [1]=>
-  string(5) " 1 c "
-}
+Error: 2 - spliti() expects parameter 1 to be binary string, array given, %s(%d)
+NULL
 
 Arg value  
-Error: 2 - spliti(): REG_EMPTY, %s(74)
+Error: 2 - spliti(): REG_EMPTY, %s(%d)
 bool(false)
 
 Arg value  
-Error: 2 - spliti(): REG_EMPTY, %s(74)
+Error: 2 - spliti(): REG_EMPTY, %s(%d)
 bool(false)
 
 Arg value 1 
@@ -215,7 +190,7 @@ array(4) {
 }
 
 Arg value  
-Error: 2 - spliti(): REG_EMPTY, %s(74)
+Error: 2 - spliti(): REG_EMPTY, %s(%d)
 bool(false)
 
 Arg value 1 
@@ -231,31 +206,27 @@ array(4) {
 }
 
 Arg value  
-Error: 2 - spliti(): REG_EMPTY, %s(74)
+Error: 2 - spliti(): REG_EMPTY, %s(%d)
 bool(false)
 
 Arg value  
-Error: 2 - spliti(): REG_EMPTY, %s(74)
+Error: 2 - spliti(): REG_EMPTY, %s(%d)
 bool(false)
 
 Arg value  
-Error: 2 - spliti(): REG_EMPTY, %s(74)
+Error: 2 - spliti(): REG_EMPTY, %s(%d)
 bool(false)
-Error: 4096 - Object of class stdClass could not be converted to string, %s(73)
+Error: 4096 - Object of class stdClass could not be converted to string, %s(%d)
 
 Arg value  
-Error: 4096 - Object of class stdClass could not be converted to binary string, %s(74)
-Error: 8 - Object of class stdClass to string conversion, %s(74)
-array(1) {
-  [0]=>
-  string(16) "1 a 1 Array 1 c "
-}
+Error: 2 - spliti() expects parameter 1 to be binary string, object given, %s(%d)
+NULL
 
 Arg value  
-Error: 2 - spliti(): REG_EMPTY, %s(74)
+Error: 2 - spliti(): REG_EMPTY, %s(%d)
 bool(false)
 
 Arg value  
-Error: 2 - spliti(): REG_EMPTY, %s(74)
+Error: 2 - spliti(): REG_EMPTY, %s(%d)
 bool(false)
 Done

diff --git a/ext/ereg/tests/spliti_variation_002.phpt b/ext/ereg/tests/spliti_variation_002.phpt
index 82316164d95b2363675b7dbf1fc30f68649a4889..8b6b2f92cc2dcac7edeb5a6b3d04d53e2860b6df 100644 (file)
--- a/ext/ereg/tests/spliti_variation_002.phpt
+++ b/ext/ereg/tests/spliti_variation_002.phpt
@@ -81,8 +81,8 @@ echo "Done";
 ?>
 --EXPECTF--
 *** Testing spliti() : usage variations ***
-Error: 8 - Undefined variable: undefined_var, %s(64)
-Error: 8 - Undefined variable: unset_var, %s(67)
+Error: 8 - Undefined variable: undefined_var, %s(%d)
+Error: 8 - Undefined variable: unset_var, %s(%d)
 
 Arg value 0 
 array(1) {
@@ -139,66 +139,31 @@ array(1) {
   [0]=>
   string(3) "0.5"
 }
-Error: 8 - Array to string conversion, %s(73)
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(3) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(0) ""
-  [2]=>
-  string(2) "ay"
-}
-Error: 8 - Array to string conversion, %s(73)
+Error: 2 - spliti() expects parameter 2 to be binary string, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(3) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(0) ""
-  [2]=>
-  string(2) "ay"
-}
-Error: 8 - Array to string conversion, %s(73)
+Error: 2 - spliti() expects parameter 2 to be binary string, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(3) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(0) ""
-  [2]=>
-  string(2) "ay"
-}
-Error: 8 - Array to string conversion, %s(73)
+Error: 2 - spliti() expects parameter 2 to be binary string, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(3) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(0) ""
-  [2]=>
-  string(2) "ay"
-}
-Error: 8 - Array to string conversion, %s(73)
+Error: 2 - spliti() expects parameter 2 to be binary string, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-Error: 8 - Array to string conversion, %s(74)
-array(3) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(0) ""
-  [2]=>
-  string(2) "ay"
-}
+Error: 2 - spliti() expects parameter 2 to be binary string, array given, %s(%d)
+NULL
 
 Arg value  
 array(1) {
@@ -247,19 +212,11 @@ array(1) {
   [0]=>
   string(0) ""
 }
-Error: 4096 - Object of class stdClass could not be converted to string, %s(73)
+Error: 4096 - Object of class stdClass could not be converted to string, %s(%d)
 
 Arg value  
-Error: 4096 - Object of class stdClass could not be converted to binary string, %s(74)
-Error: 8 - Object of class stdClass to string conversion, %s(74)
-array(3) {
-  [0]=>
-  string(2) "Ob"
-  [1]=>
-  string(0) ""
-  [2]=>
-  string(2) "ct"
-}
+Error: 2 - spliti() expects parameter 2 to be binary string, object given, %s(%d)
+NULL
 
 Arg value  
 array(1) {

diff --git a/ext/ereg/tests/spliti_variation_003.phpt b/ext/ereg/tests/spliti_variation_003.phpt
index e8160cf0861488bb3ca5bdfa558b5ff76e688a2f..03abfeaa68f1f1829a6b3103a90d28cdb05f223b 100644 (file)
--- a/ext/ereg/tests/spliti_variation_003.phpt
+++ b/ext/ereg/tests/spliti_variation_003.phpt
@@ -112,41 +112,31 @@ array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
-Error: 8 - Array to string conversion, %s(72)
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
-Error: 8 - Array to string conversion, %s(72)
+Error: 2 - spliti() expects parameter 3 to be long, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
-Error: 8 - Array to string conversion, %s(72)
+Error: 2 - spliti() expects parameter 3 to be long, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
-Error: 8 - Array to string conversion, %s(72)
+Error: 2 - spliti() expects parameter 3 to be long, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
-Error: 8 - Array to string conversion, %s(72)
+Error: 2 - spliti() expects parameter 3 to be long, array given, %s(%d)
+NULL
+Error: 8 - Array to string conversion, %s(%d)
 
 Arg value Array 
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
+Error: 2 - spliti() expects parameter 3 to be long, array given, %s(%d)
+NULL
 
 Arg value  
 array(1) {
@@ -185,36 +175,25 @@ array(1) {
 }
 
 Arg value  
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
+Error: 2 - spliti() expects parameter 3 to be long, Unicode string given, %s(%d)
+NULL
 
 Arg value  
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
+Error: 2 - spliti() expects parameter 3 to be long, Unicode string given, %s(%d)
+NULL
 
 Arg value string 
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
+Error: 2 - spliti() expects parameter 3 to be long, Unicode string given, %s(%d)
+NULL
 
 Arg value string 
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
-Error: 4096 - Object of class stdClass could not be converted to string, %s(72)
+Error: 2 - spliti() expects parameter 3 to be long, Unicode string given, %s(%d)
+NULL
+Error: 4096 - Object of class stdClass could not be converted to string, %s(%d)
 
 Arg value  
-Error: 8 - Object of class stdClass could not be converted to int, %s(73)
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
+Error: 2 - spliti() expects parameter 3 to be long, object given, %s(%d)
+NULL
 
 Arg value  
 array(1) {
@@ -227,4 +206,4 @@ array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
-Done
\ No newline at end of file
+Done