Fixed tests

diff --git a/ext/iconv/tests/eucjp2iso2022jp.phpt b/ext/iconv/tests/eucjp2iso2022jp.phpt
index 3adacaf3db5568672b5a07875f867f50444d386f..a667f55558f3759c9ace340fb5d6ab27de24172f 100644 (file)
--- a/ext/iconv/tests/eucjp2iso2022jp.phpt
+++ b/ext/iconv/tests/eucjp2iso2022jp.phpt
@@ -18,8 +18,8 @@ function hexdump($str) {
        print "\n";
 }
 
-$str = str_repeat("ÆüËܸì¥Æ¥­¥¹¥È¤È English text", 30);
-$str .= "ÆüËܸì";
+$str = str_repeat(b"ÆüËܸì¥Æ¥­¥¹¥È¤È English text", 30);
+$str .= b"ÆüËܸì";
 
 echo hexdump(iconv("EUC-JP", "ISO-2022-JP", $str));
 ?>

diff --git a/ext/iconv/tests/eucjp2sjis.phpt b/ext/iconv/tests/eucjp2sjis.phpt
index 4e0e52db88897354c46643d88d912eee8bb91ca9..563351f65d0963d32a0f1b1191ac09c8923e342a 100644 (file)
--- a/ext/iconv/tests/eucjp2sjis.phpt
+++ b/ext/iconv/tests/eucjp2sjis.phpt
@@ -10,7 +10,7 @@ unicode.output_encoding=ISO-8859-1
 <?php
 /* charset=EUC-JP */
 
-$str = "
+$str = b"
 ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
 ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
 ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text

diff --git a/ext/iconv/tests/eucjp2utf8.phpt b/ext/iconv/tests/eucjp2utf8.phpt
index b75cd83a3e998461caf60cc1035c134823a88a86..0b3585684f3a4ed850e50b7e340eae498106c8cb 100644 (file)
--- a/ext/iconv/tests/eucjp2utf8.phpt
+++ b/ext/iconv/tests/eucjp2utf8.phpt
@@ -10,7 +10,7 @@ unicode.output_encoding=ISO-8859-1
 <?php
 /* charset=EUC-JP */
 
-$str = "
+$str = b"
 ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
 ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
 ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text

diff --git a/ext/iconv/tests/iconv_strlen.phpt b/ext/iconv/tests/iconv_strlen.phpt
index b7605ba94301831cfe13dab120e2f4fa5a829922..20db187649ee6209ff873b5ecda639b10be4b23d 100644 (file)
--- a/ext/iconv/tests/iconv_strlen.phpt
+++ b/ext/iconv/tests/iconv_strlen.phpt
@@ -12,11 +12,14 @@ function foo($str, $charset) {
        var_dump(iconv_strlen($str, $charset));
 }
 
-foo("abc", "ASCII");
-foo("ÆüËܸì EUC-JP", "EUC-JP");
+foo(b"abc", "ASCII");
+foo(b"ÆüËܸì EUC-JP", "EUC-JP");
+foo(unicode_decode(b"ÆüËܸì EUC-JP", "EUC-JP"), "EUC-JP");
 ?>
 --EXPECT--
 int(3)
 int(3)
 int(13)
 int(10)
+int(10)
+int(10)

diff --git a/ext/iconv/tests/iconv_strpos.phpt b/ext/iconv/tests/iconv_strpos.phpt
index 8cbed8d2aaf0d70b53efb2bfe6b77dbf8dc02c14..aa340396ec4306d1ae8795a089ef8ace73a50c36 100644 (file)
--- a/ext/iconv/tests/iconv_strpos.phpt
+++ b/ext/iconv/tests/iconv_strpos.phpt
@@ -30,9 +30,9 @@ foo("abecdbcdabef", "bcd", 100000);
 foo("abcabcabcdabcababcdabc", "bcd", 0);
 foo("abcabcabcdabcababcdabc", "bcd", 10);
 foo(str_repeat("abcab", 60)."abcdb".str_repeat("adabc", 60), "abcd", 0);
