Merge branch 'PHP-5.5'

laruence · laruence · commit 0cdd4e83bdaf · 2013-03-03T11:00:36.000+08:00
diff --git a/ext/ereg/tests/split_variation_004.phpt b/ext/ereg/tests/split_variation_004.phpt
@@ -18,7 +18,6 @@ $pattern = '[[:space:]]';
 $string = '1 2 3 4 5';
 var_dump(split($pattern, $string, 0));
 var_dump(split($pattern, $string, -10));
-var_dump(split($pattern, $string, 10E20));
 
 
 echo "Done";
@@ -35,9 +34,4 @@ array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
-Error: 8192 - Function split() is deprecated, %s(18)
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
 Done
diff --git a/ext/ereg/tests/spliti_variation_004.phpt b/ext/ereg/tests/spliti_variation_004.phpt
@@ -18,7 +18,6 @@ $pattern = '[[:space:]]';
 $string = '1 2 3 4 5';
 var_dump(spliti($pattern, $string, 0));
 var_dump(spliti($pattern, $string, -10));
-var_dump(spliti($pattern, $string, 10E20));
 
 
 echo "Done";
@@ -35,9 +34,4 @@ array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
-Error: 8192 - Function spliti() is deprecated, %s(18)
-array(1) {
-  [0]=>
-  string(9) "1 2 3 4 5"
-}
 Done
