Review parameter names in ext/gettext

Closes GH-6241

diff --git a/ext/gettext/gettext.stub.php b/ext/gettext/gettext.stub.php
index 7e4bec8c9ac27c76a46ae1a33527ef33c14b9148..6c06d1881dc926f61e195154a193ff436ae3f087 100644 (file)
--- a/ext/gettext/gettext.stub.php
+++ b/ext/gettext/gettext.stub.php
@@ -4,27 +4,27 @@
 
 function textdomain(?string $domain): string {}
 
-function gettext(string $msgid): string {}
+function gettext(string $message): string {}
 
 /** @alias gettext */
-function _(string $msgid): string {}
+function _(string $message): string {}
 
-function dgettext(string $domain, string $msgid): string {}
+function dgettext(string $domain, string $message): string {}
 
-function dcgettext(string $domain, string $msgid, int $category): string {}
+function dcgettext(string $domain, string $message, int $category): string {}
 
-function bindtextdomain(string $domain, string $dir): string|false {}
+function bindtextdomain(string $domain, string $directory): string|false {}
 
 #ifdef HAVE_NGETTEXT
-function ngettext(string $msgid1, string $msgid2, int $n): string {}
+function ngettext(string $singular, string $plural, int $count): string {}
 #endif
 
 #ifdef HAVE_DNGETTEXT
-function dngettext(string $domain, string $msgid1, string $msgid2, int $count): string {}
+function dngettext(string $domain, string $singular, string $plural, int $count): string {}
 #endif
 
 #ifdef HAVE_DCNGETTEXT
-function dcngettext(string $domain, string $msgid1, string $msgid2, int $count, int $category): string {}
+function dcngettext(string $domain, string $singular, string $plural, int $count, int $category): string {}
 #endif
 
 #ifdef HAVE_BIND_TEXTDOMAIN_CODESET

diff --git a/ext/gettext/gettext_arginfo.h b/ext/gettext/gettext_arginfo.h
index b0a8664196050a8d4d65c3ad6a2e9e6b9ee39ff4..a00e361bc9c649bc69235755adbfc993fb2b0377 100644 (file)
--- a/ext/gettext/gettext_arginfo.h
+++ b/ext/gettext/gettext_arginfo.h
@@ -1,45 +1,45 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: a8b64ae24724f0552a62cd4146f6cfb3cd75fa19 */
+ * Stub hash: 7d0fe93cb15576756edc5aad71deadae67046690 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_textdomain, 0, 1, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, domain, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_gettext, 0, 1, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, msgid, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo__ arginfo_gettext
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_dgettext, 0, 2, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, domain, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, msgid, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_dcgettext, 0, 3, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, domain, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, msgid, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, category, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_bindtextdomain, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
        ZEND_ARG_TYPE_INFO(0, domain, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, dir, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, directory, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #if defined(HAVE_NGETTEXT)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ngettext, 0, 3, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, msgid1, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, msgid2, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, n, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, singular, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, plural, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, count, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_DNGETTEXT)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_dngettext, 0, 4, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, domain, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, msgid1, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, msgid2, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, singular, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, plural, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, count, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 #endif
@@ -47,8 +47,8 @@ ZEND_END_ARG_INFO()
 #if defined(HAVE_DCNGETTEXT)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_dcngettext, 0, 5, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, domain, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, msgid1, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, msgid2, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, singular, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, plural, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, count, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, category, IS_LONG, 0)
 ZEND_END_ARG_INFO()

diff --git a/ext/gettext/tests/44938.phpt b/ext/gettext/tests/44938.phpt
index 1de644a9339c2603b691f80fa79259f60203fc94..c1f1c18a41818192315d110cf84809f90d6fd0e7 100644 (file)
--- a/ext/gettext/tests/44938.phpt
+++ b/ext/gettext/tests/44938.phpt
@@ -106,16 +106,16 @@ try {
 --EXPECT--
 bindtextdomain(): Argument #1 ($domain) is too long
 dngettext(): Argument #1 ($domain) is too long
-dngettext(): Argument #2 ($msgid1) is too long
-dngettext(): Argument #3 ($msgid2) is too long
-gettext(): Argument #1 ($msgid) is too long
-ngettext(): Argument #1 ($msgid1) is too long
-ngettext(): Argument #2 ($msgid2) is too long
+dngettext(): Argument #2 ($singular) is too long
+dngettext(): Argument #3 ($plural) is too long
+gettext(): Argument #1 ($message) is too long
+ngettext(): Argument #1 ($singular) is too long
+ngettext(): Argument #2 ($plural) is too long
 dcgettext(): Argument #1 ($domain) is too long
-dcgettext(): Argument #2 ($msgid) is too long
+dcgettext(): Argument #2 ($message) is too long
 dcngettext(): Argument #1 ($domain) is too long
-dcngettext(): Argument #2 ($msgid1) is too long
-dcngettext(): Argument #3 ($msgid2) is too long
+dcngettext(): Argument #2 ($singular) is too long
+dcngettext(): Argument #3 ($plural) is too long
 dgettext(): Argument #1 ($domain) is too long
-dgettext(): Argument #2 ($msgid) is too long
+dgettext(): Argument #2 ($message) is too long
 textdomain(): Argument #1 ($domain) is too long