fix tests

diff --git a/ext/standard/tests/strings/bug23894.phpt b/ext/standard/tests/strings/bug23894.phpt
index 9cc0316a2416ef447bcd7eea915c9a6580cf70e8..b5ab7b30e0c2d3837f2b2d9e15ac663d4d890c97 100644 (file)
--- a/ext/standard/tests/strings/bug23894.phpt
+++ b/ext/standard/tests/strings/bug23894.phpt
@@ -13,3 +13,8 @@ string(4) "-012"
 string(8) "2d303132"
 string(13) "   4294967284"
 string(26) "20202034323934393637323834"
+--UEXPECT--
+string(4) "-012"
+unicode(8) "2d303132"
+string(13) "   4294967284"
+unicode(26) "20202034323934393637323834"

diff --git a/ext/standard/tests/strings/bug25671.phpt b/ext/standard/tests/strings/bug25671.phpt
index ac6479070428a505fb2d676f7717a9f228c0f298..9e35d7ab0f6fb712c9b6d8ae65a845d0559149c1 100644 (file)
--- a/ext/standard/tests/strings/bug25671.phpt
+++ b/ext/standard/tests/strings/bug25671.phpt
@@ -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;
 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.";}

diff --git a/ext/standard/tests/strings/bug27278.phpt b/ext/standard/tests/strings/bug27278.phpt
index 512fe64c924d269254c5a38680883ecb28941175..5ed201fe4eab947ef39acc32dbe37e2e539ee41b 100644 (file)
--- a/ext/standard/tests/strings/bug27278.phpt
+++ b/ext/standard/tests/strings/bug27278.phpt
@@ -21,5 +21,5 @@ string(2) "02"
 string(2) "02"
 --UEXPECT--
 unicode(2) "02"
-unicode(2) "02"
+string(2) "02"
 unicode(2) "02"

diff --git a/ext/standard/tests/strings/str_shuffle.phpt b/ext/standard/tests/strings/str_shuffle.phpt
index 32f387287b02f10f7f81698577b849263357742d..ee4c4a56f10db8025232edc884dc3104bf0e98fa 100644 (file)
--- a/ext/standard/tests/strings/str_shuffle.phpt
+++ b/ext/standard/tests/strings/str_shuffle.phpt
@@ -9,4 +9,7 @@ var_dump($s);
 ?>
 --EXPECTF--
 string(3) %s
-string(3) "123"
\ No newline at end of file
+string(3) "123"
+--UEXPECTF--
+string(3) "%s"
+unicode(3) "123"

diff --git a/ext/standard/tests/strings/substr_compare.phpt b/ext/standard/tests/strings/substr_compare.phpt
index 594aed17355693015e7311f3b6a5d7345128ddc5..3cbc8704ebab07e4b4181a72c91d30bf4df76948 100644 (file)
--- a/ext/standard/tests/strings/substr_compare.phpt
+++ b/ext/standard/tests/strings/substr_compare.phpt
@@ -37,3 +37,23 @@ bool(false)
 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

diff --git a/ext/standard/tests/strings/url_t.phpt b/ext/standard/tests/strings/url_t.phpt
index 2d18fa5c036aac1f464bcfe8cb9553d095a4edbc..c0063fb3b4ee07a5e6d5442b02961289e94b87b8 100644 (file)
--- a/ext/standard/tests/strings/url_t.phpt
+++ b/ext/standard/tests/strings/url_t.phpt
@@ -693,3 +693,614 @@ string(7) "hideout"
 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&parameters=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) "hideout@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(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://foo@bar"
+}
+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) "me@mydomain.com"
+}
+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"