summaryrefslogtreecommitdiff
path: root/ext/iconv
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-10-14 17:23:43 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-10-14 19:44:14 +0200
commit17ccbeec3242b80f84fbf6b3acd58421ef003b02 (patch)
tree8fed8d7515c6603fd4a50eb0f8177883bc6da336 /ext/iconv
parentcc7215f48f66982f0b7799c47d8fa4c09a32a3c7 (diff)
downloadphp-git-17ccbeec3242b80f84fbf6b3acd58421ef003b02.tar.gz
Trim trailing whitespace in *.phpt
Diffstat (limited to 'ext/iconv')
-rw-r--r--ext/iconv/tests/bug37176.phpt4
-rw-r--r--ext/iconv/tests/bug37773.phpt4
-rw-r--r--ext/iconv/tests/bug52211.phpt2
-rw-r--r--ext/iconv/tests/eucjp2utf8.phpt2
-rw-r--r--ext/iconv/tests/iconv002.phpt2
-rw-r--r--ext/iconv/tests/iconv003.phpt2
-rw-r--r--ext/iconv/tests/iconv_basic.phpt4
-rw-r--r--ext/iconv/tests/iconv_encoding_basic.phpt4
-rw-r--r--ext/iconv/tests/iconv_get_encoding_error.phpt8
-rw-r--r--ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt4
-rw-r--r--ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt4
-rw-r--r--ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt4
-rw-r--r--ext/iconv/tests/iconv_mime_decode_variation1.phpt4
-rw-r--r--ext/iconv/tests/iconv_mime_decode_variation2.phpt4
-rw-r--r--ext/iconv/tests/iconv_mime_decode_variation3.phpt4
-rw-r--r--ext/iconv/tests/iconv_set_encoding_error.phpt6
-rw-r--r--ext/iconv/tests/iconv_set_encoding_variation.phpt6
-rw-r--r--ext/iconv/tests/iconv_strlen_basic.phpt2
-rw-r--r--ext/iconv/tests/iconv_strlen_error1.phpt2
-rw-r--r--ext/iconv/tests/iconv_strlen_error2.phpt2
-rw-r--r--ext/iconv/tests/iconv_strlen_variation1.phpt30
-rw-r--r--ext/iconv/tests/iconv_strlen_variation2.phpt6
-rw-r--r--ext/iconv/tests/iconv_strpos_basic.phpt2
-rw-r--r--ext/iconv/tests/iconv_strpos_error1.phpt2
-rw-r--r--ext/iconv/tests/iconv_strpos_error2.phpt2
-rw-r--r--ext/iconv/tests/iconv_strpos_variation1.phpt6
-rw-r--r--ext/iconv/tests/iconv_strpos_variation2.phpt6
-rw-r--r--ext/iconv/tests/iconv_strpos_variation3.phpt6
-rw-r--r--ext/iconv/tests/iconv_strpos_variation3_64bit.phpt6
-rw-r--r--ext/iconv/tests/iconv_strpos_variation4.phpt6
-rw-r--r--ext/iconv/tests/iconv_strpos_variation5.phpt4
-rw-r--r--ext/iconv/tests/iconv_strrpos_basic.phpt2
-rw-r--r--ext/iconv/tests/iconv_strrpos_error1.phpt2
-rw-r--r--ext/iconv/tests/iconv_strrpos_error2.phpt2
-rw-r--r--ext/iconv/tests/iconv_strrpos_variation1.phpt6
-rw-r--r--ext/iconv/tests/iconv_strrpos_variation2.phpt6
-rw-r--r--ext/iconv/tests/iconv_strrpos_variation3.phpt6
-rw-r--r--ext/iconv/tests/iconv_substr_basic.phpt4
-rw-r--r--ext/iconv/tests/iconv_substr_error1.phpt2
-rw-r--r--ext/iconv/tests/iconv_substr_error2.phpt2
-rw-r--r--ext/iconv/tests/translit-failure.phpt2
-rw-r--r--ext/iconv/tests/translit-utf8.phpt2
42 files changed, 93 insertions, 93 deletions
diff --git a/ext/iconv/tests/bug37176.phpt b/ext/iconv/tests/bug37176.phpt
index 70242fe091..c562ceac85 100644
--- a/ext/iconv/tests/bug37176.phpt
+++ b/ext/iconv/tests/bug37176.phpt
@@ -1,8 +1,8 @@
--TEST--
Bug #37176 (iconv_strpos() fails to find a string)
--SKIPIF--
-<?php
-include('skipif.inc');
+<?php
+include('skipif.inc');
$test = @iconv_strpos("abbttt","ttt",0,"UTF-8");
if ($test === false) {
diff --git a/ext/iconv/tests/bug37773.phpt b/ext/iconv/tests/bug37773.phpt
index d21e6fd0f8..f9a1d3470e 100644
--- a/ext/iconv/tests/bug37773.phpt
+++ b/ext/iconv/tests/bug37773.phpt
@@ -1,8 +1,8 @@
--TEST--
Bug #37773 (iconv_substr() gives "Unknown error" when string length = 1")
--SKIPIF--
-<?php
-include('skipif.inc');
+<?php
+include('skipif.inc');
$test = @iconv_strpos("abbttt","ttt",0,"UTF-8");
if ($test === false) {
diff --git a/ext/iconv/tests/bug52211.phpt b/ext/iconv/tests/bug52211.phpt
index c851cbad6a..f4fe747cde 100644
--- a/ext/iconv/tests/bug52211.phpt
+++ b/ext/iconv/tests/bug52211.phpt
@@ -1,7 +1,7 @@
--TEST--
Bug #52211 (iconv() returns part of string on error)
--SKIPIF--
-<?php
+<?php
include('skipif.inc');
?>
--FILE--
diff --git a/ext/iconv/tests/eucjp2utf8.phpt b/ext/iconv/tests/eucjp2utf8.phpt
index 4ffcfef516..38cfdd37b8 100644
--- a/ext/iconv/tests/eucjp2utf8.phpt
+++ b/ext/iconv/tests/eucjp2utf8.phpt
@@ -48,7 +48,7 @@ $str = "
日本語テキストとEnglish Text
";
-$str = iconv("EUC-JP", "UTF-8", $str); /* libiconv(1.8) doesn't know "UTF8" but "UTF-8". */
+$str = iconv("EUC-JP", "UTF-8", $str); /* libiconv(1.8) doesn't know "UTF8" but "UTF-8". */
$str = base64_encode($str);
echo $str."\n";
diff --git a/ext/iconv/tests/iconv002.phpt b/ext/iconv/tests/iconv002.phpt
index 034b3761fa..d49e5eccc2 100644
--- a/ext/iconv/tests/iconv002.phpt
+++ b/ext/iconv/tests/iconv002.phpt
@@ -4,7 +4,7 @@ iconv() test 2 (UCS4BE to ASCII)
<?php
include('skipif.inc');
if (@iconv("ascii","UCS-4LE", "abcd") == '') {
- die("skip conversion to UCS-4LE not supported");
+ die("skip conversion to UCS-4LE not supported");
}
?>
--INI--
diff --git a/ext/iconv/tests/iconv003.phpt b/ext/iconv/tests/iconv003.phpt
index 9642cf1e79..690c1569f9 100644
--- a/ext/iconv/tests/iconv003.phpt
+++ b/ext/iconv/tests/iconv003.phpt
@@ -4,7 +4,7 @@ iconv() test 3
<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
--FILE--
<?php
-for ($i = 0; $i < 3; ++$i) {
+for ($i = 0; $i < 3; ++$i) {
if (@iconv('blah', 'blah', 'blah') != '') {
die("failed\n");
}
diff --git a/ext/iconv/tests/iconv_basic.phpt b/ext/iconv/tests/iconv_basic.phpt
index 8669af040c..1c57cfbeff 100644
--- a/ext/iconv/tests/iconv_basic.phpt
+++ b/ext/iconv/tests/iconv_basic.phpt
@@ -1,5 +1,5 @@
--TEST--
-Test iconv() function : basic functionality
+Test iconv() function : basic functionality
--SKIPIF--
<?php
extension_loaded('iconv') or die('skip');
@@ -8,7 +8,7 @@ function_exists('iconv') or die("skip iconv() is not available in this build");
--FILE--
<?php
/* Prototype : string iconv(string in_charset, string out_charset, string str)
- * Description: Returns converted string in desired encoding
+ * Description: Returns converted string in desired encoding
* Source code: ext/iconv/iconv.c
*/
diff --git a/ext/iconv/tests/iconv_encoding_basic.phpt b/ext/iconv/tests/iconv_encoding_basic.phpt
index 35314f1e69..47d87ffc75 100644
--- a/ext/iconv/tests/iconv_encoding_basic.phpt
+++ b/ext/iconv/tests/iconv_encoding_basic.phpt
@@ -13,10 +13,10 @@ iconv.output_encoding=ISO-8859-1
--FILE--
<?php
/* Prototype : mixed iconv_get_encoding([string type])
- * Description: Get internal encoding and output encoding for ob_iconv_handler()
+ * Description: Get internal encoding and output encoding for ob_iconv_handler()
* Prototype : bool iconv_set_encoding(string type, string charset)
* Description: Sets internal encoding and output encoding for ob_iconv_handler()
- * Source code: ext/iconv/iconv.c
+ * Source code: ext/iconv/iconv.c
*/
/*
diff --git a/ext/iconv/tests/iconv_get_encoding_error.phpt b/ext/iconv/tests/iconv_get_encoding_error.phpt
index b0c3e0724d..0526fce2a5 100644
--- a/ext/iconv/tests/iconv_get_encoding_error.phpt
+++ b/ext/iconv/tests/iconv_get_encoding_error.phpt
@@ -8,8 +8,8 @@ function_exists('iconv_get_encoding') or die("skip iconv_get_encoding() is not a
--FILE--
<?php
/* Prototype : mixed iconv_get_encoding([string type])
- * Description: Get internal encoding and output encoding for ob_iconv_handler()
- * Source code: ext/iconv/iconv.c
+ * Description: Get internal encoding and output encoding for ob_iconv_handler()
+ * Source code: ext/iconv/iconv.c
*/
/*
@@ -63,7 +63,7 @@ $inputs = array(
false,
TRUE,
FALSE,
-
+
// empty data
/*16*/ "",
'',
@@ -72,7 +72,7 @@ $inputs = array(
/*18*/ "Nothing",
'Nothing',
$heredoc,
-
+
// object data
/*21*/ new classA(),
diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt
index 7cc32c7e70..5973ca0640 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt
@@ -81,7 +81,7 @@ $inputs = array(
false,
TRUE,
FALSE,
-
+
// empty data
/*16*/ "",
'',
@@ -90,7 +90,7 @@ $inputs = array(
/*18*/ "string",
'string',
$heredoc,
-
+
// object data
/*21*/ new classA(),
diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
index f89658a47d..54c39c1cd8 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
@@ -82,7 +82,7 @@ $inputs = array(
false,
TRUE,
FALSE,
-
+
// empty data
/*16*/ "",
'',
@@ -91,7 +91,7 @@ $inputs = array(
/*18*/ "string",
'string',
$heredoc,
-
+
// object data
/*21*/ new classA(),
diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
index 4ee232e835..3dc028b440 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
@@ -85,7 +85,7 @@ $inputs = array(
false,
TRUE,
FALSE,
-
+
// empty data
/*16*/ "",
'',
@@ -94,7 +94,7 @@ $inputs = array(
/*18*/ "string",
'string',
$heredoc,
-
+
// object data
/*21*/ new classA(),
diff --git a/ext/iconv/tests/iconv_mime_decode_variation1.phpt b/ext/iconv/tests/iconv_mime_decode_variation1.phpt
index 4d91d68add..f76593bda2 100644
--- a/ext/iconv/tests/iconv_mime_decode_variation1.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_variation1.phpt
@@ -69,7 +69,7 @@ $inputs = array(
false,
TRUE,
FALSE,
-
+
// empty data
/*16*/ "",
'',
@@ -78,7 +78,7 @@ $inputs = array(
/*18*/ "string",
'string',
$heredoc,
-
+
// object data
/*21*/ new classA(),
diff --git a/ext/iconv/tests/iconv_mime_decode_variation2.phpt b/ext/iconv/tests/iconv_mime_decode_variation2.phpt
index f4508e9860..fab5492298 100644
--- a/ext/iconv/tests/iconv_mime_decode_variation2.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_variation2.phpt
@@ -70,7 +70,7 @@ $inputs = array(
false,
TRUE,
FALSE,
-
+
// empty data
/*16*/ "",
'',
@@ -79,7 +79,7 @@ $inputs = array(
/*18*/ "string",
'string',
$heredoc,
-
+
// object data
/*21*/ new classA(),
diff --git a/ext/iconv/tests/iconv_mime_decode_variation3.phpt b/ext/iconv/tests/iconv_mime_decode_variation3.phpt
index c077aa10fa..cb20eea7d1 100644
--- a/ext/iconv/tests/iconv_mime_decode_variation3.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_variation3.phpt
@@ -72,7 +72,7 @@ $inputs = array(
false,
TRUE,
FALSE,
-
+
// empty data
/*16*/ "",
'',
@@ -81,7 +81,7 @@ $inputs = array(
/*18*/ "string",
'string',
$heredoc,
-
+
// object data
/*21*/ new classA(),
diff --git a/ext/iconv/tests/iconv_set_encoding_error.phpt b/ext/iconv/tests/iconv_set_encoding_error.phpt
index 4ba840067d..4176bf9165 100644
--- a/ext/iconv/tests/iconv_set_encoding_error.phpt
+++ b/ext/iconv/tests/iconv_set_encoding_error.phpt
@@ -9,7 +9,7 @@ function_exists('iconv_set_encoding') or die("skip iconv_set_encoding() is not a
<?php
/* Prototype : bool iconv_set_encoding(string type, string charset)
* Description: Sets internal encoding and output encoding for ob_iconv_handler()
- * Source code: ext/iconv/iconv.c
+ * Source code: ext/iconv/iconv.c
*/
/*
@@ -63,7 +63,7 @@ $inputs = array(
false,
TRUE,
FALSE,
-
+
// empty data
/*16*/ "",
'',
@@ -72,7 +72,7 @@ $inputs = array(
/*18*/ "Nothing",
'Nothing',
$heredoc,
-
+
// object data
/*21*/ new classA(),
diff --git a/ext/iconv/tests/iconv_set_encoding_variation.phpt b/ext/iconv/tests/iconv_set_encoding_variation.phpt
index 4e097569fd..906f46bc31 100644
--- a/ext/iconv/tests/iconv_set_encoding_variation.phpt
+++ b/ext/iconv/tests/iconv_set_encoding_variation.phpt
@@ -11,7 +11,7 @@ error_reporting=E_ALL & ~E_DEPRECATED
<?php
/* Prototype : bool iconv_set_encoding(string type, string charset)
* Description: Sets internal encoding and output encoding for ob_iconv_handler()
- * Source code: ext/iconv/iconv.c
+ * Source code: ext/iconv/iconv.c
*/
/*
@@ -65,7 +65,7 @@ $inputs = array(
false,
TRUE,
FALSE,
-
+
// empty data
/*16*/ "",
'',
@@ -74,7 +74,7 @@ $inputs = array(
/*18*/ "Nothing",
'Nothing',
$heredoc,
-
+
// object data
/*21*/ new classA(),
diff --git a/ext/iconv/tests/iconv_strlen_basic.phpt b/ext/iconv/tests/iconv_strlen_basic.phpt
index e5d6271f69..50ffbb1f46 100644
--- a/ext/iconv/tests/iconv_strlen_basic.phpt
+++ b/ext/iconv/tests/iconv_strlen_basic.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in
--FILE--
<?php
/* Prototype : int iconv_strlen(string str [, string charset])
- * Description: Get character numbers of a string
+ * Description: Get character numbers of a string
* Source code: ext/iconv/iconv.c
*/
diff --git a/ext/iconv/tests/iconv_strlen_error1.phpt b/ext/iconv/tests/iconv_strlen_error1.phpt
index 3c63b20f79..21b99c011d 100644
--- a/ext/iconv/tests/iconv_strlen_error1.phpt
+++ b/ext/iconv/tests/iconv_strlen_error1.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in
--FILE--
<?php
/* Prototype : int iconv_strlen(string str [, string charset])
- * Description: Get character numbers of a string
+ * Description: Get character numbers of a string
* Source code: ext/iconv/iconv.c
*/
diff --git a/ext/iconv/tests/iconv_strlen_error2.phpt b/ext/iconv/tests/iconv_strlen_error2.phpt
index 6c760b14c8..973efecb35 100644
--- a/ext/iconv/tests/iconv_strlen_error2.phpt
+++ b/ext/iconv/tests/iconv_strlen_error2.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in
--FILE--
<?php
/* Prototype : int iconv_strlen(string str [, string charset])
- * Description: Get character numbers of a string
+ * Description: Get character numbers of a string
* Source code: ext/iconv/iconv.c
*/
diff --git a/ext/iconv/tests/iconv_strlen_variation1.phpt b/ext/iconv/tests/iconv_strlen_variation1.phpt
index e3e25aa0dc..d6edf5b86d 100644
--- a/ext/iconv/tests/iconv_strlen_variation1.phpt
+++ b/ext/iconv/tests/iconv_strlen_variation1.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in
--FILE--
<?php
/* Prototype : int iconv_strlen(string str [, string charset])
- * Description: Get character numbers of a string
+ * Description: Get character numbers of a string
* Source code: ext/iconv/iconv.c
*/
@@ -45,14 +45,14 @@ $fp = fopen(__FILE__, "r");
$inputs = array(
// int data
-/*1*/
+/*1*/
'int 0' => 0,
'int 1' => 1,
'int 12345' => 12345,
'int -12345' => -12345,
// float data
-/*5*/
+/*5*/
'float 10.5' => 10.5,
'float -10.5' => -10.5,
'float 12.3456789000e10' => 12.3456789000e10,
@@ -60,39 +60,39 @@ $inputs = array(
'float .5' => .5,
// null data
-/*10*/
+/*10*/
'uppercase NULL' => NULL,
'lowercase null' => null,
-
+
// boolean data
-/*12*/
+/*12*/
'lowercase true' => true,
'lowercase false' =>false,
'uppercase TRUE' =>TRUE,
'uppercase FALSE' =>FALSE,
-
+
// empty data
-/*16*/
+/*16*/
'empty string DQ' => "",
'empty string SQ' => '',
-
+
// string data
-/*18*/
+/*18*/
'string DQ' => "string",
'string SQ' => 'string',
'mixed case string' => "sTrInG",
'heredoc' => $heredoc,
-
+
// object data
-/*21*/
+/*21*/
'instance of class' => new classA(),
-
+
// undefined data
-/*22*/
+/*22*/
'undefined var' => @$undefined_var,
// unset data
-/*23*/
+/*23*/
'unset var' => @$unset_var,
// resource variable
diff --git a/ext/iconv/tests/iconv_strlen_variation2.phpt b/ext/iconv/tests/iconv_strlen_variation2.phpt
index 85dd0483a6..be5afdc93b 100644
--- a/ext/iconv/tests/iconv_strlen_variation2.phpt
+++ b/ext/iconv/tests/iconv_strlen_variation2.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in
--FILE--
<?php
/* Prototype : int iconv_strlen(string str [, string charset])
- * Description: Get character numbers of a string
+ * Description: Get character numbers of a string
* Source code: ext/iconv/iconv.c
*/
@@ -67,7 +67,7 @@ $inputs = array(
false,
TRUE,
FALSE,
-
+
// empty data
/*16*/ "",
'',
@@ -76,7 +76,7 @@ $inputs = array(
/*18*/ "UTF-8",
'UTF-8',
$heredoc,
-
+
// object data
/*21*/ new classA(),
diff --git a/ext/iconv/tests/iconv_strpos_basic.phpt b/ext/iconv/tests/iconv_strpos_basic.phpt
index 1017f8e3b6..f6cd521f82 100644
--- a/ext/iconv/tests/iconv_strpos_basic.phpt
+++ b/ext/iconv/tests/iconv_strpos_basic.phpt
@@ -10,7 +10,7 @@ error_reporting=E_ALL & ~E_DEPRECATED
--FILE--
<?php
/* Prototype : int iconv_strpos(string haystack, string needle [, int offset [, string charset]])
- * Description: Find position of first occurrence of a string within another
+ * Description: Find position of first occurrence of a string within another
* Source code: ext/iconv/iconv.c
*/
diff --git a/ext/iconv/tests/iconv_strpos_error1.phpt b/ext/iconv/tests/iconv_strpos_error1.phpt
index 232466562c..dd0fe466d7 100644
--- a/ext/iconv/tests/iconv_strpos_error1.phpt
+++ b/ext/iconv/tests/iconv_strpos_error1.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in
--FILE--
<?php
/* Prototype : int iconv_strpos(string haystack, string needle [, int offset [, string charset]])
- * Description: Find position of first occurrence of a string within another
+ * Description: Find position of first occurrence of a string within another
* Source code: ext/iconv/iconv.c
*/
diff --git a/ext/iconv/tests/iconv_strpos_error2.phpt b/ext/iconv/tests/iconv_strpos_error2.phpt
index 01e728ad9e..91f2704903 100644
--- a/ext/iconv/tests/iconv_strpos_error2.phpt
+++ b/ext/iconv/tests/iconv_strpos_error2.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in
--FILE--
<?php
/* Prototype : int iconv_strpos(string haystack, string needle [, int offset [, string charset]])
- * Description: Find position of first occurrence of a string within another
+ * Description: Find position of first occurrence of a string within another
* Source code: ext/iconv/iconv.c
*/
diff --git a/ext/iconv/tests/iconv_strpos_variation1.phpt b/ext/iconv/tests/iconv_strpos_variation1.phpt
index 38dc353383..1eb8f7b21b 100644
--- a/ext/iconv/tests/iconv_strpos_variation1.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation1.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in
--FILE--
<?php
/* Prototype : int iconv_strpos(string haystack, string needle [, int offset [, string charset]])
- * Description: Find position of first occurrence of a string within another
+ * Description: Find position of first occurrence of a string within another
* Source code: ext/iconv/iconv.c
*/
@@ -68,7 +68,7 @@ $inputs = array(
false,
TRUE,
FALSE,
-
+
// empty data
/*16*/ "",
'',
@@ -77,7 +77,7 @@ $inputs = array(
/*18*/ "string",
'string',
$heredoc,
-
+
// object data
/*21*/ new classA(),
diff --git a/ext/iconv/tests/iconv_strpos_variation2.phpt b/ext/iconv/tests/iconv_strpos_variation2.phpt
index e702ca9869..798fe7f85c 100644
--- a/ext/iconv/tests/iconv_strpos_variation2.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation2.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in
--FILE--
<?php
/* Prototype : int iconv_strpos(string haystack, string needle [, int offset [, string charset]])
- * Description: Find position of first occurrence of a string within another
+ * Description: Find position of first occurrence of a string within another
* Source code: ext/iconv/iconv.c
*/
@@ -68,7 +68,7 @@ $inputs = array(
false,
TRUE,
FALSE,
-
+
// empty data
/*16*/ "",
'',
@@ -77,7 +77,7 @@ $inputs = array(
/*18*/ "string",
'string',
$heredoc,
-
+
// object data
/*21*/ new classA(),
diff --git a/ext/iconv/tests/iconv_strpos_variation3.phpt b/ext/iconv/tests/iconv_strpos_variation3.phpt
index ea889a07bd..4fdd4db65c 100644
--- a/ext/iconv/tests/iconv_strpos_variation3.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation3.phpt
@@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
--FILE--
<?php
/* Prototype : int iconv_strpos(string haystack, string needle [, int offset [, string charset]])
- * Description: Find position of first occurrence of a string within another
+ * Description: Find position of first occurrence of a string within another
* Source code: ext/iconv/iconv.c
*/
@@ -71,7 +71,7 @@ $inputs = array(
false,
TRUE,
FALSE,
-
+
// empty data
"",
'',
@@ -80,7 +80,7 @@ $inputs = array(
"string",
'string',
$heredoc,
-
+
// object data
new classA(),
diff --git a/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt b/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
index c4e3e141a1..abf8715ed6 100644
--- a/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
@@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
--FILE--
<?php
/* Prototype : int iconv_strpos(string haystack, string needle [, int offset [, string charset]])
- * Description: Find position of first occurrence of a string within another
+ * Description: Find position of first occurrence of a string within another
* Source code: ext/iconv/iconv.c
*/
@@ -71,7 +71,7 @@ $inputs = array(
false,
TRUE,
FALSE,
-
+
// empty data
"",
'',
@@ -80,7 +80,7 @@ $inputs = array(
"string",
'string',
$heredoc,
-
+
// object data
new classA(),
diff --git a/ext/iconv/tests/iconv_strpos_variation4.phpt b/ext/iconv/tests/iconv_strpos_variation4.phpt
index 539305541a..5a97c2a5ac 100644
--- a/ext/iconv/tests/iconv_strpos_variation4.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation4.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in
--FILE--
<?php
/* Prototype : int iconv_strpos(string haystack, string needle [, int offset [, string charset]])
- * Description: Find position of first occurrence of a string within another
+ * Description: Find position of first occurrence of a string within another
* Source code: ext/iconv/iconv.c
*/
@@ -70,7 +70,7 @@ $inputs = array(
false,
TRUE,
FALSE,
-
+
// empty data
/*16*/ "",
'',
@@ -79,7 +79,7 @@ $inputs = array(
/*18*/ "UTF-8",
'UTF-8',
$heredoc,
-
+
// object data
/*21*/ new classA(),
diff --git a/ext/iconv/tests/iconv_strpos_variation5.phpt b/ext/iconv/tests/iconv_strpos_variation5.phpt
index 759294f73a..7ada6fbb91 100644
--- a/ext/iconv/tests/iconv_strpos_variation5.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation5.phpt
@@ -10,13 +10,13 @@ error_reporting=E_ALL & ~E_DEPRECATED
--FILE--
<?php
/* Prototype : int iconv_strpos(string haystack, string needle [, int offset [, string charset]])
- * Description: Find position of first occurrence of a string within another
+ * Description: Find position of first occurrence of a string within another
* Source code: ext/iconv/iconv.c
*/
/*
* Test how iconv_strpos() behaves when passed different integers as $offset argument
- * The character length of $string_ascii and $string_mb is the same,
+ * The character length of $string_ascii and $string_mb is the same,
* and the needle appears at the same positions in both strings
*/
diff --git a/ext/iconv/tests/iconv_strrpos_basic.phpt b/ext/iconv/tests/iconv_strrpos_basic.phpt
index 78dfaa0db1..6f4991a462 100644
--- a/ext/iconv/tests/iconv_strrpos_basic.phpt
+++ b/ext/iconv/tests/iconv_strrpos_basic.phpt
@@ -10,7 +10,7 @@ error_reporting=E_ALL & ~E_DEPRECATED
--FILE--
<?php
/* Prototype : proto int iconv_strrpos(string haystack, string needle [, string charset])
- * Description: Find position of last occurrence of a string within another
+ * Description: Find position of last occurrence of a string within another
* Source code: ext/iconv/iconv.c
*/
diff --git a/ext/iconv/tests/iconv_strrpos_error1.phpt b/ext/iconv/tests/iconv_strrpos_error1.phpt
index 9d185c744d..b9a1820933 100644
--- a/ext/iconv/tests/iconv_strrpos_error1.phpt
+++ b/ext/iconv/tests/iconv_strrpos_error1.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available i
--FILE--
<?php
/* Prototype : proto int iconv_strrpos(string haystack, string needle [, string charset])
- * Description: Find position of last occurrence of a string within another
+ * Description: Find position of last occurrence of a string within another
* Source code: ext/iconv/iconv.c
*/
diff --git a/ext/iconv/tests/iconv_strrpos_error2.phpt b/ext/iconv/tests/iconv_strrpos_error2.phpt
index ea72322807..16b7a9def8 100644
--- a/ext/iconv/tests/iconv_strrpos_error2.phpt
+++ b/ext/iconv/tests/iconv_strrpos_error2.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available i
--FILE--
<?php
/* Prototype : proto int iconv_strrpos(string haystack, string needle [, string charset])
- * Description: Find position of last occurrence of a string within another
+ * Description: Find position of last occurrence of a string within another
* Source code: ext/iconv/iconv.c
*/
diff --git a/ext/iconv/tests/iconv_strrpos_variation1.phpt b/ext/iconv/tests/iconv_strrpos_variation1.phpt
index e4ed011339..573c2ea517 100644
--- a/ext/iconv/tests/iconv_strrpos_variation1.phpt
+++ b/ext/iconv/tests/iconv_strrpos_variation1.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available i
--FILE--
<?php
/* Prototype : proto int iconv_strrpos(string haystack, string needle [, string charset])
- * Description: Find position of last occurrence of a string within another
+ * Description: Find position of last occurrence of a string within another
* Source code: ext/iconv/iconv.c
*/
@@ -67,7 +67,7 @@ $inputs = array(
false,
TRUE,
FALSE,
-
+
// empty data
/*16*/ "",
'',
@@ -76,7 +76,7 @@ $inputs = array(
/*18*/ "hello, world",
'hello, world',
$heredoc,
-
+
// object data
/*21*/ new classA(),
diff --git a/ext/iconv/tests/iconv_strrpos_variation2.phpt b/ext/iconv/tests/iconv_strrpos_variation2.phpt
index a0001f5269..297a7589d3 100644
--- a/ext/iconv/tests/iconv_strrpos_variation2.phpt
+++ b/ext/iconv/tests/iconv_strrpos_variation2.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available i
--FILE--
<?php
/* Prototype : proto int iconv_strrpos(string haystack, string needle [, string charset])
- * Description: Find position of last occurrence of a string within another
+ * Description: Find position of last occurrence of a string within another
* Source code: ext/iconv/iconv.c
*/
@@ -67,7 +67,7 @@ $inputs = array(
false,
TRUE,
FALSE,
-
+
// empty data
/*16*/ "",
'',
@@ -76,7 +76,7 @@ $inputs = array(
/*18*/ "world",
'world',
$heredoc,
-
+
// object data
/*21*/ new classA(),
diff --git a/ext/iconv/tests/iconv_strrpos_variation3.phpt b/ext/iconv/tests/iconv_strrpos_variation3.phpt
index 373e905173..35e5056e0f 100644
--- a/ext/iconv/tests/iconv_strrpos_variation3.phpt
+++ b/ext/iconv/tests/iconv_strrpos_variation3.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available i
--FILE--
<?php
/* Prototype : proto int iconv_strrpos(string haystack, string needle [, string charset])
- * Description: Find position of last occurrence of a string within another
+ * Description: Find position of last occurrence of a string within another
* Source code: ext/iconv/iconv.c
*/
@@ -68,7 +68,7 @@ $inputs = array(
false,
TRUE,
FALSE,
-
+
// empty data
/*16*/ "",
'',
@@ -77,7 +77,7 @@ $inputs = array(
/*18*/ "UTF-8",
'UTF-8',
$heredoc,
-
+
// object data
/*21*/ new classA(),
diff --git a/ext/iconv/tests/iconv_substr_basic.phpt b/ext/iconv/tests/iconv_substr_basic.phpt
index 2e33c5aa9b..582529d54d 100644
--- a/ext/iconv/tests/iconv_substr_basic.phpt
+++ b/ext/iconv/tests/iconv_substr_basic.phpt
@@ -1,5 +1,5 @@
--TEST--
-Test iconv_substr() function : basic functionality
+Test iconv_substr() function : basic functionality
--SKIPIF--
<?php
extension_loaded('iconv') or die('skip');
@@ -12,7 +12,7 @@ iconv.output_encoding=ISO-8859-1
--FILE--
<?php
/* Prototype : string iconv_substr(string str, int offset, [int length, string charset])
- * Description: Returns part of a string
+ * Description: Returns part of a string
* Source code: ext/iconv/iconv.c
*/
diff --git a/ext/iconv/tests/iconv_substr_error1.phpt b/ext/iconv/tests/iconv_substr_error1.phpt
index 7a30c7d509..61c01dc0d0 100644
--- a/ext/iconv/tests/iconv_substr_error1.phpt
+++ b/ext/iconv/tests/iconv_substr_error1.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_substr') or die("skip iconv_substr() is not available in
--FILE--
<?php
/* Prototype : string iconv_substr(string str, int offset, [int length, string charset])
- * Description: Returns part of a string
+ * Description: Returns part of a string
* Source code: ext/iconv/iconv.c
*/
diff --git a/ext/iconv/tests/iconv_substr_error2.phpt b/ext/iconv/tests/iconv_substr_error2.phpt
index ac5081331b..0bc0661026 100644
--- a/ext/iconv/tests/iconv_substr_error2.phpt
+++ b/ext/iconv/tests/iconv_substr_error2.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_substr') or die("skip iconv_substr() is not available in
--FILE--
<?php
/* Prototype : string iconv_substr(string str, int offset, [int length, string charset])
- * Description: Returns part of a string
+ * Description: Returns part of a string
* Source code: ext/iconv/iconv.c
*/
diff --git a/ext/iconv/tests/translit-failure.phpt b/ext/iconv/tests/translit-failure.phpt
index d8b9fbff83..2132e7e130 100644
--- a/ext/iconv/tests/translit-failure.phpt
+++ b/ext/iconv/tests/translit-failure.phpt
@@ -3,7 +3,7 @@ Translit failure
--SKIPIF--
<?php
include('skipif.inc');
-( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\"");
+( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\"");
?>
--INI--
error_reporting=2039
diff --git a/ext/iconv/tests/translit-utf8.phpt b/ext/iconv/tests/translit-utf8.phpt
index 0151dc385c..c363eeeab6 100644
--- a/ext/iconv/tests/translit-utf8.phpt
+++ b/ext/iconv/tests/translit-utf8.phpt
@@ -3,7 +3,7 @@ Translit UTF-8 quotes
--SKIPIF--
<?php
include('skipif.inc');
-( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\"");
+( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\"");
?>
--INI--
error_reporting=2047