fix tests

diff --git a/ext/standard/tests/general_functions/007.phpt b/ext/standard/tests/general_functions/007.phpt
index f755ab4f8082750be12642ede0d9dcdc4a8d1df3..528580dbdf3039a576632811f61db2151218efb6 100644 (file)
--- a/ext/standard/tests/general_functions/007.phpt
+++ b/ext/standard/tests/general_functions/007.phpt
@@ -6,13 +6,13 @@ function test($str) {
        $res = md5(base64_decode(base64_encode($str)))."\n";
        return $res;
 } 
-echo test("");
-echo test("a");
-echo test("abc");
-echo test("message digest");
-echo test("abcdefghijklmnopqrstuvwxyz");
-echo test("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
-echo test("12345678901234567890123456789012345678901234567890123456789012345678901234567890");
+echo test(b"");
+echo test(b"a");
+echo test(b"abc");
+echo test(b"message digest");
+echo test(b"abcdefghijklmnopqrstuvwxyz");
+echo test(b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
+echo test(b"12345678901234567890123456789012345678901234567890123456789012345678901234567890");
 ?>
 --EXPECT--
 d41d8cd98f00b204e9800998ecf8427e

diff --git a/ext/standard/tests/serialize/002.phpt b/ext/standard/tests/serialize/002.phpt
index 2ed233988f8d4c2e71ab29f5cc701637c05b315e..87aed39fd454f7f95790582e34285b7daa969109 100644 (file)
--- a/ext/standard/tests/serialize/002.phpt
+++ b/ext/standard/tests/serialize/002.phpt
@@ -46,11 +46,11 @@ object(stdClass)#%d (0) {
 bool(false)
 bool(true)
 int(823)
-unicode(0) ""
-unicode(3) "foo"
+string(0) ""
+string(3) "foo"
 array(1) {
   [0]=>
-  unicode(2) "12"
+  string(2) "12"
 }
 array(2) {
   [0]=>
@@ -62,11 +62,11 @@ array(2) {
 }
 array(3) {
   [0]=>
-  unicode(3) "foo"
+  string(3) "foo"
   [1]=>
-  unicode(3) "bar"
+  string(3) "bar"
   [2]=>
-  unicode(3) "baz"
+  string(3) "baz"
 }
 object(stdClass)#%d (0) {
 }

diff --git a/ext/standard/tests/strings/bug24312.phpt b/ext/standard/tests/strings/bug24312.phpt
index 5ec444dd584a09a33c39aa8f918e5c0fa15b1d44..45c7ed7d1fb24c0062435596f1d25766c68f9fa4 100644 (file)
--- a/ext/standard/tests/strings/bug24312.phpt
+++ b/ext/standard/tests/strings/bug24312.phpt
@@ -2,7 +2,7 @@
 Bug #24208 (base64_decode() not skipping 0xF0 - 0xFF)
 --FILE--
 <?php
-$data = str_repeat("a", 100);
+$data = str_repeat(b"a", 100);
 for ($i = 0xF0; $i < 0xFF + 1; $i++) {
        $enc = chunk_split(base64_encode($data), 10, chr($i));
        var_dump(base64_decode($enc));

diff --git a/ext/standard/tests/strings/bug36306.phpt b/ext/standard/tests/strings/bug36306.phpt
index cd1a0c4c0d2175d1c7a1230408287cbe9062446b..f59f770d467398e8f5448ce43e600398a94c16e6 100644 (file)
--- a/ext/standard/tests/strings/bug36306.phpt
+++ b/ext/standard/tests/strings/bug36306.phpt
@@ -9,7 +9,7 @@ Bug #36306 crc32() 64bit
    Have to find some small strings to truely reproduce
    the problem, this example being not a problem
 */
-echo dechex(crc32("platform independant")) . "\n";
+echo dechex(crc32(b"platform independant")) . "\n";
 ?>
 --EXPECT--
 ccd9fe66

diff --git a/ext/standard/tests/strings/crc32.phpt b/ext/standard/tests/strings/crc32.phpt
index e1b338f011641a458ddfe6a7480352f1a557093a..207fe67e01acbf94b4a22e694ac1c983481bc773 100644 (file)
--- a/ext/standard/tests/strings/crc32.phpt
+++ b/ext/standard/tests/strings/crc32.phpt
@@ -2,7 +2,7 @@
 crc32() function
 --FILE--
 <?php
-$input = array("foo", "bar", "baz", "grldsajkopallkjasd");
+$input = array(b"foo", b"bar", b"baz", b"grldsajkopallkjasd");
 foreach($input AS $i) {
        printf("%u\n", crc32($i));
 }

diff --git a/ext/standard/tests/strings/crypt.phpt b/ext/standard/tests/strings/crypt.phpt
index 5368178e11b813914938d8df108642a2b690d6d0..6ec84bb4a1043fd1c1658dd91cf2b2d620e62211 100644 (file)
--- a/ext/standard/tests/strings/crypt.phpt
+++ b/ext/standard/tests/strings/crypt.phpt
@@ -9,15 +9,15 @@ if (!function_exists('crypt')) {
 --FILE--
 <?php
 
-$str = 'rasmuslerdorf';
-$salt1 = 'rl';
-$res_1 = 'rl.3StKT.4T8M';
-$salt2 = '_J9..rasm';
-$res_2 = '_J9..rasmBYk8r9AiWNc';
-$salt3 = '$1$rasmusle$';
-$res_3 = '$1$rasmusle$rISCgZzpwk3UhDidwXvin0';
-$salt4 = '$2a$07$rasmuslerd............';
-$res_4 = '$2a$07$rasmuslerd............nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra';
+$str = b'rasmuslerdorf';
+$salt1 = b'rl';
+$res_1 = b'rl.3StKT.4T8M';
+$salt2 = b'_J9..rasm';
+$res_2 = b'_J9..rasmBYk8r9AiWNc';
+$salt3 = b'$1$rasmusle$';
+$res_3 = b'$1$rasmusle$rISCgZzpwk3UhDidwXvin0';
+$salt4 = b'$2a$07$rasmuslerd............';
+$res_4 = b'$2a$07$rasmuslerd............nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra';
 
 echo (CRYPT_STD_DES)  ? ((crypt($str, $salt1) === $res_1) ? 'STD' : 'STD - ERROR') : 'STD', "\n";
 echo (CRYPT_EXT_DES)  ? ((crypt($str, $salt2) === $res_2) ? 'EXT' : 'EXT - ERROR') : 'EXT', "\n";

diff --git a/ext/standard/tests/strings/htmlentities.phpt b/ext/standard/tests/strings/htmlentities.phpt
index 4dc15f9e67ae20e274c7fc6e3fd8b6c151aa0efd..6c7ecaa82ccca08f5697a61e971e60ce24681a6c 100644 (file)
--- a/ext/standard/tests/strings/htmlentities.phpt
+++ b/ext/standard/tests/strings/htmlentities.phpt
@@ -19,3 +19,9 @@ echo html_entity_decode($ent_encoded);
 <>"&åÄ
 <>"&åÄ
 <>"&åÄ
+--UEXPECTF--
+Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
+&lt;&gt;&quot;&amp;åÄ
+&lt;&gt;&quot;&amp;&aring;&Auml;
+<>"&åÄ
+<>"&åÄ

diff --git a/ext/standard/tests/strings/strrev.phpt b/ext/standard/tests/strings/strrev.phpt
index 53a761b97632a3a7a796b307e0cfd34535708d81..d145c3e706ea3ddb0c2f106d452c82a6a69258f9 100644 (file)
--- a/ext/standard/tests/strings/strrev.phpt
+++ b/ext/standard/tests/strings/strrev.phpt
@@ -9,7 +9,7 @@ strrev() function
                $str .= chr($i++);
        }
        
-       var_dump(md5(strrev($str)));
+       var_dump(md5((binary)strrev($str)));
        var_dump(strrev(NULL));
        var_dump(strrev(""));
 ?>

diff --git a/ext/standard/tests/strings/strtotitle.phpt b/ext/standard/tests/strings/strtotitle.phpt
index 6f136b2604daad5c5e04df73fd3a41121465bd9d..e302c0329f5a1bd5db23a1c541e5a08f831ace52 100644 (file)
--- a/ext/standard/tests/strings/strtotitle.phpt
+++ b/ext/standard/tests/strings/strtotitle.phpt
@@ -29,7 +29,8 @@ foreach( $strings as $string )
 Året
 Året ßen
 Året ßen
---UEXPECT--
+--UEXPECTF--
+Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
 SSen
 Ssen
 Året

diff --git a/ext/standard/tests/strings/strtoupper.phpt b/ext/standard/tests/strings/strtoupper.phpt
index b338bd881a8d4fcc9c7fe240d822398d3646d958..59695bf5279d20abf44d97c2710389f53b823c3f 100644 (file)
--- a/ext/standard/tests/strings/strtoupper.phpt
+++ b/ext/standard/tests/strings/strtoupper.phpt
@@ -21,3 +21,6 @@ echo strtoupper($chars)."\n";
 ?>
 --EXPECT--
 ÄÖÜ
+--UEXPECTF--
+Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
+ÄÖÜ