mattwil         Thu Apr  2 09:42:32 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/standard/tests/strings explode.phpt explode1.phpt 
                                        explode_variation5.phpt 
                                        explode_variation6.phpt 
  Log:
  MFH: Fixed tests, reverted changes from bug #47546
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode.phpt?r1=1.4.4.4&r2=1.4.4.5&diff_format=u
Index: php-src/ext/standard/tests/strings/explode.phpt
diff -u php-src/ext/standard/tests/strings/explode.phpt:1.4.4.4 
php-src/ext/standard/tests/strings/explode.phpt:1.4.4.5
--- php-src/ext/standard/tests/strings/explode.phpt:1.4.4.4     Sun Mar  8 
06:20:12 2009
+++ php-src/ext/standard/tests/strings/explode.phpt     Thu Apr  2 09:42:32 2009
@@ -64,9 +64,7 @@
   [0]=>
   string(11) "otherstring"
 }
-array(1) {
-  [0]=>
-  string(11) "otherstring"
+array(0) {
 }
 array(7) {
   [0]=>
@@ -132,23 +130,19 @@
   [20]=>
   string(1) "-"
 }
-array(4) {
+array(3) {
   [0]=>
   string(10) "a lazy dog"
   [1]=>
   string(5) "jumps"
   [2]=>
   string(4) "over"
-  [3]=>
-  string(0) ""
 }
-array(3) {
+array(2) {
   [0]=>
   string(10) "a lazy dog"
   [1]=>
   string(5) "jumps"
-  [2]=>
-  string(4) "over"
 }
 array(1) {
   [0]=>
@@ -158,13 +152,11 @@
 }
 array(0) {
 }
-array(3) {
+array(2) {
   [0]=>
   string(10) "a lazy dog"
   [1]=>
   string(11) "jumps::over"
-  [2]=>
-  string(0) ""
 }
 array(1) {
   [0]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode1.phpt?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/standard/tests/strings/explode1.phpt
diff -u php-src/ext/standard/tests/strings/explode1.phpt:1.1.2.4 
php-src/ext/standard/tests/strings/explode1.phpt:1.1.2.5
--- php-src/ext/standard/tests/strings/explode1.phpt:1.1.2.4    Sun Mar  8 
06:20:12 2009
+++ php-src/ext/standard/tests/strings/explode1.phpt    Thu Apr  2 09:42:32 2009
@@ -113,11 +113,9 @@
 Warning: explode(): Empty delimiter in %s on line %d
 bool(false)
 -- Iteration 3 --
-array(2) {
+array(1) {
   [0]=>
   string(10) "1234NULL23"
-  [1]=>
-  string(43) "00000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -134,7 +132,7 @@
   string(43) "00000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 -- Iteration 4 --
-array(6) {
+array(5) {
   [0]=>
   string(14) "1234NULL23abcd"
   [1]=>
@@ -145,8 +143,6 @@
   string(0) ""
   [4]=>
   string(0) ""
-  [5]=>
-  string(38) "TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -163,7 +159,7 @@
   string(42) "0000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 -- Iteration 5 --
-array(6) {
+array(5) {
   [0]=>
   string(14) "1234NULL23abcd"
   [1]=>
@@ -174,8 +170,6 @@
   string(0) ""
   [4]=>
   string(0) ""
-  [5]=>
-  string(38) "TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -192,7 +186,7 @@
   string(42) "0000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 -- Iteration 6 --
-array(6) {
+array(5) {
   [0]=>
   string(0) ""
   [1]=>
@@ -203,8 +197,6 @@
   string(12) ".234444true-"
   [4]=>
   string(0) ""
-  [5]=>
-  string(12) ".24%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -234,13 +226,11 @@
 Warning: explode(): Empty delimiter in %s on line %d
 bool(false)
 -- Iteration 8 --
-array(3) {
+array(2) {
   [0]=>
   string(28) "1234NULL23abcd00000TRUEFALSE"
   [1]=>
   string(12) "1.234444true"
-  [2]=>
-  string(13) "1.24%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -257,11 +247,9 @@
   string(27) "1.234444true-11.24%PHP%ZEND"
 }
 -- Iteration 9 --
-array(2) {
+array(1) {
   [0]=>
   string(28) "1234NULL23abcd00000TRUEFALSE"
-  [1]=>
-  string(23) "4444true-11.24%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -278,7 +266,7 @@
   string(23) "4444true-11.24%PHP%ZEND"
 }
 -- Iteration 10 --
-array(7) {
+array(6) {
   [0]=>
   string(3) "123"
   [1]=>
@@ -291,8 +279,6 @@
   string(0) ""
   [5]=>
   string(9) "true-11.2"
-  [6]=>
-  string(9) "%PHP%ZEND"
 }
 array(1) {
   [0]=>
@@ -309,13 +295,11 @@
   string(53) "NULL23abcd00000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
 }
 -- Iteration 11 --
-array(3) {
+array(2) {
   [0]=>
   string(48) "1234NULL23abcd00000TRUEFALSE-11.234444true-11.24"
   [1]=>
   string(3) "PHP"
-  [2]=>
-  string(4) "ZEND"
 }
 array(1) {
   [0]=>
@@ -353,7 +337,7 @@
 }
 
 *** Testing explode() for maximum limit of string with Limit = -1 ***
-array(52) {
+array(51) {
   [0]=>
   string(1) "1"
   [1]=>
@@ -456,8 +440,6 @@
   string(2) "55"
   [50]=>
   string(1) "1"
-  [51]=>
-  string(1) "1"
 }
 
 *** Testing explode() with string variations as input argument ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode_variation5.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/standard/tests/strings/explode_variation5.phpt
diff -u php-src/ext/standard/tests/strings/explode_variation5.phpt:1.1.2.3 
php-src/ext/standard/tests/strings/explode_variation5.phpt:1.1.2.4
--- php-src/ext/standard/tests/strings/explode_variation5.phpt:1.1.2.3  Sun Mar 
 8 06:20:12 2009
+++ php-src/ext/standard/tests/strings/explode_variation5.phpt  Thu Apr  2 
09:42:32 2009
@@ -33,15 +33,13 @@
 }
 
 -- negative limit (since PHP 5.1) --
-array(4) {
+array(3) {
   [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 -- 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode_variation6.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/standard/tests/strings/explode_variation6.phpt
diff -u php-src/ext/standard/tests/strings/explode_variation6.phpt:1.1.2.3 
php-src/ext/standard/tests/strings/explode_variation6.phpt:1.1.2.4
--- php-src/ext/standard/tests/strings/explode_variation6.phpt:1.1.2.3  Sun Mar 
 8 06:20:12 2009
+++ php-src/ext/standard/tests/strings/explode_variation6.phpt  Thu Apr  2 
09:42:32 2009
@@ -61,7 +61,6 @@
 string(6) "6f6e65"
 string(6) "74776f"
 string(10) "7468726565"
-string(8) "666f7572"
 
 -- large limit = -100 --
 string(6) "6f6e65"



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to