summaryrefslogtreecommitdiff
path: root/ext/gettext
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-10-15 04:33:09 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-10-15 04:33:09 +0200
commitd679f02295ea079338f029b7f5f4cb65b37f190c (patch)
tree53c519e1f829913a54d9dcea004721a3714cea26 /ext/gettext
parente84662c35cffaa95ead4322bfe9d61815c185722 (diff)
downloadphp-git-d679f02295ea079338f029b7f5f4cb65b37f190c.tar.gz
Sync leading and final newlines in *.phpt sections
This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines in all *.phpt sections. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
Diffstat (limited to 'ext/gettext')
-rw-r--r--ext/gettext/tests/44938.phpt1
-rw-r--r--ext/gettext/tests/bug66267.phpt1
-rw-r--r--ext/gettext/tests/gettext_basic-enus.phpt2
-rw-r--r--ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt2
-rw-r--r--ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt2
-rw-r--r--ext/gettext/tests/gettext_bindtextdomain-emptydomain.phpt2
-rw-r--r--ext/gettext/tests/gettext_bindtextdomain-path.phpt2
-rw-r--r--ext/gettext/tests/gettext_bindtextdomain-wrongparams.phpt2
-rw-r--r--ext/gettext/tests/gettext_dcgettext-wrongparams.phpt2
-rw-r--r--ext/gettext/tests/gettext_dcgettext.phpt2
-rw-r--r--ext/gettext/tests/gettext_dngettext-plural.phpt2
-rw-r--r--ext/gettext/tests/gettext_dngettext-wrongparams.phpt2
-rw-r--r--ext/gettext/tests/gettext_textdomain-retval.phpt3
-rw-r--r--ext/gettext/tests/gettext_textdomain-wrongparams.phpt2
14 files changed, 12 insertions, 15 deletions
diff --git a/ext/gettext/tests/44938.phpt b/ext/gettext/tests/44938.phpt
index f2d594aa5c..f92f7c1dea 100644
--- a/ext/gettext/tests/44938.phpt
+++ b/ext/gettext/tests/44938.phpt
@@ -37,7 +37,6 @@ var_dump(textdomain($overflown));
?>
==DONE==
--EXPECTF--
-
Warning: bindtextdomain(): domain passed too long in %s on line %d
bool(false)
diff --git a/ext/gettext/tests/bug66267.phpt b/ext/gettext/tests/bug66267.phpt
index de16b65d9e..17d7d58d39 100644
--- a/ext/gettext/tests/bug66267.phpt
+++ b/ext/gettext/tests/bug66267.phpt
@@ -53,4 +53,3 @@ LC_ALL=en_US
hello=hello
==DONE==
-
diff --git a/ext/gettext/tests/gettext_basic-enus.phpt b/ext/gettext/tests/gettext_basic-enus.phpt
index 207739b3f8..12ef33ab05 100644
--- a/ext/gettext/tests/gettext_basic-enus.phpt
+++ b/ext/gettext/tests/gettext_basic-enus.phpt
@@ -25,4 +25,4 @@ A basic test
A basic test
--CREDITS--
Christian Weiske, cweiske@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt b/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt
index 15107fe0f9..822e412d83 100644
--- a/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt
+++ b/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt
@@ -19,4 +19,4 @@ string(5) "UTF-8"
Done
--CREDITS--
Florian Holzhauer fh-pt@fholzhauer.de
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt b/ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt
index 0361f45e91..2feb2b2c28 100644
--- a/ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt
+++ b/ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt
@@ -20,4 +20,4 @@ Warning: bind_textdomain_codeset() expects exactly 2 parameters, 3 given in %s o
Done
--CREDITS--
Florian Holzhauer fh-pt@fholzhauer.de
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_bindtextdomain-emptydomain.phpt b/ext/gettext/tests/gettext_bindtextdomain-emptydomain.phpt
index 0ebe66e9fd..d8b8794e5a 100644
--- a/ext/gettext/tests/gettext_bindtextdomain-emptydomain.phpt
+++ b/ext/gettext/tests/gettext_bindtextdomain-emptydomain.phpt
@@ -13,4 +13,4 @@ bindtextdomain('', 'foobar');
Warning: The first parameter of bindtextdomain must not be empty in %s on line %d
--CREDITS--
Till Klampaeckel, till@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_bindtextdomain-path.phpt b/ext/gettext/tests/gettext_bindtextdomain-path.phpt
index 8bc1854e04..97c9fbb39c 100644
--- a/ext/gettext/tests/gettext_bindtextdomain-path.phpt
+++ b/ext/gettext/tests/gettext_bindtextdomain-path.phpt
@@ -13,4 +13,4 @@ var_dump(bindtextdomain('example.org', 'foobar'));
bool(false)
--CREDITS--
Till Klampaeckel, till@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_bindtextdomain-wrongparams.phpt b/ext/gettext/tests/gettext_bindtextdomain-wrongparams.phpt
index 97939a469d..1c9fb26194 100644
--- a/ext/gettext/tests/gettext_bindtextdomain-wrongparams.phpt
+++ b/ext/gettext/tests/gettext_bindtextdomain-wrongparams.phpt
@@ -16,4 +16,4 @@ Warning: bindtextdomain() expects exactly 2 parameters, 1 given in %s on line %d
Warning: bindtextdomain() expects exactly 2 parameters, 0 given in %s on line %d
--CREDITS--
Till Klampaeckel, till@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_dcgettext-wrongparams.phpt b/ext/gettext/tests/gettext_dcgettext-wrongparams.phpt
index 372a95740d..c5e8f02622 100644
--- a/ext/gettext/tests/gettext_dcgettext-wrongparams.phpt
+++ b/ext/gettext/tests/gettext_dcgettext-wrongparams.phpt
@@ -13,4 +13,4 @@ Warning: dcgettext() expects exactly 3 parameters, 2 given in %s on line %d
NULL
--CREDITS--
Christian Weiske, cweiske@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_dcgettext.phpt b/ext/gettext/tests/gettext_dcgettext.phpt
index c74194db2d..cdf185600d 100644
--- a/ext/gettext/tests/gettext_dcgettext.phpt
+++ b/ext/gettext/tests/gettext_dcgettext.phpt
@@ -22,4 +22,4 @@ string(8) "cProdukt"
string(7) "Produkt"
--CREDITS--
Christian Weiske, cweiske@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_dngettext-plural.phpt b/ext/gettext/tests/gettext_dngettext-plural.phpt
index 0417c0ed52..86548117fd 100644
--- a/ext/gettext/tests/gettext_dngettext-plural.phpt
+++ b/ext/gettext/tests/gettext_dngettext-plural.phpt
@@ -21,4 +21,4 @@ string(7) "Produkt"
string(8) "Produkte"
--CREDITS--
Till Klampaeckel, till@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_dngettext-wrongparams.phpt b/ext/gettext/tests/gettext_dngettext-wrongparams.phpt
index 4bcf0930b0..787b0b3af3 100644
--- a/ext/gettext/tests/gettext_dngettext-wrongparams.phpt
+++ b/ext/gettext/tests/gettext_dngettext-wrongparams.phpt
@@ -20,4 +20,4 @@ Warning: dngettext() expects exactly 4 parameters, 3 given in %s on line %d
NULL
--CREDITS--
Till Klampaeckel, till@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_textdomain-retval.phpt b/ext/gettext/tests/gettext_textdomain-retval.phpt
index 35f23b0d53..5795556046 100644
--- a/ext/gettext/tests/gettext_textdomain-retval.phpt
+++ b/ext/gettext/tests/gettext_textdomain-retval.phpt
@@ -20,10 +20,9 @@ echo textdomain(null), "\n";
echo textdomain('foo'), "\n";
?>
--EXPECT--
-
test
test
foo
--CREDITS--
Christian Weiske, cweiske@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/gettext/tests/gettext_textdomain-wrongparams.phpt b/ext/gettext/tests/gettext_textdomain-wrongparams.phpt
index 9d6c8ec515..e563e7b210 100644
--- a/ext/gettext/tests/gettext_textdomain-wrongparams.phpt
+++ b/ext/gettext/tests/gettext_textdomain-wrongparams.phpt
@@ -22,4 +22,4 @@ textdomain (array());
Warning: textdomain() expects parameter 1 to be string, array given in %s on line 6
--CREDITS--
Christian Weiske, cweiske@php.net
-PHP Testfest Berlin 2009-05-09 \ No newline at end of file
+PHP Testfest Berlin 2009-05-09