Fix typos in mbstring tests

Man, I can be pedantic sometimes. Tiny little things like misspelled words just
hurt me inside. So while it's not really a big deal, I couldn't leave these typos
alone...

diff --git a/ext/mbstring/tests/bug46806.phpt b/ext/mbstring/tests/bug46806.phpt
index ea00035c0f92c321225cd8cee87b6787b9ce6bba..5165705a9f7684484eafab0cdd6d979e216ed644 100644 (file)
--- a/ext/mbstring/tests/bug46806.phpt
+++ b/ext/mbstring/tests/bug46806.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #46806 (mb_wtrimwidth cutting to early)
+Bug #46806 (mb_strimwidth cutting too early)
 --CREDITS--
 Sebastian Schürmann
 sebs@php.net

diff --git a/ext/mbstring/tests/bug77428.phpt b/ext/mbstring/tests/bug77428.phpt
index d387f34b771fa585935c6832ef6a26d17ccb28a0..82a2574b1ab10f5122636e779bbdf4b6a4e57846 100644 (file)
--- a/ext/mbstring/tests/bug77428.phpt
+++ b/ext/mbstring/tests/bug77428.phpt
@@ -10,7 +10,7 @@ if (!function_exists('mb_ereg_replace')) die('skip mb_ereg_replace() not availab
 
 // This behavior is broken, but kept for BC reasons
 var_dump(mb_ereg_replace('(%)', '\\\1', 'a%c'));
-// For clarify, the above line is equivalent to:
+// For clarity, the above line is equivalent to:
 var_dump(mb_ereg_replace('(%)', '\\\\1', 'a%c'));
 
 ?>

diff --git a/ext/mbstring/tests/casemapping.phpt b/ext/mbstring/tests/casemapping.phpt
index 3e2838392bf545309cc804bdb17ae35d980d2b51..df5e07bdfed0d0646bdc4a9475a78c3b57ebf28b 100644 (file)
--- a/ext/mbstring/tests/casemapping.phpt
+++ b/ext/mbstring/tests/casemapping.phpt
@@ -23,7 +23,7 @@ toCases("ff");
 toCases("İ");
 
 // Make sure that case-conversion in Turkish still works correctly.
-// Using the language-agnostic Unicode case mappins would result in
+// Using the language-agnostic Unicode case mappings would result in
 // characters that are illegal under ISO-8859-9.
 mb_internal_encoding('ISO-8859-9');
 

diff --git a/ext/mbstring/tests/mb_convert_encoding.phpt b/ext/mbstring/tests/mb_convert_encoding.phpt
index 31d8db5f4a1e6d0f95925cca30fc0d92d5973ea9..40b1dfed882b32ca90a45299f5902a9854802549 100644 (file)
--- a/ext/mbstring/tests/mb_convert_encoding.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding.phpt
@@ -16,8 +16,8 @@ $jis = base64_decode('GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4Iz
 // EUC-JP string
 $euc_jp = 'ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£';
 
-// Test with sigle "form encoding"
-// Note: For some reason it complains, results are differ. Not reserched.
+// Test with single "form encoding"
+// Note: For some reason it complains, results are different. Not researched.
 echo "== BASIC TEST ==\n";
 $s = $sjis;
 $s = mb_convert_encoding($s, 'EUC-JP', 'SJIS');

diff --git a/ext/mbstring/tests/mb_convert_variables.phpt b/ext/mbstring/tests/mb_convert_variables.phpt
index 830c6a7cd0dc539bbeab0fd8c8b3f7d649184700..bf8b59f3503f63479f847863453fa55024cd9b21 100644 (file)
--- a/ext/mbstring/tests/mb_convert_variables.phpt
+++ b/ext/mbstring/tests/mb_convert_variables.phpt
@@ -19,8 +19,8 @@ $jis = base64_decode('GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4Iz
 // EUC-JP string
 $euc_jp = 'ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£';
 
-// Test for single scaler
-echo "== SCALER TEST ==\n";
+// Test for single scalar
+echo "== SCALAR TEST ==\n";
 $s = $sjis;
 $encoding = mb_convert_variables('EUC-JP', 'SJIS', $s);
 print("$encoding\n"); // SJIS
@@ -116,8 +116,8 @@ print("$encoding\n"); // EUC-JP
 print("{$oo->s1}{$oo->s2}{$oo->s3}\n"); // Converted to EUC-JP
 
 
-// Test for scaler, array and object
-echo "== SCALER, ARRAY AND OBJECT TEST ==\n";
+// Test for scalar, array and object
+echo "== SCALAR, ARRAY AND OBJECT TEST ==\n";
 
 $s1 = $euc_jp;
 $s2 = $euc_jp;
@@ -134,7 +134,7 @@ print("{$oo->s1}{$oo->s2}{$oo->s3}\n"); // Converted to EUC-JP
 
 ?>
 --EXPECT--
-== SCALER TEST ==
+== SCALAR TEST ==
 SJIS
 ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
 JIS
@@ -155,7 +155,7 @@ EUC-JP
 ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
 EUC-JP
 ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-== SCALER, ARRAY AND OBJECT TEST ==
+== SCALAR, ARRAY AND OBJECT TEST ==
 EUC-JP
 ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
 ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£

diff --git a/ext/mbstring/tests/mb_detect_encoding.phpt b/ext/mbstring/tests/mb_detect_encoding.phpt
index 22f64fcfa56e0c2d0461a475d574707cfc8ef853..2134f3c8b578a9b7e04181d2dda712de8c15a5b1 100644 (file)
--- a/ext/mbstring/tests/mb_detect_encoding.phpt
+++ b/ext/mbstring/tests/mb_detect_encoding.phpt
@@ -15,8 +15,8 @@ $jis = base64_decode('GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4Iz
 // EUC-JP string
 $euc_jp = 'ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£';
 
-// Test with sigle "form encoding"
-// Note: For some reason it complains, results are differ. Not reserched.
+// Test with single "form encoding"
+// Note: For some reason it complains, results are different. Not researched.
 echo "== BASIC TEST ==\n";
 $s = $sjis;
 $s = mb_detect_encoding($s, 'SJIS');

diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt
index 655a5b059c3d66753558e60548c8dc1c46d3dfb4..9495305c799e90f6421a037448553648d95b7c04 100644 (file)
--- a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt
@@ -11,7 +11,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n
  * Test mb_encode_header() with different strings
  */
 
-echo "*** Testing mb_encode_mimeheader() : basic2 ***\n";
+echo "*** Testing mb_encode_mimeheader() : basic3 ***\n";
 
 //All strings are the same when displayed in their respective encodings
 $sjis_string = base64_decode('k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==');
@@ -35,7 +35,7 @@ foreach ($inputs as $lang => $input) {
 echo "Done";
 ?>
 --EXPECT--
-*** Testing mb_encode_mimeheader() : basic2 ***
+*** Testing mb_encode_mimeheader() : basic3 ***
 
 Language: SJIS
 -- Base 64: --