tony2001 Tue Jun 20 19:49:45 2006 UTC
Modified files:
/php-src/ext/standard/tests/strings bug23894.phpt bug25671.phpt
bug27278.phpt str_shuffle.phpt
substr_compare.phpt url_t.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug23894.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/strings/bug23894.phpt
diff -u php-src/ext/standard/tests/strings/bug23894.phpt:1.1
php-src/ext/standard/tests/strings/bug23894.phpt:1.2
--- php-src/ext/standard/tests/strings/bug23894.phpt:1.1 Fri May 30
13:48:14 2003
+++ php-src/ext/standard/tests/strings/bug23894.phpt Tue Jun 20 19:49:44 2006
@@ -13,3 +13,8 @@
string(8) "2d303132"
string(13) " 4294967284"
string(26) "20202034323934393637323834"
+--UEXPECT--
+string(4) "-012"
+unicode(8) "2d303132"
+string(13) " 4294967284"
+unicode(26) "20202034323934393637323834"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug25671.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/strings/bug25671.phpt
diff -u php-src/ext/standard/tests/strings/bug25671.phpt:1.1
php-src/ext/standard/tests/strings/bug25671.phpt:1.2
--- php-src/ext/standard/tests/strings/bug25671.phpt:1.1 Sat Sep 27
18:48:48 2003
+++ php-src/ext/standard/tests/strings/bug25671.phpt Tue Jun 20 19:49:44 2006
@@ -20,4 +20,8 @@
a:4:{i:0;s:19:"This is strung one.";i:1;s:19:"This is strung
two.";i:2;a:2:{i:0;s:23:"This is another string.";i:1;s:22:"This is a last
string.";}i:3;s:22:"This is a last strung.";}
a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;s:23:"This
is another string.";i:1;s:22:"This is a last
string.";}i:3;s:18:"Thisisalaststring.";}
a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;s:23:"This
is another string.";i:1;s:22:"This is a last
string.";}i:3;s:18:"Thisisalaststring.";}
-
+--UEXPECT--
+a:4:{i:0;s:19:"This is strung one.";i:1;s:19:"This is strung
two.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last
string.";}i:3;s:22:"This is a last strung.";}
+a:4:{i:0;s:19:"This is strung one.";i:1;s:19:"This is strung
two.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last
string.";}i:3;s:22:"This is a last strung.";}
+a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;U:23:"This
is another string.";i:1;U:22:"This is a last
string.";}i:3;s:18:"Thisisalaststring.";}
+a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;U:23:"This
is another string.";i:1;U:22:"This is a last
string.";}i:3;s:18:"Thisisalaststring.";}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug27278.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/standard/tests/strings/bug27278.phpt
diff -u php-src/ext/standard/tests/strings/bug27278.phpt:1.4
php-src/ext/standard/tests/strings/bug27278.phpt:1.5
--- php-src/ext/standard/tests/strings/bug27278.phpt:1.4 Mon Aug 15
14:37:55 2005
+++ php-src/ext/standard/tests/strings/bug27278.phpt Tue Jun 20 19:49:44 2006
@@ -21,5 +21,5 @@
string(2) "02"
--UEXPECT--
unicode(2) "02"
-unicode(2) "02"
+string(2) "02"
unicode(2) "02"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_shuffle.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/strings/str_shuffle.phpt
diff -u php-src/ext/standard/tests/strings/str_shuffle.phpt:1.2
php-src/ext/standard/tests/strings/str_shuffle.phpt:1.3
--- php-src/ext/standard/tests/strings/str_shuffle.phpt:1.2 Mon Dec 22
23:45:53 2003
+++ php-src/ext/standard/tests/strings/str_shuffle.phpt Tue Jun 20 19:49:44 2006
@@ -9,4 +9,7 @@
?>
--EXPECTF--
string(3) %s
-string(3) "123"
\ No newline at end of file
+string(3) "123"
+--UEXPECTF--
+string(3) "%s"
+unicode(3) "123"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/substr_compare.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/substr_compare.phpt
diff -u php-src/ext/standard/tests/strings/substr_compare.phpt:1.3
php-src/ext/standard/tests/strings/substr_compare.phpt:1.4
--- php-src/ext/standard/tests/strings/substr_compare.phpt:1.3 Tue Apr 25
12:50:14 2006
+++ php-src/ext/standard/tests/strings/substr_compare.phpt Tue Jun 20
19:49:44 2006
@@ -37,3 +37,23 @@
Warning: substr_compare() expects parameter 4 to be long, string given in %s
on line %d
bool(false)
Done
+--UEXPECTF--
+int(0)
+int(0)
+int(0)
+int(1)
+int(-1)
+
+Warning: substr_compare(): The start position cannot exceed initial string
length in %s on line %d
+bool(false)
+
+Warning: substr_compare() expects parameter 5 to be boolean, object given in
%s on line %d
+bool(false)
+Test
+
+Warning: substr_compare(): The length must be greater than zero in %s on line
%d
+bool(false)
+
+Warning: substr_compare() expects parameter 4 to be long, Unicode string given
in %s on line %d
+bool(false)
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/url_t.phpt?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/standard/tests/strings/url_t.phpt
diff -u php-src/ext/standard/tests/strings/url_t.phpt:1.12
php-src/ext/standard/tests/strings/url_t.phpt:1.13
--- php-src/ext/standard/tests/strings/url_t.phpt:1.12 Sun Feb 12 16:40:34 2006
+++ php-src/ext/standard/tests/strings/url_t.phpt Tue Jun 20 19:49:44 2006
@@ -693,3 +693,614 @@
string(10) "/index.php"
string(31) "test=1&test2=char&test3=mixesCI"
string(16) "some_page_ref123"
+--UEXPECT--
+array(1) {
+ [u"path"]=>
+ string(0) ""
+}
+array(1) {
+ [u"path"]=>
+ string(12) "64.246.30.37"
+}
+array(2) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(12) "64.246.30.37"
+}
+array(3) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(12) "64.246.30.37"
+ [u"path"]=>
+ string(1) "/"
+}
+array(1) {
+ [u"path"]=>
+ string(13) "64.246.30.37/"
+}
+array(3) {
+ [u"host"]=>
+ string(12) "64.246.30.37"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(1) "/"
+}
+array(1) {
+ [u"path"]=>
+ string(7) "php.net"
+}
+array(1) {
+ [u"path"]=>
+ string(8) "php.net/"
+}
+array(2) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(7) "php.net"
+}
+array(3) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(7) "php.net"
+ [u"path"]=>
+ string(1) "/"
+}
+array(1) {
+ [u"path"]=>
+ string(11) "www.php.net"
+}
+array(1) {
+ [u"path"]=>
+ string(12) "www.php.net/"
+}
+array(2) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+}
+array(3) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"path"]=>
+ string(1) "/"
+}
+array(2) {
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+}
+array(3) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+}
+array(4) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(1) "/"
+}
+array(3) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"path"]=>
+ string(10) "/index.php"
+}
+array(1) {
+ [u"path"]=>
+ string(12) "www.php.net/"
+}
+array(3) {
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(1) "/"
+}
+array(3) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"path"]=>
+ string(1) "/"
+}
+array(4) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(1) "/"
+}
+array(4) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(10) "/index.php"
+}
+array(4) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(18) "/foo/bar/index.php"
+}
+array(4) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(53) "/this/is/a/very/deep/directory/structure/and/file.php"
+}
+array(5) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(53) "/this/is/a/very/deep/directory/structure/and/file.php"
+ [u"query"]=>
+ string(37) "lots=1&of=2¶meters=3&too=4&here=5"
+}
+array(4) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(45) "/this/is/a/very/deep/directory/structure/and/"
+}
+array(4) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(53) "/this/is/a/very/deep/directory/structure/and/file.php"
+}
+array(4) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(28) "/this/../a/../deep/directory"
+}
+array(4) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(29) "/this/../a/../deep/directory/"
+}
+array(4) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(42) "/this/is/a/very/deep/directory/../file.php"
+}
+array(4) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(10) "/index.php"
+}
+array(4) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(10) "/index.php"
+}
+array(5) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(1) "/"
+ [u"fragment"]=>
+ string(3) "foo"
+}
+array(4) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(1) "/"
+}
+array(5) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(1) "/"
+ [u"query"]=>
+ string(6) "test=1"
+}
+array(4) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"path"]=>
+ string(1) "/"
+ [u"query"]=>
+ string(7) "test=1&"
+}
+array(5) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(1) "/"
+ [u"query"]=>
+ string(1) "&"
+}
+array(5) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(10) "/index.php"
+ [u"query"]=>
+ string(7) "test=1&"
+}
+array(4) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"path"]=>
+ string(10) "/index.php"
+ [u"query"]=>
+ string(1) "&"
+}
+array(5) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(10) "/index.php"
+ [u"query"]=>
+ string(4) "foo&"
+}
+array(4) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"path"]=>
+ string(10) "/index.php"
+ [u"query"]=>
+ string(4) "&foo"
+}
+array(5) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(10) "/index.php"
+ [u"query"]=>
+ string(31) "test=1&test2=char&test3=mixesCI"
+}
+array(5) {
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"path"]=>
+ string(10) "/index.php"
+ [u"query"]=>
+ string(31) "test=1&test2=char&test3=mixesCI"
+ [u"fragment"]=>
+ string(16) "some_page_ref123"
+}
+array(7) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"user"]=>
+ string(6) "secret"
+ [u"path"]=>
+ string(10) "/index.php"
+ [u"query"]=>
+ string(31) "test=1&test2=char&test3=mixesCI"
+ [u"fragment"]=>
+ string(16) "some_page_ref123"
+}
+array(6) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"user"]=>
+ string(6) "secret"
+ [u"path"]=>
+ string(10) "/index.php"
+ [u"query"]=>
+ string(31) "test=1&test2=char&test3=mixesCI"
+ [u"fragment"]=>
+ string(16) "some_page_ref123"
+}
+array(7) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"pass"]=>
+ string(7) "hideout"
+ [u"path"]=>
+ string(10) "/index.php"
+ [u"query"]=>
+ string(31) "test=1&test2=char&test3=mixesCI"
+ [u"fragment"]=>
+ string(16) "some_page_ref123"
+}
+array(7) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"user"]=>
+ string(6) "secret"
+ [u"pass"]=>
+ string(7) "hideout"
+ [u"path"]=>
+ string(10) "/index.php"
+ [u"query"]=>
+ string(31) "test=1&test2=char&test3=mixesCI"
+ [u"fragment"]=>
+ string(16) "some_page_ref123"
+}
+array(7) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(19) "[EMAIL PROTECTED]"
+ [u"port"]=>
+ int(80)
+ [u"user"]=>
+ string(6) "secret"
+ [u"path"]=>
+ string(10) "/index.php"
+ [u"query"]=>
+ string(31) "test=1&test2=char&test3=mixesCI"
+ [u"fragment"]=>
+ string(16) "some_page_ref123"
+}
+array(8) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(11) "www.php.net"
+ [u"port"]=>
+ int(80)
+ [u"user"]=>
+ string(6) "secret"
+ [u"pass"]=>
+ string(7) "hid:out"
+ [u"path"]=>
+ string(10) "/index.php"
+ [u"query"]=>
+ string(31) "test=1&test2=char&test3=mixesCI"
+ [u"fragment"]=>
+ string(16) "some_page_ref123"
+}
+array(2) {
+ [u"scheme"]=>
+ string(4) "nntp"
+ [u"host"]=>
+ string(12) "news.php.net"
+}
+array(3) {
+ [u"scheme"]=>
+ string(3) "ftp"
+ [u"host"]=>
+ string(11) "ftp.gnu.org"
+ [u"path"]=>
+ string(22) "/gnu/glic/glibc.tar.gz"
+}
+array(2) {
+ [u"scheme"]=>
+ string(4) "zlib"
+ [u"path"]=>
+ string(14) "http://[EMAIL PROTECTED]"
+}
+array(2) {
+ [u"scheme"]=>
+ string(4) "zlib"
+ [u"path"]=>
+ string(12) "filename.txt"
+}
+array(2) {
+ [u"scheme"]=>
+ string(4) "zlib"
+ [u"path"]=>
+ string(25) "/path/to/my/file/file.txt"
+}
+array(3) {
+ [u"scheme"]=>
+ string(3) "foo"
+ [u"host"]=>
+ string(3) "bar"
+ [u"user"]=>
+ string(3) "foo"
+}
+array(2) {
+ [u"scheme"]=>
+ string(6) "mailto"
+ [u"path"]=>
+ string(15) "[EMAIL PROTECTED]"
+}
+array(2) {
+ [u"path"]=>
+ string(8) "/foo.php"
+ [u"query"]=>
+ string(7) "a=b&c=d"
+}
+array(2) {
+ [u"path"]=>
+ string(7) "foo.php"
+ [u"query"]=>
+ string(7) "a=b&c=d"
+}
+array(6) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(15) "www.example.com"
+ [u"port"]=>
+ int(8080)
+ [u"user"]=>
+ string(4) "user"
+ [u"pass"]=>
+ string(6) "passwd"
+ [u"query"]=>
+ string(12) "bar=1&boom=0"
+}
+array(2) {
+ [u"scheme"]=>
+ string(4) "file"
+ [u"path"]=>
+ string(13) "/path/to/file"
+}
+array(3) {
+ [u"scheme"]=>
+ string(4) "file"
+ [u"host"]=>
+ string(4) "path"
+ [u"path"]=>
+ string(8) "/to/file"
+}
+array(2) {
+ [u"scheme"]=>
+ string(4) "file"
+ [u"path"]=>
+ string(13) "/path/to/file"
+}
+array(4) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(7) "1.2.3.4"
+ [u"path"]=>
+ string(8) "/abc.asp"
+ [u"query"]=>
+ string(7) "a=1&b=2"
+}
+array(3) {
+ [u"scheme"]=>
+ string(4) "http"
+ [u"host"]=>
+ string(7) "foo.com"
+ [u"fragment"]=>
+ string(3) "bar"
+}
+array(1) {
+ [u"scheme"]=>
+ string(6) "scheme"
+}
+array(4) {
+ [u"scheme"]=>
+ string(7) "foo+bar"
+ [u"host"]=>
+ string(4) "bang"
+ [u"user"]=>
+ string(3) "baz"
+ [u"path"]=>
+ string(4) "/bla"
+}
+array(2) {
+ [u"scheme"]=>
+ string(2) "gg"
+ [u"path"]=>
+ string(7) "9130731"
+}
+string(4) "http"
+string(11) "www.php.net"
+int(80)
+string(6) "secret"
+string(7) "hideout"
+string(10) "/index.php"
+string(31) "test=1&test2=char&test3=mixesCI"
+string(16) "some_page_ref123"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
