Remove the b prefix from literals on unrelated tests

13 files changed, 33 insertions, 33 deletions

diff --git a/ext/iconv/tests/iconv_basic.phpt b/ext/iconv/tests/iconv_basic.phpt
index e0e2cb2061..8669af040c 100644
--- a/ext/iconv/tests/iconv_basic.phpt
+++ b/ext/iconv/tests/iconv_basic.phpt
@@ -19,9 +19,9 @@ function_exists('iconv') or die("skip iconv() is not available in this build");
 echo "*** Testing iconv() : basic functionality ***\n";
 
 //All strings are the same when displayed in their respective encodings
-$sjis_string = base64_decode(b'k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==');
-$euc_jp_string = base64_decode(b'xvzL3LjspcalraW5pcikx6S5oaMwMTIzNKO1o7ajt6O4o7mhow==');
-$utf8_string = base64_decode(b'5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+$sjis_string = base64_decode('k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==');
+$euc_jp_string = base64_decode('xvzL3LjspcalraW5pcikx6S5oaMwMTIzNKO1o7ajt6O4o7mhow==');
+$utf8_string = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
 
 echo "\n-- Convert to EUC-JP --\n";
 echo "Expected EUC-JP encoded string in base64:\n";
diff --git a/ext/iconv/tests/iconv_mime_decode_variation1.phpt b/ext/iconv/tests/iconv_mime_decode_variation1.phpt
index a42b0de234..4d91d68add 100644
--- a/ext/iconv/tests/iconv_mime_decode_variation1.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_variation1.phpt
@@ -19,7 +19,7 @@ function_exists('iconv_mime_decode') or die("skip iconv_mime_decode() is not ava
 echo "*** Testing iconv_mime_decode() : usage variations ***\n";
 
 // Initialise function arguments not being substituted
-$header = b'Subject: =?UTF-8?B?UHLDvGZ1bmcgUHLDvGZ1bmc=?=';
+$header = 'Subject: =?UTF-8?B?UHLDvGZ1bmcgUHLDvGZ1bmc=?=';
 $mode = ICONV_MIME_DECODE_CONTINUE_ON_ERROR;
 $charset = 'ISO-8859-1';
 
diff --git a/ext/iconv/tests/iconv_mime_decode_variation2.phpt b/ext/iconv/tests/iconv_mime_decode_variation2.phpt
index 8a3134edac..f4508e9860 100644
--- a/ext/iconv/tests/iconv_mime_decode_variation2.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_variation2.phpt
@@ -20,7 +20,7 @@ function_exists('iconv_mime_decode') or die("skip iconv_mime_decode() is not ava
 echo "*** Testing iconv_mime_decode() : usage variations ***\n";
 
 // Initialise function arguments not being substituted
-$header = b'Subject: =?UTF-8?B?UHLDvGZ1bmcgUHLDvGZ1bmc=?=';
+$header = 'Subject: =?UTF-8?B?UHLDvGZ1bmcgUHLDvGZ1bmc=?=';
 $mode = ICONV_MIME_DECODE_CONTINUE_ON_ERROR;
 $charset = 'UTF-8';
 
diff --git a/ext/iconv/tests/iconv_mime_decode_variation3.phpt b/ext/iconv/tests/iconv_mime_decode_variation3.phpt
index cd5c719cbb..c077aa10fa 100644
--- a/ext/iconv/tests/iconv_mime_decode_variation3.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_variation3.phpt
@@ -22,7 +22,7 @@ echo "*** Testing iconv_mime_decode() : usage variations ***\n";
 // Some of the parameters actually passed to charset will request to use
 // a default charset determined by the platform. In order for this test to
 // run on both linux and windows, the subject will have to be ascii only.
-$header = b'Subject: =?UTF-8?B?QSBTYW1wbGUgVGVzdA==?=';
+$header = 'Subject: =?UTF-8?B?QSBTYW1wbGUgVGVzdA==?=';
 $mode = ICONV_MIME_DECODE_CONTINUE_ON_ERROR;
 $charset = 'UTF-8';
 
diff --git a/ext/iconv/tests/iconv_strlen_basic.phpt b/ext/iconv/tests/iconv_strlen_basic.phpt
index 5777435d61..e5d6271f69 100644
--- a/ext/iconv/tests/iconv_strlen_basic.phpt
+++ b/ext/iconv/tests/iconv_strlen_basic.phpt
@@ -18,9 +18,9 @@ function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in
 
 echo "*** Testing iconv_strlen() : basic functionality***\n";
 
-$string_ascii = b'abc def';
+$string_ascii = 'abc def';
 //Japanese string in UTF-8
-$string_mb = base64_decode(b'5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
 
 echo "\n-- ASCII String --\n";
 var_dump(iconv_strlen($string_ascii));
diff --git a/ext/iconv/tests/iconv_strpos_basic.phpt b/ext/iconv/tests/iconv_strpos_basic.phpt
index 25f8f1b1fd..1017f8e3b6 100644
--- a/ext/iconv/tests/iconv_strpos_basic.phpt
+++ b/ext/iconv/tests/iconv_strpos_basic.phpt
@@ -22,22 +22,22 @@ echo "*** Testing iconv_strpos() : basic functionality***\n";
 
 iconv_set_encoding("internal_encoding", "UTF-8");
 
-$string_ascii = b'abc def';
+$string_ascii = 'abc def';
 //Japanese string in UTF-8
-$string_mb = base64_decode(b'5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
 
 echo "\n-- ASCII string 1 --\n";
-var_dump(iconv_strpos($string_ascii, b'd', 2, 'ISO-8859-1'));
+var_dump(iconv_strpos($string_ascii, 'd', 2, 'ISO-8859-1'));
 
 echo "\n-- ASCII string 2 --\n";
-var_dump(iconv_strpos($string_ascii, b'123'));
+var_dump(iconv_strpos($string_ascii, '123'));
 
 echo "\n-- Multibyte string 1 --\n";
 $needle1 = base64_decode('5pel5pys6Kqe');
 var_dump(iconv_strpos($string_mb, $needle1));
 
 echo "\n-- Multibyte string 2 --\n";
-$needle2 = base64_decode(b"44GT44KT44Gr44Gh44Gv44CB5LiW55WM");
+$needle2 = base64_decode("44GT44KT44Gr44Gh44Gv44CB5LiW55WM");
 var_dump(iconv_strpos($string_mb, $needle2));
 
 echo "Done";
diff --git a/ext/iconv/tests/iconv_strpos_variation3.phpt b/ext/iconv/tests/iconv_strpos_variation3.phpt
index 6f27b74a52..ea889a07bd 100644
--- a/ext/iconv/tests/iconv_strpos_variation3.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation3.phpt
@@ -20,8 +20,8 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 echo "*** Testing iconv_strpos() : usage variations ***\n";
 
 // Initialise function arguments not being substituted
-$needle = b'a';
-$haystack = b'string_val';
+$needle = 'a';
+$haystack = 'string_val';
 $encoding = 'utf-8';
 
 //get an unset variable
diff --git a/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt b/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
index 2704493235..c4e3e141a1 100644
--- a/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
@@ -20,8 +20,8 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 echo "*** Testing iconv_strpos() : usage variations ***\n";
 
 // Initialise function arguments not being substituted
-$needle = b'a';
-$haystack = b'string_val';
+$needle = 'a';
+$haystack = 'string_val';
 $encoding = 'utf-8';
 
 //get an unset variable
diff --git a/ext/iconv/tests/iconv_strpos_variation4.phpt b/ext/iconv/tests/iconv_strpos_variation4.phpt
index 43ab3e5781..539305541a 100644
--- a/ext/iconv/tests/iconv_strpos_variation4.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation4.phpt
@@ -21,8 +21,8 @@ function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in
 echo "*** Testing iconv_strpos() : usage variations ***\n";
 
 // Initialise function arguments not being substituted
-$haystack = b'string_val';
-$needle = b'val';
+$haystack = 'string_val';
+$needle = 'val';
 $offset = 0;
 
 //get an unset variable
diff --git a/ext/iconv/tests/iconv_strpos_variation5.phpt b/ext/iconv/tests/iconv_strpos_variation5.phpt
index fcd5aaecae..759294f73a 100644
--- a/ext/iconv/tests/iconv_strpos_variation5.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation5.phpt
@@ -24,11 +24,11 @@ iconv_set_encoding("internal_encoding", "UTF-8");
 
 echo "*** Testing iconv_strpos() : usage variations ***\n";
 
-$string_ascii = b'+Is an English string'; //21 chars
-$needle_ascii = b'g';
+$string_ascii = '+Is an English string'; //21 chars
+$needle_ascii = 'g';
 
-$string_mb = base64_decode(b'5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //21 chars
-$needle_mb = base64_decode(b'44CC');
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII='); //21 chars
+$needle_mb = base64_decode('44CC');
 
 /*
  * Loop through integers as multiples of ten for $offset argument
diff --git a/ext/iconv/tests/iconv_strrpos_basic.phpt b/ext/iconv/tests/iconv_strrpos_basic.phpt
index 3d34a23f11..78dfaa0db1 100644
--- a/ext/iconv/tests/iconv_strrpos_basic.phpt
+++ b/ext/iconv/tests/iconv_strrpos_basic.phpt
@@ -22,22 +22,22 @@ echo "*** Testing iconv_strrpos() : basic ***\n";
 
 iconv_set_encoding("internal_encoding", "UTF-8");
 
-$string_ascii = b'This is an English string. 0123456789.';
+$string_ascii = 'This is an English string. 0123456789.';
 //Japanese string in UTF-8
-$string_mb = base64_decode(b'5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
 
 echo "\n-- ASCII string 1 --\n";
-var_dump(iconv_strrpos($string_ascii, b'is', 'ISO-8859-1'));
+var_dump(iconv_strrpos($string_ascii, 'is', 'ISO-8859-1'));
 
 echo "\n-- ASCII string 2 --\n";
-var_dump(iconv_strrpos($string_ascii, b'hello, world'));
+var_dump(iconv_strrpos($string_ascii, 'hello, world'));
 
 echo "\n-- Multibyte string 1 --\n";
-$needle1 = base64_decode(b'44CC');
+$needle1 = base64_decode('44CC');
 var_dump(iconv_strrpos($string_mb, $needle1));
 
 echo "\n-- Multibyte string 2 --\n";
-$needle2 = base64_decode(b'44GT44KT44Gr44Gh44Gv44CB5LiW55WM');
+$needle2 = base64_decode('44GT44KT44Gr44Gh44Gv44CB5LiW55WM');
 var_dump(iconv_strrpos($string_mb, $needle2));
 
 echo "Done";
diff --git a/ext/iconv/tests/iconv_strrpos_variation3.phpt b/ext/iconv/tests/iconv_strrpos_variation3.phpt
index 87a21bd7a4..373e905173 100644
--- a/ext/iconv/tests/iconv_strrpos_variation3.phpt
+++ b/ext/iconv/tests/iconv_strrpos_variation3.phpt
@@ -20,8 +20,8 @@ function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available i
 echo "*** Testing iconv_strrpos() : usage variations ***\n";
 
 // Initialise function arguments not being substituted
-$haystack = b'hello, world';
-$needle = b'world';
+$haystack = 'hello, world';
+$needle = 'world';
 
 //get an unset variable
 $unset_var = 10;
diff --git a/ext/iconv/tests/iconv_substr_basic.phpt b/ext/iconv/tests/iconv_substr_basic.phpt
index 0754fc8779..2e33c5aa9b 100644
--- a/ext/iconv/tests/iconv_substr_basic.phpt
+++ b/ext/iconv/tests/iconv_substr_basic.phpt
@@ -22,9 +22,9 @@ iconv.output_encoding=ISO-8859-1
 
 echo "*** Testing iconv_substr() : basic functionality ***\n";
 
-$string_ascii = b'ABCDEF';
+$string_ascii = 'ABCDEF';
 //Japanese string in UTF-8
-$string_mb = base64_decode(b'5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
 
 echo "\n-- ASCII string 1 --\n";
 var_dump(bin2hex(iconv_substr($string_ascii, 3)));