From 27e83d0fb87c04b61441fb77e963dd4e14ad187e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Fri, 8 Nov 2019 23:29:12 +0100
Subject: Add union return types for function stubs

---
 ext/gettext/gettext.stub.php  | 27 +++++++++------------------
 ext/gettext/gettext_arginfo.h | 18 +++++++++---------
 2 files changed, 18 insertions(+), 27 deletions(-)

(limited to 'ext/gettext')

diff --git a/ext/gettext/gettext.stub.php b/ext/gettext/gettext.stub.php
index a1c09d2bd9..16315f0033 100644
--- a/ext/gettext/gettext.stub.php
+++ b/ext/gettext/gettext.stub.php
@@ -1,36 +1,27 @@
 <?php
 
-/** @return string|false */
-function textdomain(?string $domain) {}
+function textdomain(?string $domain): string|false {}
 
-/** @return string|false */
-function gettext(string $msgid) {}
+function gettext(string $msgid): string|false {}
 
-/** @return string|false */
-function dgettext(string $domain_name, string $msgid) {}
+function dgettext(string $domain_name, string $msgid): string|false {}
 
-/** @return string|false */
-function dcgettext(string $domain_name, string $msgid, int $category) {}
+function dcgettext(string $domain_name, string $msgid, int $category): string|false {}
 
-/** @return string|false */
-function bindtextdomain(string $domain_name, string $dir) {}
+function bindtextdomain(string $domain_name, string $dir): string|false {}
 
 #if HAVE_NGETTEXT
-/** @return string|false */
-function ngettext(string $msgid1, string $msgid2, int $n) {}
+function ngettext(string $msgid1, string $msgid2, int $n): string|false {}
 #endif
 
 #if HAVE_DNGETTEXT
-/** @return string|false */
-function dngettext(string $domain, string $msgid1, string $msgid2, int $count) {}
+function dngettext(string $domain, string $msgid1, string $msgid2, int $count): string|false {}
 #endif
 
 #if HAVE_DCNGETTEXT
-/** @return string|false */
-function dcngettext(string $domain, string $msgid1, string $msgid2, int $count, int $category) {}
+function dcngettext(string $domain, string $msgid1, string $msgid2, int $count, int $category): string|false {}
 #endif
 
 #if HAVE_BIND_TEXTDOMAIN_CODESET
-/** @return string|false */
-function bind_textdomain_codeset(string $domain, string $codeset) {}
+function bind_textdomain_codeset(string $domain, string $codeset): string|false {}
 #endif
diff --git a/ext/gettext/gettext_arginfo.h b/ext/gettext/gettext_arginfo.h
index ee248aafae..d3c4374b4a 100644
--- a/ext/gettext/gettext_arginfo.h
+++ b/ext/gettext/gettext_arginfo.h
@@ -1,31 +1,31 @@
 /* This is a generated file, edit the .stub.php file instead. */
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_textdomain, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_textdomain, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, domain, IS_STRING, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_gettext, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_gettext, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, msgid, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_dgettext, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_dgettext, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, domain_name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, msgid, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_dcgettext, 0, 0, 3)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_dcgettext, 0, 3, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, domain_name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, msgid, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, category, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_bindtextdomain, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_bindtextdomain, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, domain_name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, dir, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #if HAVE_NGETTEXT
-ZEND_BEGIN_ARG_INFO_EX(arginfo_ngettext, 0, 0, 3)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ngettext, 0, 3, MAY_BE_STRING|MAY_BE_FALSE)
 	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)
@@ -33,7 +33,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_DNGETTEXT
-ZEND_BEGIN_ARG_INFO_EX(arginfo_dngettext, 0, 0, 4)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_dngettext, 0, 4, MAY_BE_STRING|MAY_BE_FALSE)
 	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)
@@ -42,7 +42,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_DCNGETTEXT
-ZEND_BEGIN_ARG_INFO_EX(arginfo_dcngettext, 0, 0, 5)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_dcngettext, 0, 5, MAY_BE_STRING|MAY_BE_FALSE)
 	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)
@@ -52,7 +52,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_BIND_TEXTDOMAIN_CODESET
-ZEND_BEGIN_ARG_INFO_EX(arginfo_bind_textdomain_codeset, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_bind_textdomain_codeset, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, domain, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, codeset, IS_STRING, 0)
 ZEND_END_ARG_INFO()
-- 
cgit v1.2.1