Fixed tests, reverted changes from bug #47546

diff --git a/ext/standard/tests/strings/explode.phpt b/ext/standard/tests/strings/explode.phpt
index 9868d7b045f967c06047e55fde58d603c5687703..2ed242a247e0901ad780a6f4aee9fc30a16a3ce5 100644 (file)
--- a/ext/standard/tests/strings/explode.phpt
+++ b/ext/standard/tests/strings/explode.phpt
@@ -65,9 +65,7 @@ array(1) {
   [0]=>
   unicode(11) "otherstring"
 }
-array(1) {
-  [0]=>
-  unicode(11) "otherstring"
+array(0) {
 }
 array(7) {
   [0]=>
@@ -133,23 +131,19 @@ array(21) {
   [20]=>
   unicode(1) "-"
 }
-array(4) {
+array(3) {
   [0]=>
   unicode(10) "a lazy dog"
   [1]=>
   unicode(5) "jumps"
   [2]=>
   unicode(4) "over"
-  [3]=>
-  unicode(0) ""
 }
-array(3) {
+array(2) {
   [0]=>
   unicode(10) "a lazy dog"
   [1]=>
   unicode(5) "jumps"
-  [2]=>
-  unicode(4) "over"
 }
 array(1) {
   [0]=>
@@ -159,13 +153,11 @@ array(0) {
 }
 array(0) {
 }
-array(3) {
+array(2) {
   [0]=>
   unicode(10) "a lazy dog"
   [1]=>
   unicode(11) "jumps::over"
-  [2]=>
-  unicode(0) ""
 }
 array(1) {
   [0]=>

diff --git a/ext/standard/tests/strings/explode1.phpt b/ext/standard/tests/strings/explode1.phpt
index 4c9ab5136c219d26cb70501b81849aa519745fa7..370f3b1bb3eedf974cffcd7985400f31c89b085a 100644 (file)
--- a/ext/standard/tests/strings/explode1.phpt
+++ b/ext/standard/tests/strings/explode1.phpt
@@ -113,11 +113,9 @@ bool(false)
 Warning: explode(): Empty delimiter in %s on line %d
 bool(false)
 -- Iteration 3 --
-array(2) {
+array(1) {
   [0]=>
   unicode(10) "1234NULL23"
-  [1]=>
-  unicode(43) "00000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -134,7 +132,7 @@ array(2) {
   unicode(43) "00000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 -- Iteration 4 --
-array(6) {
+array(5) {
   [0]=>
   unicode(14) "1234NULL23abcd"
   [1]=>
@@ -145,8 +143,6 @@ array(6) {
   unicode(0) ""
   [4]=>
   unicode(0) ""
-  [5]=>
-  unicode(38) "TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -163,7 +159,7 @@ array(2) {
   unicode(42) "0000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 -- Iteration 5 --
-array(6) {
+array(5) {
   [0]=>
   unicode(14) "1234NULL23abcd"
   [1]=>
@@ -174,8 +170,6 @@ array(6) {
   unicode(0) ""
   [4]=>
   unicode(0) ""
-  [5]=>
-  unicode(38) "TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -192,7 +186,7 @@ array(2) {
   unicode(42) "0000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 -- Iteration 6 --
-array(6) {
+array(5) {
   [0]=>
   unicode(0) ""
   [1]=>
@@ -203,8 +197,6 @@ array(6) {
   unicode(12) ".234444true-"
   [4]=>
   unicode(0) ""
-  [5]=>
-  unicode(12) ".24%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -234,13 +226,11 @@ bool(false)
 Warning: explode(): Empty delimiter in %s on line %d
 bool(false)
 -- Iteration 8 --
-array(3) {
+array(2) {
   [0]=>
   unicode(28) "1234NULL23abcd00000TRUEFALSE"
   [1]=>
   unicode(12) "1.234444true"
-  [2]=>
-  unicode(13) "1.24%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -257,11 +247,9 @@ array(2) {
   unicode(27) "1.234444true-11.24%PHP%ZEND"
 }
 -- Iteration 9 --
-array(2) {
+array(1) {
   [0]=>
   unicode(28) "1234NULL23abcd00000TRUEFALSE"
-  [1]=>
-  unicode(23) "4444true-11.24%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -278,7 +266,7 @@ array(2) {
   unicode(23) "4444true-11.24%PHP%ZEND"
 }
 -- Iteration 10 --
-array(7) {
+array(6) {
   [0]=>
   unicode(3) "123"
   [1]=>
@@ -291,8 +279,6 @@ array(7) {
   unicode(0) ""
   [5]=>
   unicode(9) "true-11.2"
-  [6]=>
-  unicode(9) "%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -309,13 +295,11 @@ array(2) {
   unicode(53) "NULL23abcd00000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 -- Iteration 11 --
-array(3) {
+array(2) {
   [0]=>
   unicode(48) "1234NULL23abcd00000TRUEFALSE-11.234444true-11.24"
   [1]=>
   unicode(3) "PHP"
-  [2]=>
-  unicode(4) "ZEND"
 }
 array(1) {
   [0]=>
@@ -353,7 +337,7 @@ array(1) {
 }
 
 *** Testing explode() for maximum limit of string with Limit = -1 ***
-array(52) {
+array(51) {
   [0]=>
   unicode(1) "1"
   [1]=>
@@ -456,8 +440,6 @@ array(52) {
   unicode(2) "55"
   [50]=>
   unicode(1) "1"
-  [51]=>
-  unicode(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 ec57e878fe8df42f6e0d9b87e97df25208a1fdac..d3155837d46a8fb2c2734d5863c9d2aafe61f1dd 100644 (file)
--- a/ext/standard/tests/strings/explode_variation5.phpt
+++ b/ext/standard/tests/strings/explode_variation5.phpt
@@ -33,15 +33,13 @@ array(2) {
 }
 
 -- negative limit (since PHP 5.1) --
-array(4) {
+array(3) {
   [0]=>
   unicode(3) "one"
   [1]=>
   unicode(3) "two"
   [2]=>
   unicode(5) "three"
-  [3]=>
-  unicode(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 0a4cfc57d43acb4523bf64ac722c00dcf00d0e41..551c974d87a9f4903b18e97fafe7ecd072a0c10e 100644 (file)
--- a/ext/standard/tests/strings/explode_variation6.phpt
+++ b/ext/standard/tests/strings/explode_variation6.phpt
@@ -61,7 +61,6 @@ unicode(36) "6f6e650074776f00746872656500666f7572"
 unicode(6) "6f6e65"
 unicode(6) "74776f"
 unicode(10) "7468726565"
-unicode(8) "666f7572"
 
 -- large limit = -100 --
 unicode(6) "6f6e65"