summaryrefslogtreecommitdiff
path: root/ext/standard
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard')
-rw-r--r--ext/standard/tests/array/bug14580.phpt2
-rw-r--r--ext/standard/tests/array/bug44929.phpt2
-rw-r--r--ext/standard/tests/bug49244.phpt2
-rw-r--r--ext/standard/tests/file/005_variation-win32.phpt2
-rw-r--r--ext/standard/tests/file/007_variation15.phpt2
-rw-r--r--ext/standard/tests/file/007_variation23.phpt2
-rw-r--r--ext/standard/tests/file/007_variation7.phpt2
-rw-r--r--ext/standard/tests/file/bug27508.phpt6
-rw-r--r--ext/standard/tests/file/bug38450.phpt6
-rw-r--r--ext/standard/tests/file/bug38450_1.phpt6
-rw-r--r--ext/standard/tests/file/bug43008.phpt14
-rw-r--r--ext/standard/tests/file/copy_variation1.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation10.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation11.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation14.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation15.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation16-win32.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation17.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation2-win32-mb.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation2-win32.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation2.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation3-win32.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation3.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation4.phptbin4966 -> 4965 bytes
-rw-r--r--ext/standard/tests/file/copy_variation5-win32.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation5.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation7.phpt2
-rw-r--r--ext/standard/tests/file/copy_variation9.phpt2
-rw-r--r--ext/standard/tests/file/file_get_contents_variation5_32bit.phpt2
-rw-r--r--ext/standard/tests/file/file_get_contents_variation5_64bit.phpt2
-rw-r--r--ext/standard/tests/file/file_get_contents_variation9.phpt2
-rw-r--r--ext/standard/tests/file/fseek_variation3.phpt2
-rw-r--r--ext/standard/tests/file/include_streams.phpt2
-rw-r--r--ext/standard/tests/file/move_uploaded_file_basic.phpt2
-rw-r--r--ext/standard/tests/file/pathinfo_basic.phpt2
-rw-r--r--ext/standard/tests/file/proc_open01.phpt2
-rw-r--r--ext/standard/tests/file/realpath_basic-win32-mb.phpt2
-rw-r--r--ext/standard/tests/file/realpath_basic-win32.phpt2
-rw-r--r--ext/standard/tests/file/stream_get_line.phpt2
-rw-r--r--ext/standard/tests/file/userfilters.phpt2
-rw-r--r--ext/standard/tests/filters/filter_errors.inc4
-rw-r--r--ext/standard/tests/filters/filter_errors_user.phpt6
-rw-r--r--ext/standard/tests/filters/filter_errors_zlib_inflate.phpt2
-rw-r--r--ext/standard/tests/http/server.inc8
-rw-r--r--ext/standard/tests/mail/ezmlm_hash_basic.phpt4
-rw-r--r--ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt4
-rw-r--r--ext/standard/tests/network/bug20134.phpt2
-rw-r--r--ext/standard/tests/network/inet.phpt16
-rw-r--r--ext/standard/tests/serialize/bug43614.phpt2
-rw-r--r--ext/standard/tests/streams/bug44818.phpt2
-rw-r--r--ext/standard/tests/streams/bug46426.phpt2
-rw-r--r--ext/standard/tests/streams/bug48309.phpt2
-rw-r--r--ext/standard/tests/streams/stream_copy_to_stream_socket.phpt2
-rw-r--r--ext/standard/tests/streams/stream_get_contents_001.phpt2
-rw-r--r--ext/standard/tests/streams/stream_get_contents_002.phpt2
-rw-r--r--ext/standard/tests/streams/stream_get_line_nb.phpt18
-rw-r--r--ext/standard/tests/streams/stream_socket_pair.phpt4
-rw-r--r--ext/standard/tests/strings/bug44703.phpt22
-rw-r--r--ext/standard/tests/strings/bug51059.phpt4
-rw-r--r--ext/standard/tests/strings/convert_uuencode_basic.phpt20
-rw-r--r--ext/standard/tests/strings/crypt_blowfish_variation1.phpt18
-rw-r--r--ext/standard/tests/strings/crypt_blowfish_variation2.phpt2
-rw-r--r--ext/standard/tests/strings/crypt_sha256.phpt48
-rw-r--r--ext/standard/tests/strings/crypt_sha512.phpt48
-rw-r--r--ext/standard/tests/strings/htmlentities-utf-2.phpt8
-rw-r--r--ext/standard/tests/strings/htmlentities-utf.phpt8
-rw-r--r--ext/standard/tests/strings/htmlentities01.phpt4
-rw-r--r--ext/standard/tests/strings/htmlentities24.phpt2
-rw-r--r--ext/standard/tests/strings/htmlspecialchars.phpt2
-rw-r--r--ext/standard/tests/strings/htmlspecialchars_decode_variation6.phptbin1523 -> 1522 bytes
-rw-r--r--ext/standard/tests/strings/join_variation6.phptbin729 -> 728 bytes
-rw-r--r--ext/standard/tests/strings/md5_basic1.phpt2
-rw-r--r--ext/standard/tests/strings/md5_basic2.phpt2
-rw-r--r--ext/standard/tests/strings/quoted_printable_decode_error.phpt2
-rw-r--r--ext/standard/tests/strings/sha1_file.phpt2
-rw-r--r--ext/standard/tests/strings/strip_tags_variation6.phpt2
-rw-r--r--ext/standard/tests/strings/stristr_basic.phpt2
-rw-r--r--ext/standard/tests/url/bug47174.phpt4
78 files changed, 193 insertions, 193 deletions
diff --git a/ext/standard/tests/array/bug14580.phpt b/ext/standard/tests/array/bug14580.phpt
index bf0121ad69..8a80bddcb4 100644
--- a/ext/standard/tests/array/bug14580.phpt
+++ b/ext/standard/tests/array/bug14580.phpt
@@ -2,7 +2,7 @@
Bug #14580 (key() not binary safe)
--FILE--
<?php
- $arr = array (b"foo\0bar" => b"foo\0bar");
+ $arr = array ("foo\0bar" => "foo\0bar");
$key = key($arr);
echo strlen($key), ': ';
echo urlencode($key), "\n";
diff --git a/ext/standard/tests/array/bug44929.phpt b/ext/standard/tests/array/bug44929.phpt
index 9dc85acd1f..efcbcda1cc 100644
--- a/ext/standard/tests/array/bug44929.phpt
+++ b/ext/standard/tests/array/bug44929.phpt
@@ -2,7 +2,7 @@
Bug #44929 (natsort doesn't handle leading zeros well)
--FILE--
<?php
-$a = array(b'001',b'008',b'005',b'00011',b'03',b'000014',b'-123',b'0.002',b'00',b'0',b'0_0',b'0-0');
+$a = array('001','008','005','00011','03','000014','-123','0.002','00','0','0_0','0-0');
natsort($a);
var_dump($a);
?>
diff --git a/ext/standard/tests/bug49244.phpt b/ext/standard/tests/bug49244.phpt
index 1ba24fb9b4..60942966a7 100644
--- a/ext/standard/tests/bug49244.phpt
+++ b/ext/standard/tests/bug49244.phpt
@@ -5,7 +5,7 @@ Bug #49244 (Floating point NaN cause garbage characters)
for ($i = 0; $i < 10; $i++) {
printf("{%f} %1\$f\n", pow(-1.0, 0.3));
- printf(b"{%f} %1\$f\n", pow(-1.0, 0.3));
+ printf("{%f} %1\$f\n", pow(-1.0, 0.3));
}
?>
diff --git a/ext/standard/tests/file/005_variation-win32.phpt b/ext/standard/tests/file/005_variation-win32.phpt
index 34558758e3..ffcdc33cd6 100644
--- a/ext/standard/tests/file/005_variation-win32.phpt
+++ b/ext/standard/tests/file/005_variation-win32.phpt
@@ -81,7 +81,7 @@ sleep(2);
/* filemtime + 2 & filectime + 2 */
echo "\n-- Checking different times, after writing into the file --\n";
$file_write_handle = fopen($file_name, "w");
-fwrite($file_write_handle, b"Hello, world");
+fwrite($file_write_handle, "Hello, world");
fclose($file_write_handle);
stat_fn($file_name);
sleep(2);
diff --git a/ext/standard/tests/file/007_variation15.phpt b/ext/standard/tests/file/007_variation15.phpt
index 1a2d530b65..6174933df5 100644
--- a/ext/standard/tests/file/007_variation15.phpt
+++ b/ext/standard/tests/file/007_variation15.phpt
@@ -21,7 +21,7 @@ Test fopen and fclose() functions - usage variations - "xt" mode
and fclose function
*/
$file_path = dirname(__FILE__);
-$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
+$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
$file = $file_path."/007_variation15.tmp";
echo "*** Test fopen() & fclose() functions: with 'xt' mode ***\n";
diff --git a/ext/standard/tests/file/007_variation23.phpt b/ext/standard/tests/file/007_variation23.phpt
index 1826296a06..8820dbc7d5 100644
--- a/ext/standard/tests/file/007_variation23.phpt
+++ b/ext/standard/tests/file/007_variation23.phpt
@@ -21,7 +21,7 @@ Test fopen and fclose() functions - usage variations - "xb" mode
and fclose function
*/
$file_path = dirname(__FILE__);
-$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
+$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
$file = $file_path."/007_variation23.tmp";
echo "*** Test fopen() & fclose() functions: with 'xb' mode ***\n";
diff --git a/ext/standard/tests/file/007_variation7.phpt b/ext/standard/tests/file/007_variation7.phpt
index 06bf9117f3..541e5a0d1d 100644
--- a/ext/standard/tests/file/007_variation7.phpt
+++ b/ext/standard/tests/file/007_variation7.phpt
@@ -21,7 +21,7 @@ Test fopen and fclose() functions - usage variations - "x" mode
and fclose function
*/
$file_path = dirname(__FILE__);
-$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
+$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789";
$file = $file_path."/007_variation7.tmp";
echo "*** Test fopen() & fclose() functions: with 'x' mode ***\n";
diff --git a/ext/standard/tests/file/bug27508.phpt b/ext/standard/tests/file/bug27508.phpt
index 188080aa25..361095da5f 100644
--- a/ext/standard/tests/file/bug27508.phpt
+++ b/ext/standard/tests/file/bug27508.phpt
@@ -56,9 +56,9 @@ if (!$fp) {
die("fopen failed");
}
-fwrite($fp, b"line1\n");
-fwrite($fp, b"line2\n");
-fwrite($fp, b"line3\n");
+fwrite($fp, "line1\n");
+fwrite($fp, "line2\n");
+fwrite($fp, "line3\n");
debug_zval_dump(feof($fp));
rewind($fp);
diff --git a/ext/standard/tests/file/bug38450.phpt b/ext/standard/tests/file/bug38450.phpt
index 4a2953ea79..2b59f50750 100644
--- a/ext/standard/tests/file/bug38450.phpt
+++ b/ext/standard/tests/file/bug38450.phpt
@@ -88,9 +88,9 @@ $myvar = "";
$fp = fopen("var://myvar", "r+");
-fwrite($fp, b"line1\n");
-fwrite($fp, b"line2\n");
-fwrite($fp, b"line3\n");
+fwrite($fp, "line1\n");
+fwrite($fp, "line2\n");
+fwrite($fp, "line3\n");
rewind($fp);
while (!feof($fp)) {
diff --git a/ext/standard/tests/file/bug38450_1.phpt b/ext/standard/tests/file/bug38450_1.phpt
index d0682186f9..07ca7166f3 100644
--- a/ext/standard/tests/file/bug38450_1.phpt
+++ b/ext/standard/tests/file/bug38450_1.phpt
@@ -88,9 +88,9 @@ $myvar = "";
$fp = fopen("var://myvar", "r+");
-fwrite($fp, b"line1\n");
-fwrite($fp, b"line2\n");
-fwrite($fp, b"line3\n");
+fwrite($fp, "line1\n");
+fwrite($fp, "line2\n");
+fwrite($fp, "line3\n");
rewind($fp);
while (!feof($fp)) {
diff --git a/ext/standard/tests/file/bug43008.phpt b/ext/standard/tests/file/bug43008.phpt
index 3c9411d329..0d9d6ed986 100644
--- a/ext/standard/tests/file/bug43008.phpt
+++ b/ext/standard/tests/file/bug43008.phpt
@@ -8,13 +8,13 @@ if (!extension_loaded("iconv")) die("skip iconv extension not available");
allow_url_fopen=1
--FILE--
<?php
-$url = b""
- . b"php://filter/read="
- . urlencode(b"convert.iconv.ISO-8859-15/UTF-8")
- . b'|' . urlencode(b"string.rot13")
- . b'|' . urlencode(b"string.rot13")
- . b'|' . urlencode(b"convert.iconv.UTF-8/ISO-8859-15")
- . b"/resource=data://text/plain,foob%E2r";
+$url = ""
+ . "php://filter/read="
+ . urlencode("convert.iconv.ISO-8859-15/UTF-8")
+ . '|' . urlencode("string.rot13")
+ . '|' . urlencode("string.rot13")
+ . '|' . urlencode("convert.iconv.UTF-8/ISO-8859-15")
+ . "/resource=data://text/plain,foob%E2r";
var_dump(urlencode(file_get_contents($url)));
?>
--EXPECTF--
diff --git a/ext/standard/tests/file/copy_variation1.phpt b/ext/standard/tests/file/copy_variation1.phpt
index 4d0a97302a..7cf20fd749 100644
--- a/ext/standard/tests/file/copy_variation1.phpt
+++ b/ext/standard/tests/file/copy_variation1.phpt
@@ -15,7 +15,7 @@ echo "*** Test copy() function: destination file names containing numerics/strin
$file_path = dirname(__FILE__);
$src_file_name = $file_path."/copy_variation1.tmp";
$file_handle = fopen($src_file_name, "w");
-fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) );
+fwrite( $file_handle, str_repeat("Hello2World...\n", 100) );
fclose($file_handle);
/* array of destination file names */
diff --git a/ext/standard/tests/file/copy_variation10.phpt b/ext/standard/tests/file/copy_variation10.phpt
index 98494af043..c5cbc84254 100644
--- a/ext/standard/tests/file/copy_variation10.phpt
+++ b/ext/standard/tests/file/copy_variation10.phpt
@@ -14,7 +14,7 @@ $file_path = dirname(__FILE__);
echo "*** Test copy(): Trying to create a copy of file with the same source name ***\n";
$file = $file_path."/copy_variation10.tmp";
$file_handle = fopen($file, "w");
-fwrite($file_handle, str_repeat(b"Hello2world...\n", 100));
+fwrite($file_handle, str_repeat("Hello2world...\n", 100));
fclose($file_handle);
var_dump( copy($file, $file) );
diff --git a/ext/standard/tests/file/copy_variation11.phpt b/ext/standard/tests/file/copy_variation11.phpt
index adee8e1c65..b01dab0890 100644
--- a/ext/standard/tests/file/copy_variation11.phpt
+++ b/ext/standard/tests/file/copy_variation11.phpt
@@ -14,7 +14,7 @@ $file_path = dirname(__FILE__);
echo "*** Test copy() function: Trying to create a copy of source file as a dir ***\n";
$file = $file_path."/copy_variation11.tmp";
$file_handle = fopen($file, "w");
-fwrite($file_handle, str_repeat(b"Hello, world...", 20));
+fwrite($file_handle, str_repeat("Hello, world...", 20));
fclose($file_handle);
$dir = $file_path."/copy_variation11";
diff --git a/ext/standard/tests/file/copy_variation14.phpt b/ext/standard/tests/file/copy_variation14.phpt
index 1a39c1c6a9..6eb8fe3ee4 100644
--- a/ext/standard/tests/file/copy_variation14.phpt
+++ b/ext/standard/tests/file/copy_variation14.phpt
@@ -15,7 +15,7 @@ $file_path = dirname(__FILE__);
echo "*** Test copy() function: Trying to create a copy of non-existing source in existing destination ***";
$file = $file_path."/copy_variation14.tmp";
$file_handle = fopen($file, "w");
-fwrite($file_handle, str_repeat(b"Hello2world...\n", 100));
+fwrite($file_handle, str_repeat("Hello2world...\n", 100));
fclose($file_handle);
var_dump( copy($file_path."/nosuchfile.tmp", $file_path."/copy_nosuchfile.tmp") ); //With non-existing source
diff --git a/ext/standard/tests/file/copy_variation15.phpt b/ext/standard/tests/file/copy_variation15.phpt
index fbf5e7bf9e..fdc84e989a 100644
--- a/ext/standard/tests/file/copy_variation15.phpt
+++ b/ext/standard/tests/file/copy_variation15.phpt
@@ -28,7 +28,7 @@ $file_path = dirname(__FILE__);
echo "*** Test copy() function: Trying to create a copy of file in a dir which doesn't have write permissions ***";
$file = $file_path."/copy_variation15.tmp";
$file_handle = fopen($file, "w");
-fwrite($file_handle, str_repeat(b"Hello, world...", 20));
+fwrite($file_handle, str_repeat("Hello, world...", 20));
fclose($file_handle);
$dir = $file_path."/copy_variation15";
diff --git a/ext/standard/tests/file/copy_variation16-win32.phpt b/ext/standard/tests/file/copy_variation16-win32.phpt
index d95d24adac..eff56a1ec7 100644
--- a/ext/standard/tests/file/copy_variation16-win32.phpt
+++ b/ext/standard/tests/file/copy_variation16-win32.phpt
@@ -27,7 +27,7 @@ mkdir($dirname_with_blank);
$src_file_name = dirname(__FILE__)."/copy_variation16.tmp";
$file_handle = fopen($src_file_name, "w");
-fwrite($file_handle, str_repeat(b"Hello world, this is 2007 year ...\n", 100));
+fwrite($file_handle, str_repeat("Hello world, this is 2007 year ...\n", 100));
fclose($file_handle);
echo "- Size of source file => ";
diff --git a/ext/standard/tests/file/copy_variation17.phpt b/ext/standard/tests/file/copy_variation17.phpt
index 97f1665f01..2dfe94c6e9 100644
--- a/ext/standard/tests/file/copy_variation17.phpt
+++ b/ext/standard/tests/file/copy_variation17.phpt
@@ -14,7 +14,7 @@ $file_path = dirname(__FILE__);
echo "*** Test copy() function: With source file names containing wild-card chars ***\n";
$src_file = $file_path."/copy_variation17.tmp";
$file_handle = fopen($src_file, "w");
-fwrite($file_handle, str_repeat(b"Hello2world...\n", 100));
+fwrite($file_handle, str_repeat("Hello2world...\n", 100));
fclose($file_handle);
$dir = $file_path."/copy_variation17";
diff --git a/ext/standard/tests/file/copy_variation2-win32-mb.phpt b/ext/standard/tests/file/copy_variation2-win32-mb.phpt
index e818e294d8..95688c97c5 100644
--- a/ext/standard/tests/file/copy_variation2-win32-mb.phpt
+++ b/ext/standard/tests/file/copy_variation2-win32-mb.phpt
@@ -20,7 +20,7 @@ echo "*** Test copy() function: destination file names containing special charac
$file_path = dirname(__FILE__);
$src_file_name = $file_path."/copy_variation2私はガラスを食べられます.tmp";
$file_handle = fopen($src_file_name, "w");
-fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) );
+fwrite( $file_handle, str_repeat("Hello2World...\n", 100) );
fclose($file_handle);
/* array of destination file names */
diff --git a/ext/standard/tests/file/copy_variation2-win32.phpt b/ext/standard/tests/file/copy_variation2-win32.phpt
index 4819d63e36..82235ba814 100644
--- a/ext/standard/tests/file/copy_variation2-win32.phpt
+++ b/ext/standard/tests/file/copy_variation2-win32.phpt
@@ -20,7 +20,7 @@ echo "*** Test copy() function: destination file names containing special charac
$file_path = dirname(__FILE__);
$src_file_name = $file_path."/copy_variation2.tmp";
$file_handle = fopen($src_file_name, "w");
-fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) );
+fwrite( $file_handle, str_repeat("Hello2World...\n", 100) );
fclose($file_handle);
/* array of destination file names */
diff --git a/ext/standard/tests/file/copy_variation2.phpt b/ext/standard/tests/file/copy_variation2.phpt
index d99f5a8da3..a9b36803d9 100644
--- a/ext/standard/tests/file/copy_variation2.phpt
+++ b/ext/standard/tests/file/copy_variation2.phpt
@@ -20,7 +20,7 @@ echo "*** Test copy() function: destination file names containing special charac
$file_path = dirname(__FILE__);
$src_file_name = $file_path."/copy_variation2.tmp";
$file_handle = fopen($src_file_name, "w");
-fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) );
+fwrite( $file_handle, str_repeat("Hello2World...\n", 100) );
fclose($file_handle);
/* array of destination file names */
diff --git a/ext/standard/tests/file/copy_variation3-win32.phpt b/ext/standard/tests/file/copy_variation3-win32.phpt
index 68ce4a1680..5055c297f6 100644
--- a/ext/standard/tests/file/copy_variation3-win32.phpt
+++ b/ext/standard/tests/file/copy_variation3-win32.phpt
@@ -20,7 +20,7 @@ echo "*** Test copy() function: destination file names containing whitespaces **
$file_path = dirname(__FILE__);
$src_file_name = $file_path."/copy_variation3.tmp";
$file_handle = fopen($src_file_name, "w");
-fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) );
+fwrite( $file_handle, str_repeat("Hello2World...\n", 100) );
fclose($file_handle);
/* array of destination file names */
diff --git a/ext/standard/tests/file/copy_variation3.phpt b/ext/standard/tests/file/copy_variation3.phpt
index 1c45c8c129..56f797bc95 100644
--- a/ext/standard/tests/file/copy_variation3.phpt
+++ b/ext/standard/tests/file/copy_variation3.phpt
@@ -20,7 +20,7 @@ echo "*** Test copy() function: destination file names containing whitespaces **
$file_path = dirname(__FILE__);
$src_file_name = $file_path."/copy_variation3.tmp";
$file_handle = fopen($src_file_name, "w");
-fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) );
+fwrite( $file_handle, str_repeat("Hello2World...\n", 100) );
fclose($file_handle);
/* array of destination file names */
diff --git a/ext/standard/tests/file/copy_variation4.phpt b/ext/standard/tests/file/copy_variation4.phpt
index 3c8224da0a..47152d4239 100644
--- a/ext/standard/tests/file/copy_variation4.phpt
+++ b/ext/standard/tests/file/copy_variation4.phpt
Binary files differ
diff --git a/ext/standard/tests/file/copy_variation5-win32.phpt b/ext/standard/tests/file/copy_variation5-win32.phpt
index baf7be470c..48e85eaf02 100644
--- a/ext/standard/tests/file/copy_variation5-win32.phpt
+++ b/ext/standard/tests/file/copy_variation5-win32.phpt
@@ -20,7 +20,7 @@ echo "*** Test copy() function: checking case sensitivity in creation of destina
$file_path = dirname(__FILE__);
$src_file_name = $file_path."/copy_variation5.tmp";
$file_handle = fopen($src_file_name, "w");
-fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) );
+fwrite( $file_handle, str_repeat("Hello2World...\n", 100) );
fclose($file_handle);
/* array of destination file names */
diff --git a/ext/standard/tests/file/copy_variation5.phpt b/ext/standard/tests/file/copy_variation5.phpt
index 8abc9c961a..c480fcc3bf 100644
--- a/ext/standard/tests/file/copy_variation5.phpt
+++ b/ext/standard/tests/file/copy_variation5.phpt
@@ -20,7 +20,7 @@ echo "*** Test copy() function: checking case sensitivity in creation of destina
$file_path = dirname(__FILE__);
$src_file_name = $file_path."/copy_variation5.tmp";
$file_handle = fopen($src_file_name, "w");
-fwrite( $file_handle, str_repeat(b"Hello2World...\n", 100) );
+fwrite( $file_handle, str_repeat("Hello2World...\n", 100) );
fclose($file_handle);
/* array of destination file names */
diff --git a/ext/standard/tests/file/copy_variation7.phpt b/ext/standard/tests/file/copy_variation7.phpt
index d687b073c7..474d33bc49 100644
--- a/ext/standard/tests/file/copy_variation7.phpt
+++ b/ext/standard/tests/file/copy_variation7.phpt
@@ -20,7 +20,7 @@ $file_path = dirname(__FILE__);
echo "*** Testing copy() with symlink and hardlink ***\n";
$file = $file_path."/copy_variation7.tmp";
$file_handle = fopen($file, "w");
-fwrite( $file_handle, str_repeat(b"Hello World, this is 2007 year ....\n", 100) );
+fwrite( $file_handle, str_repeat("Hello World, this is 2007 year ....\n", 100) );
fclose($file_handle);
$symlink = $file_path."/copy_variation7_symlink.tmp";
diff --git a/ext/standard/tests/file/copy_variation9.phpt b/ext/standard/tests/file/copy_variation9.phpt
index 824bed0c76..34d5b907d9 100644
--- a/ext/standard/tests/file/copy_variation9.phpt
+++ b/ext/standard/tests/file/copy_variation9.phpt
@@ -29,7 +29,7 @@ $file_path = dirname(__FILE__);
echo "*** Test copy() function: destination with/without write permissions ***\n";
$src_file_name = $file_path."/copy_variation9.tmp";
$file_handle = fopen($src_file_name, "w");
-fwrite($file_handle, str_repeat(b"Hello2world...\n", 100));
+fwrite($file_handle, str_repeat("Hello2world...\n", 100));
fclose($file_handle);
$dest_file_name = $file_path."/copy_copy_variation9.tmp";
diff --git a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt
index 3afc3dc180..9e8bbe6d1f 100644
--- a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt
@@ -27,7 +27,7 @@ set_error_handler('test_error_handler');
$filename = 'FileGetContentsVar5.tmp';
$absFile = dirname(__FILE__).'/'.$filename;
$h = fopen($absFile,"w");
-fwrite($h, b"contents read");
+fwrite($h, "contents read");
fclose($h);
diff --git a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
index df33059f30..170ba4343e 100644
--- a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
@@ -27,7 +27,7 @@ set_error_handler('test_error_handler');
$filename = 'FileGetContentsVar5.tmp';
$absFile = dirname(__FILE__).'/'.$filename;
$h = fopen($absFile,"w");
-fwrite($h, b"contents read");
+fwrite($h, "contents read");
fclose($h);
diff --git a/ext/standard/tests/file/file_get_contents_variation9.phpt b/ext/standard/tests/file/file_get_contents_variation9.phpt
index 99812b5349..7e500e8c56 100644
--- a/ext/standard/tests/file/file_get_contents_variation9.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation9.phpt
@@ -25,7 +25,7 @@ $chainlink = dirname(__FILE__).'/fileGetContentsVar9.ChainLink';
$h = fopen($filename,"w");
//Data should be more than the size of a link.
for ($i = 1; $i <= 10; $i++) {
- fwrite($h, b"Here is a repeated amount of data");
+ fwrite($h, "Here is a repeated amount of data");
}
fclose($h);
diff --git a/ext/standard/tests/file/fseek_variation3.phpt b/ext/standard/tests/file/fseek_variation3.phpt
index c29ed31759..edb0b3a3b0 100644
--- a/ext/standard/tests/file/fseek_variation3.phpt
+++ b/ext/standard/tests/file/fseek_variation3.phpt
@@ -29,7 +29,7 @@ echo "after seek back 20: ".bin2hex(fread($h,1))."\n";
echo "--- fseek beyond end of file ---\n";
var_dump(fseek($h, 16, SEEK_SET));
-fwrite($h, b"end");
+fwrite($h, "end");
fseek($h ,0, SEEK_SET);
$data = fread($h, 4096);
echo bin2hex($data)."\n";
diff --git a/ext/standard/tests/file/include_streams.phpt b/ext/standard/tests/file/include_streams.phpt
index e459c6a1aa..05b16238cd 100644
--- a/ext/standard/tests/file/include_streams.phpt
+++ b/ext/standard/tests/file/include_streams.phpt
@@ -32,7 +32,7 @@ class mystream
$this->options = $options;
$split = parse_url($path);
- if ($split["host"] !== b"GLOBALS" ||
+ if ($split["host"] !== "GLOBALS" ||
empty($split["path"]) ||
empty($GLOBALS[substr($split["path"],1)])) {
return false;
diff --git a/ext/standard/tests/file/move_uploaded_file_basic.phpt b/ext/standard/tests/file/move_uploaded_file_basic.phpt
index 00bbcf6e18..7349a694de 100644
--- a/ext/standard/tests/file/move_uploaded_file_basic.phpt
+++ b/ext/standard/tests/file/move_uploaded_file_basic.phpt
@@ -28,7 +28,7 @@ $destination1 = __FILE__ . ".tmp";
var_dump(move_uploaded_file($_FILES['file1']['tmp_name'], $destination1));
$file_contents = file_get_contents($destination1);
-$contents_matches = ($file_contents == b"abcdef123456789xxxDDDxxxDDDxxxDDD");
+$contents_matches = ($file_contents == "abcdef123456789xxxDDDxxxDDDxxxDDD");
var_dump($contents_matches);
unlink($destination1);
echo "\n";
diff --git a/ext/standard/tests/file/pathinfo_basic.phpt b/ext/standard/tests/file/pathinfo_basic.phpt
index 53eda5a64e..bc4196925d 100644
--- a/ext/standard/tests/file/pathinfo_basic.phpt
+++ b/ext/standard/tests/file/pathinfo_basic.phpt
@@ -32,7 +32,7 @@ $paths = array (
"$file_path/foo".chr(47)."symlink.link",
"$file_path".chr(47)."foo/symlink.link",
"$file_path".chr(47)."foo".chr(47)."symlink.link",
- b"$file_path/foo/symlink.link",
+ "$file_path/foo/symlink.link",
/* Testing directories */
".", // current directory
diff --git a/ext/standard/tests/file/proc_open01.phpt b/ext/standard/tests/file/proc_open01.phpt
index 3348403e2b..04882853ec 100644
--- a/ext/standard/tests/file/proc_open01.phpt
+++ b/ext/standard/tests/file/proc_open01.phpt
@@ -18,7 +18,7 @@ if ($proc === false) {
}
var_dump($pipes);
stream_set_blocking($pipes[1], FALSE);
-$test_string = b"yay!\n";
+$test_string = "yay!\n";
fwrite($pipes[0], $test_string);
fflush($pipes[0]);
fclose($pipes[0]);
diff --git a/ext/standard/tests/file/realpath_basic-win32-mb.phpt b/ext/standard/tests/file/realpath_basic-win32-mb.phpt
index c0f39b6054..dbfdfc41d6 100644
--- a/ext/standard/tests/file/realpath_basic-win32-mb.phpt
+++ b/ext/standard/tests/file/realpath_basic-win32-mb.phpt
@@ -34,7 +34,7 @@ $filenames = array (
"$file_path/realpath_私はガラスを食べられますbasic/home//../././realpath_私はガラスを食べられますbasic.tmp//",
// checking for binary safe
- b"$file_path/realpath_私はガラスを食べられますbasic/home/realpath_私はガラスを食べられますbasic.tmp",
+ "$file_path/realpath_私はガラスを食べられますbasic/home/realpath_私はガラスを食べられますbasic.tmp",
/* filenames with invalid path */
"$file_path///realpath_私はガラスを食べられますbasic/home//..//././test//realpath_私はガラスを食べられますbasic.tmp",
diff --git a/ext/standard/tests/file/realpath_basic-win32.phpt b/ext/standard/tests/file/realpath_basic-win32.phpt
index 5ebfcff683..a768ca9540 100644
--- a/ext/standard/tests/file/realpath_basic-win32.phpt
+++ b/ext/standard/tests/file/realpath_basic-win32.phpt
@@ -34,7 +34,7 @@ $filenames = array (
"$file_path/realpath_basic/home//../././realpath_basic.tmp//",
// checking for binary safe
- b"$file_path/realpath_basic/home/realpath_basic.tmp",
+ "$file_path/realpath_basic/home/realpath_basic.tmp",
/* filenames with invalid path */
"$file_path///realpath_basic/home//..//././test//realpath_basic.tmp",
diff --git a/ext/standard/tests/file/stream_get_line.phpt b/ext/standard/tests/file/stream_get_line.phpt
index 89798ef95e..2c11f00eed 100644
--- a/ext/standard/tests/file/stream_get_line.phpt
+++ b/ext/standard/tests/file/stream_get_line.phpt
@@ -4,7 +4,7 @@ Crash inside stream_get_line(), when length=0
<?php
$path = dirname(__FILE__) . '/test.html';
-file_put_contents($path, b"foo<br>bar<br>foo");
+file_put_contents($path, "foo<br>bar<br>foo");
$fp = fopen($path, "r");
while ($fp && !feof($fp)) {
echo stream_get_line($fp, 0, "<br>")."\n";
diff --git a/ext/standard/tests/file/userfilters.phpt b/ext/standard/tests/file/userfilters.phpt
index 2246b5d8a4..dfa8376fff 100644
--- a/ext/standard/tests/file/userfilters.phpt
+++ b/ext/standard/tests/file/userfilters.phpt
@@ -20,7 +20,7 @@ class testfilter extends php_user_filter {
stream_filter_register('testfilter','testfilter');
-$text = b"Hello There!";
+$text = "Hello There!";
$fp = tmpfile();
fwrite($fp, $text);
diff --git a/ext/standard/tests/filters/filter_errors.inc b/ext/standard/tests/filters/filter_errors.inc
index 7345df383c..6d1a270c82 100644
--- a/ext/standard/tests/filters/filter_errors.inc
+++ b/ext/standard/tests/filters/filter_errors.inc
@@ -17,7 +17,7 @@ function filter_errors_test($filter, $data) {
$stream = fopen('php://memory', 'wb+');
- fwrite($stream, b".\r\n$data");
+ fwrite($stream, ".\r\n$data");
fseek($stream, 0, SEEK_SET);
stream_get_line($stream, 8192, "\r\n");
@@ -27,7 +27,7 @@ function filter_errors_test($filter, $data) {
$stream = fopen('php://memory', 'wb+');
- fwrite($stream, b"$data");
+ fwrite($stream, "$data");
fseek($stream, 0, SEEK_SET);
stream_filter_append($stream, $filter);
diff --git a/ext/standard/tests/filters/filter_errors_user.phpt b/ext/standard/tests/filters/filter_errors_user.phpt
index 7bdf8de08a..9b911cf81f 100644
--- a/ext/standard/tests/filters/filter_errors_user.phpt
+++ b/ext/standard/tests/filters/filter_errors_user.phpt
@@ -52,7 +52,7 @@ echo "test append / read / remove\n";
for($i = 0; $i < 5; ++$i) {
echo "test_filter$i\n";
$stream = fopen('php://memory', 'wb+');
- fwrite($stream, b"42");
+ fwrite($stream, "42");
fseek($stream, 0, SEEK_SET);
$f = stream_filter_append($stream, "test_filter$i");
stream_get_contents($stream);
@@ -61,7 +61,7 @@ for($i = 0; $i < 5; ++$i) {
echo "test append all / read / remove all\n";
$stream = fopen('php://memory', 'wb+');
-fwrite($stream, b"42");
+fwrite($stream, "42");
fseek($stream, 0, SEEK_SET);
$filters = array();
for($i = 0; $i < 5; ++$i) {
@@ -75,7 +75,7 @@ foreach($filters as $filter) {
echo "test append all / read / close\n";
$stream = fopen('php://memory', 'wb+');
-fwrite($stream, b"42");
+fwrite($stream, "42");
fseek($stream, 0, SEEK_SET);
$filters = array();
for($i = 0; $i < 5; ++$i) {
diff --git a/ext/standard/tests/filters/filter_errors_zlib_inflate.phpt b/ext/standard/tests/filters/filter_errors_zlib_inflate.phpt
index ebb3b21df2..be7bdba3fb 100644
--- a/ext/standard/tests/filters/filter_errors_zlib_inflate.phpt
+++ b/ext/standard/tests/filters/filter_errors_zlib_inflate.phpt
@@ -5,7 +5,7 @@ Filter errors: zlib.inflate
--FILE--
<?php
require 'filter_errors.inc';
-filter_errors_test('zlib.inflate', gzencode(b'42'));
+filter_errors_test('zlib.inflate', gzencode('42'));
?>
--EXPECTF--
test filtering of buffered data
diff --git a/ext/standard/tests/http/server.inc b/ext/standard/tests/http/server.inc
index b9ade0e9f0..db66c3dd13 100644
--- a/ext/standard/tests/http/server.inc
+++ b/ext/standard/tests/http/server.inc
@@ -54,13 +54,13 @@ function http_server($socket_string, array $files, &$output = null) {
if (!stream_select($r, $w, $e, 1)) continue;
$line = stream_get_line($sock, 8192, "\r\n");
- if ($line === b'') {
- fwrite($output, b"\r\n");
+ if ($line === '') {
+ fwrite($output, "\r\n");
break;
} else if ($line !== false) {
- fwrite($output, b"$line\r\n");
+ fwrite($output, "$line\r\n");
- if (preg_match(b'#^Content-Length\s*:\s*([[:digit:]]+)\s*$#i', $line, $matches)) {
+ if (preg_match('#^Content-Length\s*:\s*([[:digit:]]+)\s*$#i', $line, $matches)) {
$content_length = (int) $matches[1];
}
}
diff --git a/ext/standard/tests/mail/ezmlm_hash_basic.phpt b/ext/standard/tests/mail/ezmlm_hash_basic.phpt
index ce70eace23..2f810e2562 100644
--- a/ext/standard/tests/mail/ezmlm_hash_basic.phpt
+++ b/ext/standard/tests/mail/ezmlm_hash_basic.phpt
@@ -13,8 +13,8 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
echo "*** Testing ezmlm_hash() : basic functionality ***\n";
-var_dump(ezmlm_hash(b"webmaster@somewhere.com"));
-var_dump(ezmlm_hash(b"foo@somewhere.com"));
+var_dump(ezmlm_hash("webmaster@somewhere.com"));
+var_dump(ezmlm_hash("foo@somewhere.com"));
?>
===Done===
diff --git a/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt b/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt
index 03ac67b9b4..46abdba7c8 100644
--- a/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt
+++ b/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt
@@ -13,8 +13,8 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
echo "*** Testing ezmlm_hash() : basic functionality ***\n";
-var_dump(ezmlm_hash(b"webmaster@somewhere.com"));
-var_dump(ezmlm_hash(b"foo@somewhere.com"));
+var_dump(ezmlm_hash("webmaster@somewhere.com"));
+var_dump(ezmlm_hash("foo@somewhere.com"));
?>
===Done===
diff --git a/ext/standard/tests/network/bug20134.phpt b/ext/standard/tests/network/bug20134.phpt
index 400e3fb15c..e311f892f7 100644
--- a/ext/standard/tests/network/bug20134.phpt
+++ b/ext/standard/tests/network/bug20134.phpt
@@ -11,7 +11,7 @@ if (!$fp) {
}
else {
/* Likewise, writes will always appear to succeed */
- $x = fwrite($fp,b"\n");
+ $x = fwrite($fp,"\n");
var_dump($x);
/* But reads should always fail */
$content = fread($fp, 40);
diff --git a/ext/standard/tests/network/inet.phpt b/ext/standard/tests/network/inet.phpt
index 851e1ba6c5..d2dcbb48c1 100644
--- a/ext/standard/tests/network/inet.phpt
+++ b/ext/standard/tests/network/inet.phpt
@@ -16,19 +16,19 @@ var_dump(inet_ntop((binary)$packed));
var_dump(inet_ntop());
var_dump(inet_ntop(-1));
-var_dump(inet_ntop(b""));
-var_dump(inet_ntop(b"blah-blah"));
+var_dump(inet_ntop(""));
+var_dump(inet_ntop("blah-blah"));
var_dump(inet_pton());
-var_dump(inet_pton(b""));
+var_dump(inet_pton(""));
var_dump(inet_pton(-1));
-var_dump(inet_pton(b"abra"));
+var_dump(inet_pton("abra"));
$array = array(
- b"127.0.0.1",
- b"66.163.161.116",
- b"255.255.255.255",
- b"0.0.0.0",
+ "127.0.0.1",
+ "66.163.161.116",
+ "255.255.255.255",
+ "0.0.0.0",
);
foreach ($array as $val) {
var_dump(bin2hex($packed = inet_pton($val)));
diff --git a/ext/standard/tests/serialize/bug43614.phpt b/ext/standard/tests/serialize/bug43614.phpt
index 68568a1224..127dfba586 100644
--- a/ext/standard/tests/serialize/bug43614.phpt
+++ b/ext/standard/tests/serialize/bug43614.phpt
@@ -7,7 +7,7 @@ error_reporting(E_ALL);
var_dump($a = unserialize('a:2:{s:2:"10";i:1;s:2:"01";i:2;}'));
var_dump($a['10']);
-var_dump($a[b'01']);
+var_dump($a['01']);
?>
--EXPECT--
diff --git a/ext/standard/tests/streams/bug44818.phpt b/ext/standard/tests/streams/bug44818.phpt
index 628f64e341..7bd9fe5168 100644
--- a/ext/standard/tests/streams/bug44818.phpt
+++ b/ext/standard/tests/streams/bug44818.phpt
@@ -5,7 +5,7 @@ Bug #44818 (php://memory writeable when opened read only)
function test($url, $mode) {
echo "$url, $mode\n";
$fd = fopen($url, $mode);
- var_dump($fd, fwrite($fd, b"foo"));
+ var_dump($fd, fwrite($fd, "foo"));
var_dump(fseek($fd, 0, SEEK_SET), fread($fd, 3));
fclose($fd);
}
diff --git a/ext/standard/tests/streams/bug46426.phpt b/ext/standard/tests/streams/bug46426.phpt
index 80dbcded80..8c95ea456e 100644
--- a/ext/standard/tests/streams/bug46426.phpt
+++ b/ext/standard/tests/streams/bug46426.phpt
@@ -5,7 +5,7 @@ Bug #46426 (3rd parameter offset of stream_get_contents not works for "0")
$tmp = tmpfile();
-fwrite($tmp, b"12345");
+fwrite($tmp, "12345");
echo stream_get_contents($tmp, 2, 1);
echo "\n";
diff --git a/ext/standard/tests/streams/bug48309.phpt b/ext/standard/tests/streams/bug48309.phpt
index d347cc39c8..bb2d9d28f7 100644
--- a/ext/standard/tests/streams/bug48309.phpt
+++ b/ext/standard/tests/streams/bug48309.phpt
@@ -4,7 +4,7 @@ Bug #48309 (stream_copy_to_stream() and fpasstru() do not update stream position
<?php
$tmp = tmpfile();
-fwrite($tmp, b'test');
+fwrite($tmp, 'test');
fseek($tmp, 0, SEEK_SET);
echo "-- stream_copy_to_stream() --\n";
diff --git a/ext/standard/tests/streams/stream_copy_to_stream_socket.phpt b/ext/standard/tests/streams/stream_copy_to_stream_socket.phpt
index 7e304b1188..dafe90e40c 100644
--- a/ext/standard/tests/streams/stream_copy_to_stream_socket.phpt
+++ b/ext/standard/tests/streams/stream_copy_to_stream_socket.phpt
@@ -11,7 +11,7 @@ if (!$sockets) die("skip stream_socket_pair");
$sockets = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
$tmp = tmpfile();
-fwrite($sockets[0], b"a");
+fwrite($sockets[0], "a");
stream_socket_shutdown($sockets[0], STREAM_SHUT_WR);
stream_copy_to_stream($sockets[1], $tmp);
diff --git a/ext/standard/tests/streams/stream_get_contents_001.phpt b/ext/standard/tests/streams/stream_get_contents_001.phpt
index e8e1c3d26b..dc7fcb239c 100644
--- a/ext/standard/tests/streams/stream_get_contents_001.phpt
+++ b/ext/standard/tests/streams/stream_get_contents_001.phpt
@@ -5,7 +5,7 @@ stream_get_contents() - Testing offset out of range
$tmp = tmpfile();
-fwrite($tmp, b"12345");
+fwrite($tmp, "12345");
echo stream_get_contents($tmp, 2, 5), "--\n";
echo stream_get_contents($tmp, 2), "--\n";
diff --git a/ext/standard/tests/streams/stream_get_contents_002.phpt b/ext/standard/tests/streams/stream_get_contents_002.phpt
index 66ff3fb189..3e01e71953 100644
--- a/ext/standard/tests/streams/stream_get_contents_002.phpt
+++ b/ext/standard/tests/streams/stream_get_contents_002.phpt
@@ -10,7 +10,7 @@ $sockets = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
stream_set_timeout($sockets[1], 6000);
-fwrite($sockets[0], b"foo");
+fwrite($sockets[0], "foo");
var_dump(stream_get_contents($sockets[1], 3));
?>
diff --git a/ext/standard/tests/streams/stream_get_line_nb.phpt b/ext/standard/tests/streams/stream_get_line_nb.phpt
index ce981203ff..40a6095374 100644
--- a/ext/standard/tests/streams/stream_get_line_nb.phpt
+++ b/ext/standard/tests/streams/stream_get_line_nb.phpt
@@ -20,25 +20,25 @@ var_dump($sockets);
stream_set_blocking($sockets[1], 0);
-$eol = b'<EOL>';
+$eol = '<EOL>';
-fwrite($sockets[0], b"line start");
+fwrite($sockets[0], "line start");
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Does not returns incomplete line (EOL not found)
var_dump(stream_get_line($sockets[1], 8192, $eol));
-fwrite($sockets[0], b", line end");
-fwrite($sockets[0], b", $eol");
+fwrite($sockets[0], ", line end");
+fwrite($sockets[0], ", $eol");
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Returns full line (EOL found)
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Nothing to read
var_dump(stream_get_line($sockets[1], 8192, $eol));
-fwrite($sockets[0], b"incomplete line");
-var_dump(stream_get_line($sockets[1], strlen(b"incomplete line"), $eol)); // EOL not found but $length has been read, return incomplete line
+fwrite($sockets[0], "incomplete line");
+var_dump(stream_get_line($sockets[1], strlen("incomplete line"), $eol)); // EOL not found but $length has been read, return incomplete line
-fwrite($sockets[0], b"incomplete line");
+fwrite($sockets[0], "incomplete line");
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Does not returns incomplete line (EOL not found)
-var_dump(fread($sockets[1], strlen(b"incomplete line"))); // Returns buffer readden by stream_get_line
+var_dump(fread($sockets[1], strlen("incomplete line"))); // Returns buffer readden by stream_get_line
-fwrite($sockets[0], b"end of file");
+fwrite($sockets[0], "end of file");
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Does not returns incomplete line (EOL not found)
fclose($sockets[0]);
diff --git a/ext/standard/tests/streams/stream_socket_pair.phpt b/ext/standard/tests/streams/stream_socket_pair.phpt
index 203ae982d1..b926c9d9f4 100644
--- a/ext/standard/tests/streams/stream_socket_pair.phpt
+++ b/ext/standard/tests/streams/stream_socket_pair.phpt
@@ -5,8 +5,8 @@ stream_socket_pair()
$domain = (strtoupper(substr(PHP_OS, 0, 3) == 'WIN') ? STREAM_PF_INET : STREAM_PF_UNIX);
$sockets = stream_socket_pair($domain, STREAM_SOCK_STREAM, 0);
var_dump($sockets);
-fwrite($sockets[0], b"foo");
-var_dump(fread($sockets[1], strlen(b"foo")));
+fwrite($sockets[0], "foo");
+var_dump(fread($sockets[1], strlen("foo")));
fclose($sockets[0]);
?>
--EXPECTF--
diff --git a/ext/standard/tests/strings/bug44703.phpt b/ext/standard/tests/strings/bug44703.phpt
index e20b1dd83f..6171cee923 100644
--- a/ext/standard/tests/strings/bug44703.phpt
+++ b/ext/standard/tests/strings/bug44703.phpt
@@ -3,22 +3,22 @@ Bug #44703 (htmlspecialchars() does not detect bad character set argument)
--FILE--
<?php
-var_dump(htmlspecialchars(b"<a href='test'>Test</a>", ENT_COMPAT, 1));
-var_dump(htmlspecialchars(b"<a href='test'>Test</a>", ENT_COMPAT, 12));
-var_dump(htmlspecialchars(b"<a href='test'>Test</a>", ENT_COMPAT, 125));
-var_dump(htmlspecialchars(b"<a href='test'>Test</a>", ENT_COMPAT, 1252));
-var_dump(htmlspecialchars(b"<a href='test'>Test</a>", ENT_COMPAT, 12526));
+var_dump(htmlspecialchars("<a href='test'>Test</a>", ENT_COMPAT, 1));
+var_dump(htmlspecialchars("<a href='test'>Test</a>", ENT_COMPAT, 12));
+var_dump(htmlspecialchars("<a href='test'>Test</a>", ENT_COMPAT, 125));
+var_dump(htmlspecialchars("<a href='test'>Test</a>", ENT_COMPAT, 1252));
+var_dump(htmlspecialchars("<a href='test'>Test</a>", ENT_COMPAT, 12526));
-var_dump(htmlspecialchars(b"<>", ENT_COMPAT, 866));
-var_dump(htmlspecialchars(b"<>", ENT_COMPAT, 8666));
+var_dump(htmlspecialchars("<>", ENT_COMPAT, 866));
+var_dump(htmlspecialchars("<>", ENT_COMPAT, 8666));
-var_dump(htmlspecialchars(b"<>", ENT_COMPAT, NULL));
+var_dump(htmlspecialchars("<>", ENT_COMPAT, NULL));
-var_dump(htmlspecialchars(b"<>", ENT_COMPAT, 'SJIS'));
-var_dump(htmlspecialchars(b"<>", ENT_COMPAT, 'SjiS'));
+var_dump(htmlspecialchars("<>", ENT_COMPAT, 'SJIS'));
+var_dump(htmlspecialchars("<>", ENT_COMPAT, 'SjiS'));
-var_dump(htmlspecialchars(b"<>", ENT_COMPAT, str_repeat('a', 100)));
+var_dump(htmlspecialchars("<>", ENT_COMPAT, str_repeat('a', 100)));
?>
--EXPECTF--
diff --git a/ext/standard/tests/strings/bug51059.phpt b/ext/standard/tests/strings/bug51059.phpt
index bdc56f1762..d17305ca50 100644
--- a/ext/standard/tests/strings/bug51059.phpt
+++ b/ext/standard/tests/strings/bug51059.phpt
@@ -2,8 +2,8 @@
Bug #51059 crypt() segfaults on certain salts
--FILE--
<?php
-$res = crypt(b'a', b'_');
-if ($res === b'*0' || $res === b'*1') echo 'OK';
+$res = crypt('a', '_');
+if ($res === '*0' || $res === '*1') echo 'OK';
else echo 'Not OK';
?>
diff --git a/ext/standard/tests/strings/convert_uuencode_basic.phpt b/ext/standard/tests/strings/convert_uuencode_basic.phpt
index df8ee3666e..9849997d41 100644
--- a/ext/standard/tests/strings/convert_uuencode_basic.phpt
+++ b/ext/standard/tests/strings/convert_uuencode_basic.phpt
@@ -14,18 +14,18 @@ echo "*** Testing convert_uuencode() : basic functionality ***\n";
$strings = array (
//double quoted strings
- b"123",
- b"abc",
- b"1a2b3c",
- b"Here is a simple string to test convert_uuencode/decode",
- b"\t This String contains \t\t some control characters\r\n",
- b"\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f",
+ "123",
+ "abc",
+ "1a2b3c",
+ "Here is a simple string to test convert_uuencode/decode",
+ "\t This String contains \t\t some control characters\r\n",
+ "\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f",
//single quoted strings
- b'123',
- b'abc',
- b'1a2b3c',
- b'\t This String contains \t\t some control characters\r\n',
+ '123',
+ 'abc',
+ '1a2b3c',
+ '\t This String contains \t\t some control characters\r\n',
);
diff --git a/ext/standard/tests/strings/crypt_blowfish_variation1.phpt b/ext/standard/tests/strings/crypt_blowfish_variation1.phpt
index 1592cfe876..4436700104 100644
--- a/ext/standard/tests/strings/crypt_blowfish_variation1.phpt
+++ b/ext/standard/tests/strings/crypt_blowfish_variation1.phpt
@@ -9,17 +9,17 @@ if (!function_exists('crypt') || !defined("CRYPT_BLOWFISH")) {
--FILE--
<?php
-$salts = array(b'32' => b'$2a$32$CCCCCCCCCCCCCCCCCCCCCC$',
- b'33' => b'$2a$33$CCCCCCCCCCCCCCCCCCCCCC$',
- b'34' => b'$2a$34$CCCCCCCCCCCCCCCCCCCCCC$',
- b'35' => b'$2a$35$CCCCCCCCCCCCCCCCCCCCCC$',
- b'36' => b'$2a$36$CCCCCCCCCCCCCCCCCCCCCC$',
- b'37' => b'$2a$37$CCCCCCCCCCCCCCCCCCCCCC$',
- b'38' => b'$2a$38$CCCCCCCCCCCCCCCCCCCCCC$',);
+$salts = array('32' => '$2a$32$CCCCCCCCCCCCCCCCCCCCCC$',
+ '33' => '$2a$33$CCCCCCCCCCCCCCCCCCCCCC$',
+ '34' => '$2a$34$CCCCCCCCCCCCCCCCCCCCCC$',
+ '35' => '$2a$35$CCCCCCCCCCCCCCCCCCCCCC$',
+ '36' => '$2a$36$CCCCCCCCCCCCCCCCCCCCCC$',
+ '37' => '$2a$37$CCCCCCCCCCCCCCCCCCCCCC$',
+ '38' => '$2a$38$CCCCCCCCCCCCCCCCCCCCCC$',);
foreach($salts as $i=>$salt) {
- $crypt = crypt(b'U*U', $salt);
- if ($crypt === b'*0' || $crypt === b'*1') {
+ $crypt = crypt('U*U', $salt);
+ if ($crypt === '*0' || $crypt === '*1') {
echo "$i. OK\n";
} else {
echo "$i. Not OK\n";
diff --git a/ext/standard/tests/strings/crypt_blowfish_variation2.phpt b/ext/standard/tests/strings/crypt_blowfish_variation2.phpt
index 9db9e21424..f354a8ec77 100644
--- a/ext/standard/tests/strings/crypt_blowfish_variation2.phpt
+++ b/ext/standard/tests/strings/crypt_blowfish_variation2.phpt
@@ -3,7 +3,7 @@ Test Blowfish crypt() does not fall back to DES when rounds are not specified,
or Blowfish is not available.
--FILE--
<?php
-$crypt = crypt(b'U*U', b'$2a$CCCCCCCCCCCCCCCCCCCCC.E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW');
+$crypt = crypt('U*U', '$2a$CCCCCCCCCCCCCCCCCCCCC.E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW');
if ($crypt==='*0') {
echo "OK\n";
} else {
diff --git a/ext/standard/tests/strings/crypt_sha256.phpt b/ext/standard/tests/strings/crypt_sha256.phpt
index 86c7245fe9..a29bbf3c88 100644
--- a/ext/standard/tests/strings/crypt_sha256.phpt
+++ b/ext/standard/tests/strings/crypt_sha256.phpt
@@ -11,44 +11,44 @@ if (!function_exists('crypt') || !defined("CRYPT_SHA256")) {
$tests = array(
1 => array(
- b'$5$saltstring',
- b'Hello world!',
- b'$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5'
+ '$5$saltstring',
+ 'Hello world!',
+ '$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5'
),
2 => array(
- b'$5$rounds=10000$saltstringsaltstring',
- b'Hello world!',
- b'$5$rounds=10000$saltstringsaltst$3xv.VbSHBb41AL9AvLeujZkZRBAwqFMz2.opqey6IcA'
+ '$5$rounds=10000$saltstringsaltstring',
+ 'Hello world!',
+ '$5$rounds=10000$saltstringsaltst$3xv.VbSHBb41AL9AvLeujZkZRBAwqFMz2.opqey6IcA'
),
3 => array(
- b'$5$rounds=10000$saltstringsaltstring',
- b'Hello world!',
- b'$5$rounds=10000$saltstringsaltst$3xv.VbSHBb41AL9AvLeujZkZRBAwqFMz2.opqey6IcA'
+ '$5$rounds=10000$saltstringsaltstring',
+ 'Hello world!',
+ '$5$rounds=10000$saltstringsaltst$3xv.VbSHBb41AL9AvLeujZkZRBAwqFMz2.opqey6IcA'
),
4 => array(
- b'$5$rounds=5000$toolongsaltstring',
- b'This is just a test',
- b'$5$rounds=5000$toolongsaltstrin$Un/5jzAHMgOGZ5.mWJpuVolil07guHPvOW8mGRcvxa5'
+ '$5$rounds=5000$toolongsaltstring',
+ 'This is just a test',
+ '$5$rounds=5000$toolongsaltstrin$Un/5jzAHMgOGZ5.mWJpuVolil07guHPvOW8mGRcvxa5'
),
5 => array(
- b'$5$rounds=1400$anotherlongsaltstring',
- b'a very much longer text to encrypt. This one even stretches over morethan one line.',
- b'$5$rounds=1400$anotherlongsalts$Rx.j8H.h8HjEDGomFU8bDkXm3XIUnzyxf12oP84Bnq1'
+ '$5$rounds=1400$anotherlongsaltstring',
+ 'a very much longer text to encrypt. This one even stretches over morethan one line.',
+ '$5$rounds=1400$anotherlongsalts$Rx.j8H.h8HjEDGomFU8bDkXm3XIUnzyxf12oP84Bnq1'
),
6 => array(
- b'$5$rounds=77777$short',
- b'we have a short salt string but not a short password',
- b'$5$rounds=77777$short$JiO1O3ZpDAxGJeaDIuqCoEFysAe1mZNJRs3pw0KQRd/'
+ '$5$rounds=77777$short',
+ 'we have a short salt string but not a short password',
+ '$5$rounds=77777$short$JiO1O3ZpDAxGJeaDIuqCoEFysAe1mZNJRs3pw0KQRd/'
),
7 => array(
- b'$5$rounds=123456$asaltof16chars..',
- b'a short string',
- b'$5$rounds=123456$asaltof16chars..$gP3VQ/6X7UUEW3HkBn2w1/Ptq2jxPyzV/cZKmF/wJvD'
+ '$5$rounds=123456$asaltof16chars..',
+ 'a short string',
+ '$5$rounds=123456$asaltof16chars..$gP3VQ/6X7UUEW3HkBn2w1/Ptq2jxPyzV/cZKmF/wJvD'
),
8 => array(
- b'$5$rounds=10$roundstoolow',
- b'the minimum number is still observed',
- b'$5$rounds=1000$roundstoolow$yfvwcWrQ8l/K0DAWyuPMDNHpIVlTQebY9l/gL972bIC'
+ '$5$rounds=10$roundstoolow',
+ 'the minimum number is still observed',
+ '$5$rounds=1000$roundstoolow$yfvwcWrQ8l/K0DAWyuPMDNHpIVlTQebY9l/gL972bIC'
)
);
diff --git a/ext/standard/tests/strings/crypt_sha512.phpt b/ext/standard/tests/strings/crypt_sha512.phpt
index d6f9df6013..3d51f4aafa 100644
--- a/ext/standard/tests/strings/crypt_sha512.phpt
+++ b/ext/standard/tests/strings/crypt_sha512.phpt
@@ -11,44 +11,44 @@ if (!function_exists('crypt') || !defined("CRYPT_SHA512")) {
$tests = array(
1 => array(
- b'$6$saltstring',
- b'Hello world!',
- b'$6$saltstring$svn8UoSVapNtMuq1ukKS4tPQd8iKwSMHWjl/O817G3uBnIFNjnQJuesI68u4OTLiBFdcbYEdFCoEOfaS35inz1'
+ '$6$saltstring',
+ 'Hello world!',
+ '$6$saltstring$svn8UoSVapNtMuq1ukKS4tPQd8iKwSMHWjl/O817G3uBnIFNjnQJuesI68u4OTLiBFdcbYEdFCoEOfaS35inz1'
),
2 => array(
- b'$6$rounds=10000$saltstringsaltstring',
- b'Hello world!',
- b'$6$rounds=10000$saltstringsaltst$OW1/O6BYHV6BcXZu8QVeXbDWra3Oeqh0sbHbbMCVNSnCM/UrjmM0Dp8vOuZeHBy/YTBmSK6H9qs/y3RnOaw5v.'
+ '$6$rounds=10000$saltstringsaltstring',
+ 'Hello world!',
+ '$6$rounds=10000$saltstringsaltst$OW1/O6BYHV6BcXZu8QVeXbDWra3Oeqh0sbHbbMCVNSnCM/UrjmM0Dp8vOuZeHBy/YTBmSK6H9qs/y3RnOaw5v.'
),
3 => array(
- b'$6$rounds=5000$toolongsaltstring',
- b'This is just a test',
- b'$6$rounds=5000$toolongsaltstrin$lQ8jolhgVRVhY4b5pZKaysCLi0QBxGoNeKQzQ3glMhwllF7oGDZxUhx1yxdYcz/e1JSbq3y6JMxxl8audkUEm0'
+ '$6$rounds=5000$toolongsaltstring',
+ 'This is just a test',
+ '$6$rounds=5000$toolongsaltstrin$lQ8jolhgVRVhY4b5pZKaysCLi0QBxGoNeKQzQ3glMhwllF7oGDZxUhx1yxdYcz/e1JSbq3y6JMxxl8audkUEm0'
),
4 => array(
- b'$6$rounds=1400$anotherlongsaltstring',
- b'a very much longer text to encrypt. This one even stretches over morethan one line.',
- b'$6$rounds=1400$anotherlongsalts$POfYwTEok97VWcjxIiSOjiykti.o/pQs.wPvMxQ6Fm7I6IoYN3CmLs66x9t0oSwbtEW7o7UmJEiDwGqd8p4ur1'
+ '$6$rounds=1400$anotherlongsaltstring',
+ 'a very much longer text to encrypt. This one even stretches over morethan one line.',
+ '$6$rounds=1400$anotherlongsalts$POfYwTEok97VWcjxIiSOjiykti.o/pQs.wPvMxQ6Fm7I6IoYN3CmLs66x9t0oSwbtEW7o7UmJEiDwGqd8p4ur1'
),
5 => array(
- b'$6$rounds=77777$short',
- b'we have a short salt string but not a short password',
- b'$6$rounds=77777$short$WuQyW2YR.hBNpjjRhpYD/ifIw05xdfeEyQoMxIXbkvr0gge1a1x3yRULJ5CCaUeOxFmtlcGZelFl5CxtgfiAc0'
+ '$6$rounds=77777$short',
+ 'we have a short salt string but not a short password',
+ '$6$rounds=77777$short$WuQyW2YR.hBNpjjRhpYD/ifIw05xdfeEyQoMxIXbkvr0gge1a1x3yRULJ5CCaUeOxFmtlcGZelFl5CxtgfiAc0'
),
6 => array(
- b'$6$rounds=123456$asaltof16chars..',
- b'a short string',
- b'$6$rounds=123456$asaltof16chars..$BtCwjqMJGx5hrJhZywWvt0RLE8uZ4oPwcelCjmw2kSYu.Ec6ycULevoBK25fs2xXgMNrCzIMVcgEJAstJeonj1'
+ '$6$rounds=123456$asaltof16chars..',
+ 'a short string',
+ '$6$rounds=123456$asaltof16chars..$BtCwjqMJGx5hrJhZywWvt0RLE8uZ4oPwcelCjmw2kSYu.Ec6ycULevoBK25fs2xXgMNrCzIMVcgEJAstJeonj1'
),
7 => array(
- b'$6$rounds=10$roundstoolow',
- b'the minimum number is still observed',
- b'$6$rounds=1000$roundstoolow$kUMsbe306n21p9R.FRkW3IGn.S9NPN0x50YhH1xhLsPuWGsUSklZt58jaTfF4ZEQpyUNGc0dqbpBYYBaHHrsX.'
+ '$6$rounds=10$roundstoolow',
+ 'the minimum number is still observed',
+ '$6$rounds=1000$roundstoolow$kUMsbe306n21p9R.FRkW3IGn.S9NPN0x50YhH1xhLsPuWGsUSklZt58jaTfF4ZEQpyUNGc0dqbpBYYBaHHrsX.'
),
8 => array(
- b'$6$$bar$',
- b'foo',
- b'$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu.'
+ '$6$$bar$',
+ 'foo',
+ '$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu.'
),
);
diff --git a/ext/standard/tests/strings/htmlentities-utf-2.phpt b/ext/standard/tests/strings/htmlentities-utf-2.phpt
index d515dc0ff1..c058390ea9 100644
--- a/ext/standard/tests/strings/htmlentities-utf-2.phpt
+++ b/ext/standard/tests/strings/htmlentities-utf-2.phpt
@@ -5,10 +5,10 @@ output_handler=
--FILE--
<?php
@setlocale (LC_CTYPE, "C");
-$strings = array(b"<", b"\xD0", b"\xD0\x90", b"\xD0\x90\xD0", b"\xD0\x90\xD0\xB0", b"\xE0", b"A\xE0", b"\xE0\x80", b"\xE0\x79", b"\xE0\x80\xBE",
- b"Voil\xE0", b"Clich\xE9s",
- b"\xFE", b"\xFE\x41", b"\xC3\xA9", b"\xC3\x79", b"\xF7\xBF\xBF\xBF", b"\xFB\xBF\xBF\xBF\xBF", b"\xFD\xBF\xBF\xBF\xBF\xBF",
- b"\x41\xF7\xF7\x42", b"\x42\xFB\xFB\x42", b"\x43\xFD\xFD\x42", b"\x44\xF7\xF7", b"\x45\xFB\xFB", b"\x46\xFD\xFD"
+$strings = array("<", "\xD0", "\xD0\x90", "\xD0\x90\xD0", "\xD0\x90\xD0\xB0", "\xE0", "A\xE0", "\xE0\x80", "\xE0\x79", "\xE0\x80\xBE",
+ "Voil\xE0", "Clich\xE9s",
+ "\xFE", "\xFE\x41", "\xC3\xA9", "\xC3\x79", "\xF7\xBF\xBF\xBF", "\xFB\xBF\xBF\xBF\xBF", "\xFD\xBF\xBF\xBF\xBF\xBF",
+ "\x41\xF7\xF7\x42", "\x42\xFB\xFB\x42", "\x43\xFD\xFD\x42", "\x44\xF7\xF7", "\x45\xFB\xFB", "\x46\xFD\xFD"
);
foreach($strings as $string) {
$sc_encoded = htmlspecialchars ($string, ENT_QUOTES | ENT_IGNORE, "utf-8");
diff --git a/ext/standard/tests/strings/htmlentities-utf.phpt b/ext/standard/tests/strings/htmlentities-utf.phpt
index 6a66e4df45..de99449552 100644
--- a/ext/standard/tests/strings/htmlentities-utf.phpt
+++ b/ext/standard/tests/strings/htmlentities-utf.phpt
@@ -5,10 +5,10 @@ output_handler=
--FILE--
<?php
@setlocale (LC_CTYPE, "C");
-$strings = array(b"<", b"\xD0", b"\xD0\x90", b"\xD0\x90\xD0", b"\xD0\x90\xD0\xB0", b"\xE0", b"A\xE0", b"\xE0\x80", b"\xE0\x79", b"\xE0\x80\xBE",
- b"Voil\xE0", b"Clich\xE9s",
- b"\xFE", b"\xFE\x41", b"\xC3\xA9", b"\xC3\x79", b"\xF7\xBF\xBF\xBF", b"\xFB\xBF\xBF\xBF\xBF", b"\xFD\xBF\xBF\xBF\xBF\xBF",
- b"\x41\xF7\xF7\x42", b"\x42\xFB\xFB\x42", b"\x43\xFD\xFD\x42", b"\x44\xF7\xF7", b"\x45\xFB\xFB", b"\x46\xFD\xFD"
+$strings = array("<", "\xD0", "\xD0\x90", "\xD0\x90\xD0", "\xD0\x90\xD0\xB0", "\xE0", "A\xE0", "\xE0\x80", "\xE0\x79", "\xE0\x80\xBE",
+ "Voil\xE0", "Clich\xE9s",
+ "\xFE", "\xFE\x41", "\xC3\xA9", "\xC3\x79", "\xF7\xBF\xBF\xBF", "\xFB\xBF\xBF\xBF\xBF", "\xFD\xBF\xBF\xBF\xBF\xBF",
+ "\x41\xF7\xF7\x42", "\x42\xFB\xFB\x42", "\x43\xFD\xFD\x42", "\x44\xF7\xF7", "\x45\xFB\xFB", "\x46\xFD\xFD"
);
foreach($strings as $string) {
$sc_encoded = htmlspecialchars ($string, ENT_QUOTES, "utf-8");
diff --git a/ext/standard/tests/strings/htmlentities01.phpt b/ext/standard/tests/strings/htmlentities01.phpt
index eb64b0a63b..4ab49472d1 100644
--- a/ext/standard/tests/strings/htmlentities01.phpt
+++ b/ext/standard/tests/strings/htmlentities01.phpt
@@ -5,8 +5,8 @@ output_handler=
mbstring.internal_encoding=pass
--FILE--
<?php
- var_dump(htmlentities(b"\x82\x86\x99\x9f", ENT_QUOTES, 'cp1252'));
- var_dump(htmlentities(b"\x80\xa2\xa3\xa4\xa5", ENT_QUOTES, 'cp1252'));
+ var_dump(htmlentities("\x82\x86\x99\x9f", ENT_QUOTES, 'cp1252'));
+ var_dump(htmlentities("\x80\xa2\xa3\xa4\xa5", ENT_QUOTES, 'cp1252'));
?>
--EXPECT--
string(28) "&sbquo;&dagger;&trade;&Yuml;"
diff --git a/ext/standard/tests/strings/htmlentities24.phpt b/ext/standard/tests/strings/htmlentities24.phpt
index 3ffdd65a5f..51271bdddf 100644
--- a/ext/standard/tests/strings/htmlentities24.phpt
+++ b/ext/standard/tests/strings/htmlentities24.phpt
@@ -9,7 +9,7 @@ Test htmlentities() function
/* retrieving htmlentities from the ANSI character table */
echo "*** Retrieving htmlentities for 256 characters ***\n";
for($i=0; $i<256; $i++)
- var_dump( bin2hex( htmlentities(b"chr($i)")) );
+ var_dump( bin2hex( htmlentities("chr($i)")) );
/* giving arguments as NULL */
echo "\n*** Testing htmlentities() with NULL as first,second and third argument ***\n";
diff --git a/ext/standard/tests/strings/htmlspecialchars.phpt b/ext/standard/tests/strings/htmlspecialchars.phpt
index 5d741e5ecb..2c886b9af7 100644
--- a/ext/standard/tests/strings/htmlspecialchars.phpt
+++ b/ext/standard/tests/strings/htmlspecialchars.phpt
@@ -9,7 +9,7 @@ Test htmlspecialchars() function
/* retrieving htmlspecialchars from the ANSI character table */
echo "*** Retrieving htmlspecialchars for 256 characters ***\n";
for($i=0; $i<256; $i++)
-var_dump( bin2hex( htmlspecialchars(b"chr($i)") ) );
+var_dump( bin2hex( htmlspecialchars("chr($i)") ) );
/* giving NULL as the argument */
echo "\n*** Testing htmlspecialchars() with NULL as first, second and third argument ***\n";
diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt
index fc3666ff65..7b1295c54e 100644
--- a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt
+++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/join_variation6.phpt b/ext/standard/tests/strings/join_variation6.phpt
index a627d77bf4..621b69521c 100644
--- a/ext/standard/tests/strings/join_variation6.phpt
+++ b/ext/standard/tests/strings/join_variation6.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/md5_basic1.phpt b/ext/standard/tests/strings/md5_basic1.phpt
index eda414bc25..c1f8805ac0 100644
--- a/ext/standard/tests/strings/md5_basic1.phpt
+++ b/ext/standard/tests/strings/md5_basic1.phpt
@@ -8,7 +8,7 @@ Test md5() function : basic functionality
*/
echo "*** Testing md5() : basic functionality ***\n";
-var_dump(md5(b"apple"));
+var_dump(md5("apple"));
?>
===DONE===
--EXPECTF--
diff --git a/ext/standard/tests/strings/md5_basic2.phpt b/ext/standard/tests/strings/md5_basic2.phpt
index 1f89ba82f5..670872f74d 100644
--- a/ext/standard/tests/strings/md5_basic2.phpt
+++ b/ext/standard/tests/strings/md5_basic2.phpt
@@ -8,7 +8,7 @@ Test md5() function : basic functionality - with raw output
*/
echo "*** Testing md5() : basic functionality - with raw output***\n";
-$str = b"Hello World";
+$str = "Hello World";
$md5_raw = md5($str, true);
var_dump(bin2hex($md5_raw));
diff --git a/ext/standard/tests/strings/quoted_printable_decode_error.phpt b/ext/standard/tests/strings/quoted_printable_decode_error.phpt
index 5018837049..0515fea2a7 100644
--- a/ext/standard/tests/strings/quoted_printable_decode_error.phpt
+++ b/ext/standard/tests/strings/quoted_printable_decode_error.phpt
@@ -13,7 +13,7 @@ echo "\n-- Testing quoted_printable_decode() function with no arguments --\n";
var_dump( quoted_printable_decode() );
echo "\n-- Testing quoted_printable_decode() function with more than expected no. of arguments --\n";
-$str = b"=FAwow-factor=C1=d0=D5=DD=C5=CE=CE=D9=C5=0A=
+$str = "=FAwow-factor=C1=d0=D5=DD=C5=CE=CE=D9=C5=0A=
=20=D4=cf=D2=C7=CF=D7=D9=C5=
=20=
=D0=
diff --git a/ext/standard/tests/strings/sha1_file.phpt b/ext/standard/tests/strings/sha1_file.phpt
index fafe106d51..20d62e6999 100644
--- a/ext/standard/tests/strings/sha1_file.phpt
+++ b/ext/standard/tests/strings/sha1_file.phpt
@@ -19,7 +19,7 @@ return false;
/* Writing into file */
$filename = "DataFile.txt";
-$content = b"Add this to the file\n";
+$content = "Add this to the file\n";
if (is_writable($filename)) {
if (fwrite($handle2, $content) === FALSE) {
echo "Cannot write to file ($filename)";
diff --git a/ext/standard/tests/strings/strip_tags_variation6.phpt b/ext/standard/tests/strings/strip_tags_variation6.phpt
index 454f46e558..c838970868 100644
--- a/ext/standard/tests/strings/strip_tags_variation6.phpt
+++ b/ext/standard/tests/strings/strip_tags_variation6.phpt
@@ -19,7 +19,7 @@ echo "*** Testing strip_tags() : usage variations ***\n";
$strings = array (
"<html> I am html string </html>".chr(0)."<?php I am php string ?>",
"<html> I am html string\0 </html><?php I am php string ?>",
- b"<a>I am html string</a>",
+ "<a>I am html string</a>",
"<html>I am html string</html>".decbin(65)."<?php I am php string?>"
);
diff --git a/ext/standard/tests/strings/stristr_basic.phpt b/ext/standard/tests/strings/stristr_basic.phpt
index f0a863cee9..0d2171496c 100644
--- a/ext/standard/tests/strings/stristr_basic.phpt
+++ b/ext/standard/tests/strings/stristr_basic.phpt
@@ -13,7 +13,7 @@ var_dump( stristr("test stRIng", "striNG") );
var_dump( stristr("teST StrinG", "stRIn") );
var_dump( stristr("tesT string", "t S") );
var_dump( stristr("test strinG", "g") );
-var_dump( bin2hex(stristr(b"te".chr(0).b"St", chr(0))) );
+var_dump( bin2hex(stristr("te".chr(0)."St", chr(0))) );
var_dump( stristr("tEst", "test") );
var_dump( stristr("teSt", "test") );
diff --git a/ext/standard/tests/url/bug47174.phpt b/ext/standard/tests/url/bug47174.phpt
index 0296dbe753..6d08063253 100644
--- a/ext/standard/tests/url/bug47174.phpt
+++ b/ext/standard/tests/url/bug47174.phpt
@@ -2,13 +2,13 @@
Bug #47174 (base64_decode() interprets pad char in mid string as terminator)
--FILE--
<?php
-if (base64_decode(b"dGVzdA==") == base64_decode(b"dGVzdA==CRAP")) {
+if (base64_decode("dGVzdA==") == base64_decode("dGVzdA==CRAP")) {
echo "Same octect data - Signature Valid\n";
} else {
echo "Invalid Signature\n";
}
-$in = base64_encode(b"foo") . b'==' . base64_encode(b"bar");
+$in = base64_encode("foo") . '==' . base64_encode("bar");
var_dump($in, base64_decode($in));
?>