-foo(str_repeat("¤¢¤¤¤¦¤¨¤ª", 30)."¤¤¤¦¤ª¤¨¤¢".str_repeat("¤¢¤¤¤¨¤ª¤¦", 30), "¤¦¤ª", 0, "EUC-JP");
-$str = str_repeat("¤¢¤¤¤¦¤¨¤ª", 60).'$'.str_repeat("¤¢¤¤¤¨¤ª¤¦", 60);
-foo($str, '$', 0, "ISO-2022-JP", "EUC-JP");
+foo(str_repeat(b"¤¢¤¤¤¦¤¨¤ª", 30).b"¤¤¤¦¤ª¤¨¤¢".str_repeat(b"¤¢¤¤¤¨¤ª¤¦", 30), b"¤¦¤ª", 0, "EUC-JP");
+$str = str_repeat(b"¤¢¤¤¤¦¤¨¤ª", 60).b'$'.str_repeat(b"¤¢¤¤¤¨¤ª¤¦", 60);
+foo($str, b'$', 0, "ISO-2022-JP", "EUC-JP");
 
 var_dump(iconv_strpos("string", ""));
 var_dump(iconv_strpos("", "string"));

diff --git a/ext/iconv/tests/iconv_strrpos.phpt b/ext/iconv/tests/iconv_strrpos.phpt
index 37e62b136e0a88a2197fc2f8c21859e31f92db4d..9d5904056fcda60e1ede06facf22f60e55ab5959 100644 (file)
--- a/ext/iconv/tests/iconv_strrpos.phpt
+++ b/ext/iconv/tests/iconv_strrpos.phpt
@@ -28,11 +28,11 @@ function foo($haystk, $needle, $to_charset = false, $from_charset = false)
 }
 foo("abecdbcdabcdef", "bcd");
 foo(str_repeat("abcab", 60)."abcdb".str_repeat("adabc", 60), "abcd");
-foo(str_repeat("¤¢¤¤¤¦¤¨¤ª", 30)."¤¤¤¦¤ª¤¨¤¢".str_repeat("¤¢¤¤¤¨¤ª¤¦", 30), "¤¦¤ª", "EUC-JP");
+foo(str_repeat(b"¤¢¤¤¤¦¤¨¤ª", 30).b"¤¤¤¦¤ª¤¨¤¢".str_repeat(b"¤¢¤¤¤¨¤ª¤¦", 30), b"¤¦¤ª", "EUC-JP");
 
 for ($i = 0; $i <=6; ++$i) {
-       $str = str_repeat("¤¢¤¤¤¦¤¨¤ª", 60).str_repeat('$', $i).str_repeat("¤¢¤¤¤¨¤ª¤¦", 60);
-       foo($str, '$', "ISO-2022-JP", "EUC-JP");
+       $str = str_repeat(b"¤¢¤¤¤¦¤¨¤ª", 60).str_repeat(b'$', $i).str_repeat(b"¤¢¤¤¤¨¤ª¤¦", 60);
+       foo($str, b'$', "ISO-2022-JP", "EUC-JP");
 }
 
 var_dump(iconv_strrpos("string", ""));

diff --git a/ext/iconv/tests/iconv_substr.phpt b/ext/iconv/tests/iconv_substr.phpt
index 0b2ef437a92c8997d8820b4b0d915784e7d910fc..cbae9e686086003e2c51c80b4d6acd49e223a703 100644 (file)
--- a/ext/iconv/tests/iconv_substr.phpt
+++ b/ext/iconv/tests/iconv_substr.phpt
@@ -32,14 +32,14 @@ function bar($str, $offset, $len = false) {
 }
 
 foo("abcdefghijklmnopqrstuvwxyz", 5, 7, "ASCII");
