kalle Sun Mar 8 06:20:00 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/strings explode.phpt explode1.phpt
explode_variation5.phpt
explode_variation6.phpt
Log:
MFH: Fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode.phpt?r1=1.4.4.1.2.2&r2=1.4.4.1.2.3&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.1.2.2
php-src/ext/standard/tests/strings/explode.phpt:1.4.4.1.2.3
--- php-src/ext/standard/tests/strings/explode.phpt:1.4.4.1.2.2 Sat Dec 27
05:15:51 2008
+++ php-src/ext/standard/tests/strings/explode.phpt Sun Mar 8 06:20:00 2009
@@ -64,7 +64,9 @@
[0]=>
string(11) "otherstring"
}
-array(0) {
+array(1) {
+ [0]=>
+ string(11) "otherstring"
}
array(7) {
[0]=>
@@ -130,19 +132,23 @@
[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(2) {
+array(3) {
[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.2.2.2&r2=1.1.2.2.2.3&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.2.2.2
php-src/ext/standard/tests/strings/explode1.phpt:1.1.2.2.2.3
--- php-src/ext/standard/tests/strings/explode1.phpt:1.1.2.2.2.2 Sun Jun
22 19:22:41 2008
+++ php-src/ext/standard/tests/strings/explode1.phpt Sun Mar 8 06:20:00 2009
@@ -113,9 +113,11 @@
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 @@
string(43) "00000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
}
-- Iteration 4 --
-array(5) {
+array(6) {
[0]=>
string(14) "1234NULL23abcd"
[1]=>
@@ -143,6 +145,8 @@
string(0) ""
[4]=>
string(0) ""
+ [5]=>
+ string(38) "TRUEFALSE-11.234444true-11.24%PHP%ZEND"
}
array(1) {
[0]=>
@@ -159,7 +163,7 @@
string(42) "0000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
}
-- Iteration 5 --
-array(5) {
+array(6) {
[0]=>
string(14) "1234NULL23abcd"
[1]=>
@@ -170,6 +174,8 @@
string(0) ""
[4]=>
string(0) ""
+ [5]=>
+ string(38) "TRUEFALSE-11.234444true-11.24%PHP%ZEND"
}
array(1) {
[0]=>
@@ -186,7 +192,7 @@
string(42) "0000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
}
-- Iteration 6 --
-array(5) {
+array(6) {
[0]=>
string(0) ""
[1]=>
@@ -197,6 +203,8 @@
string(12) ".234444true-"
[4]=>
string(0) ""
+ [5]=>
+ string(12) ".24%PHP%ZEND"
}
array(1) {
[0]=>
@@ -226,11 +234,13 @@
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 @@
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 @@
string(23) "4444true-11.24%PHP%ZEND"
}
-- Iteration 10 --
-array(6) {
+array(7) {
[0]=>
string(3) "123"
[1]=>
@@ -279,6 +291,8 @@
string(0) ""
[5]=>
string(9) "true-11.2"
+ [6]=>
+ string(9) "%PHP%ZEND"
}
array(1) {
[0]=>
@@ -295,11 +309,13 @@
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 @@
}
*** Testing explode() for maximum limit of string with Limit = -1 ***
-array(51) {
+array(52) {
[0]=>
string(1) "1"
[1]=>
@@ -440,6 +456,8 @@
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.4.2&r2=1.1.4.3&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.4.2
php-src/ext/standard/tests/strings/explode_variation5.phpt:1.1.4.3
--- php-src/ext/standard/tests/strings/explode_variation5.phpt:1.1.4.2 Sun Jan
18 14:35:00 2009
+++ php-src/ext/standard/tests/strings/explode_variation5.phpt Sun Mar 8
06:20:00 2009
@@ -33,13 +33,15 @@
}
-- 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 --
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode_variation6.phpt?r1=1.1.4.2&r2=1.1.4.3&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.4.2
php-src/ext/standard/tests/strings/explode_variation6.phpt:1.1.4.3
--- php-src/ext/standard/tests/strings/explode_variation6.phpt:1.1.4.2 Sun Jan
18 14:35:00 2009
+++ php-src/ext/standard/tests/strings/explode_variation6.phpt Sun Mar 8
06:20:00 2009
@@ -61,6 +61,7 @@
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
