From: Kalle Sommer Nielsen <kalle@php.net>
Date: Sun, 8 Mar 2009 06:20:12 +0000 (+0000)
Subject: MFH: Fix tests
X-Git-Tag: php-5.2.10RC1~308
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba65b35b7f9cf73c09cf0bc0a2049cd0d39edd07;p=php

MFH: Fix tests
---

diff --git a/ext/standard/tests/strings/explode.phpt b/ext/standard/tests/strings/explode.phpt
index 1047fb7856..9daa44cbed 100644
--- a/ext/standard/tests/strings/explode.phpt
+++ b/ext/standard/tests/strings/explode.phpt
@@ -64,7 +64,9 @@ array(1) {
   [0]=>
   string(11) "otherstring"
 }
-array(0) {
+array(1) {
+  [0]=>
+  string(11) "otherstring"
 }
 array(7) {
   [0]=>
@@ -130,19 +132,23 @@ array(21) {
   [20]=>
   string(1) "-"
 }
-array(3) {
+array(4) {
   [0]=>
   string(10) "a lazy dog"
   [1]=>
   string(5) "jumps"
   [2]=>
   string(4) "over"
+  [3]=>
+  string(0) ""
 }
-array(2) {
+array(3) {
   [0]=>
   string(10) "a lazy dog"
   [1]=>
   string(5) "jumps"
+  [2]=>
+  string(4) "over"
 }
 array(1) {
   [0]=>
@@ -152,11 +158,13 @@ array(0) {
 }
 array(0) {
 }
-array(2) {
+array(3) {
   [0]=>
   string(10) "a lazy dog"
   [1]=>
   string(11) "jumps::over"
+  [2]=>
+  string(0) ""
 }
 array(1) {
   [0]=>
diff --git a/ext/standard/tests/strings/explode1.phpt b/ext/standard/tests/strings/explode1.phpt
index 2d56cd0aa4..d8d4642c6d 100644
--- a/ext/standard/tests/strings/explode1.phpt
+++ b/ext/standard/tests/strings/explode1.phpt
@@ -113,9 +113,11 @@ bool(false)
 Warning: explode(): Empty delimiter in %s on line %d
 bool(false)
 -- Iteration 3 --
-array(1) {
+array(2) {
   [0]=>
   string(10) "1234NULL23"
+  [1]=>
+  string(43) "00000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -132,7 +134,7 @@ array(2) {
   string(43) "00000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 -- Iteration 4 --
-array(5) {
+array(6) {
   [0]=>
   string(14) "1234NULL23abcd"
   [1]=>
@@ -143,6 +145,8 @@ array(5) {
   string(0) ""
   [4]=>
   string(0) ""
+  [5]=>
+  string(38) "TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -159,7 +163,7 @@ array(2) {
   string(42) "0000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 -- Iteration 5 --
-array(5) {
+array(6) {
   [0]=>
   string(14) "1234NULL23abcd"
   [1]=>
@@ -170,6 +174,8 @@ array(5) {
   string(0) ""
   [4]=>
   string(0) ""
+  [5]=>
+  string(38) "TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -186,7 +192,7 @@ array(2) {
   string(42) "0000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 -- Iteration 6 --
-array(5) {
+array(6) {
   [0]=>
   string(0) ""
   [1]=>
@@ -197,6 +203,8 @@ array(5) {
   string(12) ".234444true-"
   [4]=>
   string(0) ""
+  [5]=>
+  string(12) ".24%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -226,11 +234,13 @@ bool(false)
 Warning: explode(): Empty delimiter in %s on line %d
 bool(false)
 -- Iteration 8 --
-array(2) {
+array(3) {
   [0]=>
   string(28) "1234NULL23abcd00000TRUEFALSE"
   [1]=>
   string(12) "1.234444true"
+  [2]=>
+  string(13) "1.24%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -247,9 +257,11 @@ array(2) {
   string(27) "1.234444true-11.24%PHP%ZEND"
 }
 -- Iteration 9 --
-array(1) {
+array(2) {
   [0]=>
   string(28) "1234NULL23abcd00000TRUEFALSE"
+  [1]=>
+  string(23) "4444true-11.24%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -266,7 +278,7 @@ array(2) {
   string(23) "4444true-11.24%PHP%ZEND"
 }
 -- Iteration 10 --
-array(6) {
+array(7) {
   [0]=>
   string(3) "123"
   [1]=>
@@ -279,6 +291,8 @@ array(6) {
   string(0) ""
   [5]=>
   string(9) "true-11.2"
+  [6]=>
+  string(9) "%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -295,11 +309,13 @@ array(2) {
   string(53) "NULL23abcd00000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 -- Iteration 11 --
-array(2) {
+array(3) {
   [0]=>
   string(48) "1234NULL23abcd00000TRUEFALSE-11.234444true-11.24"
   [1]=>
   string(3) "PHP"
+  [2]=>
+  string(4) "ZEND"
 }
 array(1) {
   [0]=>
@@ -337,7 +353,7 @@ array(1) {
 }
 
 *** Testing explode() for maximum limit of string with Limit = -1 ***
-array(51) {
+array(52) {
   [0]=>
   string(1) "1"
   [1]=>
@@ -440,6 +456,8 @@ array(51) {
   string(2) "55"
   [50]=>
   string(1) "1"
+  [51]=>
+  string(1) "1"
 }
 
 *** Testing explode() with string variations as input argument ***
diff --git a/ext/standard/tests/strings/explode_variation5.phpt b/ext/standard/tests/strings/explode_variation5.phpt
index 754e55222a..941374de4e 100644
--- a/ext/standard/tests/strings/explode_variation5.phpt
+++ b/ext/standard/tests/strings/explode_variation5.phpt
@@ -33,13 +33,15 @@ array(2) {
 }
 
 -- negative limit (since PHP 5.1) --
-array(3) {
+array(4) {
   [0]=>
   string(3) "one"
   [1]=>
   string(3) "two"
   [2]=>
   string(5) "three"
+  [3]=>
+  string(4) "four"
 }
 
 -- negative limit (since PHP 5.1) with null string -- 
diff --git a/ext/standard/tests/strings/explode_variation6.phpt b/ext/standard/tests/strings/explode_variation6.phpt
index d1b34e3ef8..7c9b882598 100644
--- a/ext/standard/tests/strings/explode_variation6.phpt
+++ b/ext/standard/tests/strings/explode_variation6.phpt
@@ -61,6 +61,7 @@ string(36) "6f6e650074776f00746872656500666f7572"
 string(6) "6f6e65"
 string(6) "74776f"
 string(10) "7468726565"
+string(8) "666f7572"
 
 -- large limit = -100 --
 string(6) "6f6e65"