-foo("¤¢¤¤¤¦¤¨¤ª¤«¤­¤¯¤±¤³¤µ¤·¤¹", 5, 7, "EUC-JP");
+foo(b"¤¢¤¤¤¦¤¨¤ª¤«¤­¤¯¤±¤³¤µ¤·¤¹", 5, 7, "EUC-JP");
 bar("This is a test", 100000);
 bar("This is a test", 0, 100000);
 bar("This is a test", -3);
 bar("This is a test", 0, -9);
 bar("This is a test", 0, -100000);
 bar("This is a test", -9, -100000);
-var_dump(iconv("ISO-2022-JP", "EUC-JP", iconv_substr(iconv("EUC-JP", "ISO-2022-JP", "¤³¤ó¤Ë¤Á¤Ï ISO-2022-JP"), 3, 8, "ISO-2022-JP")));
+var_dump(iconv("ISO-2022-JP", "EUC-JP", iconv_substr(iconv("EUC-JP", "ISO-2022-JP", b"¤³¤ó¤Ë¤Á¤Ï ISO-2022-JP"), 3, 8, "ISO-2022-JP")));
 ?>
 --EXPECT--
 666768696a6b6c

diff --git a/ext/phar/tests/front.phar.phpt b/ext/phar/tests/front.phar.phpt
index ce961c200f0256aba80711017243b51c48f4b55c..bab8ada0fdd357b9e18361a291ce2c2eabf3b269 100644 (file)
--- a/ext/phar/tests/front.phar.phpt
+++ b/ext/phar/tests/front.phar.phpt
@@ -13,7 +13,7 @@ Content-type: text/html; charset=UTF-8
 --FILE_EXTERNAL--
 files/blog.phar
 --EXPECTF--
-%string|unicode%(%d) "<xml version="1.0" encoding="UTF-8">
+string(%d) "<xml version="1.0" encoding="UTF-8">
 <config>
  <database>
   <host>localhost</name>

diff --git a/ext/standard/tests/file/bug12556.phpt b/ext/standard/tests/file/bug12556.phpt
index a247dade946b1f847f2b642de64458559fb11466..78829d51ed596afaf207e61f780174669f78c1b3 100644 (file)
--- a/ext/standard/tests/file/bug12556.phpt
+++ b/ext/standard/tests/file/bug12556.phpt
@@ -2,7 +2,7 @@
 Bug #12556 (fgetcsv() ignores lengths when quotes not closed)
 --FILE--
 <?php
-$fp = fopen(dirname(__FILE__)."/test.csv", "r");
+$fp = fopen(dirname(__FILE__)."/test.csv", "rt");
 while($line = fgetcsv($fp, 24)) {
        $line = str_replace("\x0d\x0a", "\x0a", $line);
        var_dump($line);

diff --git a/ext/standard/tests/strings/md5_file.phpt b/ext/standard/tests/strings/md5_file.phpt
index e6c077942089266e0f811be917902b4b1e31dedc..2f4cafc34896bc9fdab2ec3f6fbdd92d951bcf8b 100644 (file)
Binary files a/ext/standard/tests/strings/md5_file.phpt and b/ext/standard/tests/strings/md5_file.phpt differ

diff --git a/ext/standard/tests/strings/strcasecmp.phpt b/ext/standard/tests/strings/strcasecmp.phpt
index 8d2fe12396fcb7dce3f174e4f384ff6b34957d88..662893a66fb6bc21dee54af8d858679ea03b44ae 100644 (file)
Binary files a/ext/standard/tests/strings/strcasecmp.phpt and b/ext/standard/tests/strings/strcasecmp.phpt differ

diff --git a/ext/standard/tests/strings/strcmp.phpt b/ext/standard/tests/strings/strcmp.phpt
index 44346d8de37d9b9caf08746741ca88fed90bf526..b043897a13fb8ecd6596626ae1ec967061c452a4 100644 (file)
Binary files a/ext/standard/tests/strings/strcmp.phpt and b/ext/standard/tests/strings/strcmp.phpt differ