Generate function entries from stubs for a couple of extensions

Closes GH-5347

Author: kocsismate

ext/bcmath/bcmath.c

@@ -33,24 +33,10 @@ ZEND_DECLARE_MODULE_GLOBALS(bcmath)
 static PHP_GINIT_FUNCTION(bcmath);
 static PHP_GSHUTDOWN_FUNCTION(bcmath);
 
-static const zend_function_entry bcmath_functions[] = {
-	PHP_FE(bcadd,									arginfo_bcadd)
-	PHP_FE(bcsub,									arginfo_bcsub)
-	PHP_FE(bcmul,									arginfo_bcmul)
-	PHP_FE(bcdiv,									arginfo_bcdiv)
-	PHP_FE(bcmod,									arginfo_bcmod)
-	PHP_FE(bcpow,									arginfo_bcpow)
-	PHP_FE(bcsqrt,									arginfo_bcsqrt)
-	PHP_FE(bcscale,									arginfo_bcscale)
-	PHP_FE(bccomp,									arginfo_bccomp)
-	PHP_FE(bcpowmod,								arginfo_bcpowmod)
-	PHP_FE_END
-};
-
 zend_module_entry bcmath_module_entry = {
 	STANDARD_MODULE_HEADER,
 	"bcmath",
-	bcmath_functions,
+	ext_functions,
 	PHP_MINIT(bcmath),
 	PHP_MSHUTDOWN(bcmath),
 	NULL,

ext/bcmath/bcmath.stub.php

@@ -1,5 +1,7 @@
 <?php
 
+/** @generate-function-entries */
+
 function bcadd(string $left_operand, string $right_operand, int $scale = UNKNOWN): string {}
 
 function bcsub(string $left_operand, string $right_operand, int $scale = UNKNOWN): string {}

ext/bcmath/bcmath_arginfo.h

@@ -45,3 +45,30 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_bcscale, 0, 0, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, scale, IS_LONG, 0)
 ZEND_END_ARG_INFO()
+
+
+ZEND_FUNCTION(bcadd);
+ZEND_FUNCTION(bcsub);
+ZEND_FUNCTION(bcmul);
+ZEND_FUNCTION(bcdiv);
+ZEND_FUNCTION(bcmod);
+ZEND_FUNCTION(bcpowmod);
+ZEND_FUNCTION(bcpow);
+ZEND_FUNCTION(bcsqrt);
+ZEND_FUNCTION(bccomp);
+ZEND_FUNCTION(bcscale);
+
+
+static const zend_function_entry ext_functions[] = {
+	ZEND_FE(bcadd, arginfo_bcadd)
+	ZEND_FE(bcsub, arginfo_bcsub)
+	ZEND_FE(bcmul, arginfo_bcmul)
+	ZEND_FE(bcdiv, arginfo_bcdiv)
+	ZEND_FE(bcmod, arginfo_bcmod)
+	ZEND_FE(bcpowmod, arginfo_bcpowmod)
+	ZEND_FE(bcpow, arginfo_bcpow)
+	ZEND_FE(bcsqrt, arginfo_bcsqrt)
+	ZEND_FE(bccomp, arginfo_bccomp)
+	ZEND_FE(bcscale, arginfo_bcscale)
+	ZEND_FE_END
+};

ext/bcmath/php_bcmath.h

@@ -29,17 +29,6 @@ PHP_MINIT_FUNCTION(bcmath);
 PHP_MSHUTDOWN_FUNCTION(bcmath);
 PHP_MINFO_FUNCTION(bcmath);
 
-PHP_FUNCTION(bcadd);
-PHP_FUNCTION(bcsub);
-PHP_FUNCTION(bcmul);
-PHP_FUNCTION(bcdiv);
-PHP_FUNCTION(bcmod);
-PHP_FUNCTION(bcpow);
-PHP_FUNCTION(bcsqrt);
-PHP_FUNCTION(bccomp);
-PHP_FUNCTION(bcscale);
-PHP_FUNCTION(bcpowmod);
-
 ZEND_BEGIN_MODULE_GLOBALS(bcmath)
 	bc_num _zero_;
 	bc_num _one_;

ext/calendar/calendar.c

@@ -35,33 +35,10 @@
 #undef CAL_GREGORIAN
 #endif
 
-static const zend_function_entry calendar_functions[] = {
-	PHP_FE(jdtogregorian, arginfo_jdtogregorian)
-	PHP_FE(gregoriantojd, arginfo_gregoriantojd)
-	PHP_FE(jdtojulian, arginfo_jdtojulian)
-	PHP_FE(juliantojd, arginfo_juliantojd)
-	PHP_FE(jdtojewish, arginfo_jdtojewish)
-	PHP_FE(jewishtojd, arginfo_jewishtojd)
-	PHP_FE(jdtofrench, arginfo_jdtofrench)
-	PHP_FE(frenchtojd, arginfo_frenchtojd)
-	PHP_FE(jddayofweek, arginfo_jddayofweek)
-	PHP_FE(jdmonthname, arginfo_jdmonthname)
-	PHP_FE(easter_date, arginfo_easter_date)
-	PHP_FE(easter_days, arginfo_easter_days)
-	PHP_FE(unixtojd, arginfo_unixtojd)
-	PHP_FE(jdtounix, arginfo_jdtounix)
-	PHP_FE(cal_to_jd, arginfo_cal_to_jd)
-	PHP_FE(cal_from_jd, arginfo_cal_from_jd)
-	PHP_FE(cal_days_in_month, arginfo_cal_days_in_month)
-	PHP_FE(cal_info, arginfo_cal_info)
-	PHP_FE_END
-};
-
-
 zend_module_entry calendar_module_entry = {
 	STANDARD_MODULE_HEADER,
 	"calendar",
-	calendar_functions,
+	ext_functions,
 	PHP_MINIT(calendar),
 	NULL,
 	NULL,

ext/calendar/calendar.stub.php

@@ -1,5 +1,7 @@
 <?php
 
+/** @generate-function-entries */
+
 function cal_days_in_month(int $calendar, int $month, int $year): int {}
 
 function cal_from_jd(int $jd, int $calendar): array {}

ext/calendar/calendar_arginfo.h

@@ -72,3 +72,46 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_unixtojd, 0, 0, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, timestamp, IS_LONG, 0)
 ZEND_END_ARG_INFO()
+
+
+ZEND_FUNCTION(cal_days_in_month);
+ZEND_FUNCTION(cal_from_jd);
+ZEND_FUNCTION(cal_info);
+ZEND_FUNCTION(cal_to_jd);
+ZEND_FUNCTION(easter_date);
+ZEND_FUNCTION(easter_days);
+ZEND_FUNCTION(frenchtojd);
+ZEND_FUNCTION(gregoriantojd);
+ZEND_FUNCTION(jddayofweek);
+ZEND_FUNCTION(jdmonthname);
+ZEND_FUNCTION(jdtofrench);
+ZEND_FUNCTION(jdtogregorian);
+ZEND_FUNCTION(jdtojewish);
+ZEND_FUNCTION(jdtojulian);
+ZEND_FUNCTION(jdtounix);
+ZEND_FUNCTION(jewishtojd);
+ZEND_FUNCTION(juliantojd);
+ZEND_FUNCTION(unixtojd);
+
+
+static const zend_function_entry ext_functions[] = {
+	ZEND_FE(cal_days_in_month, arginfo_cal_days_in_month)
+	ZEND_FE(cal_from_jd, arginfo_cal_from_jd)
+	ZEND_FE(cal_info, arginfo_cal_info)
+	ZEND_FE(cal_to_jd, arginfo_cal_to_jd)
+	ZEND_FE(easter_date, arginfo_easter_date)
+	ZEND_FE(easter_days, arginfo_easter_days)
+	ZEND_FE(frenchtojd, arginfo_frenchtojd)
+	ZEND_FE(gregoriantojd, arginfo_gregoriantojd)
+	ZEND_FE(jddayofweek, arginfo_jddayofweek)
+	ZEND_FE(jdmonthname, arginfo_jdmonthname)
+	ZEND_FE(jdtofrench, arginfo_jdtofrench)
+	ZEND_FE(jdtogregorian, arginfo_jdtogregorian)
+	ZEND_FE(jdtojewish, arginfo_jdtojewish)
+	ZEND_FE(jdtojulian, arginfo_jdtojulian)
+	ZEND_FE(jdtounix, arginfo_jdtounix)
+	ZEND_FE(jewishtojd, arginfo_jewishtojd)
+	ZEND_FE(juliantojd, arginfo_juliantojd)
+	ZEND_FE(unixtojd, arginfo_unixtojd)
+	ZEND_FE_END
+};

ext/calendar/php_calendar.h

@@ -12,25 +12,6 @@ extern zend_module_entry calendar_module_entry;
 PHP_MINIT_FUNCTION(calendar);
 PHP_MINFO_FUNCTION(calendar);
 
-PHP_FUNCTION(jdtogregorian);
-PHP_FUNCTION(gregoriantojd);
-PHP_FUNCTION(jdtojulian);
-PHP_FUNCTION(juliantojd);
-PHP_FUNCTION(jdtojewish);
-PHP_FUNCTION(jewishtojd);
-PHP_FUNCTION(jdtofrench);
-PHP_FUNCTION(frenchtojd);
-PHP_FUNCTION(jddayofweek);
-PHP_FUNCTION(jdmonthname);
-PHP_FUNCTION(easter_days);
-PHP_FUNCTION(easter_date);
-PHP_FUNCTION(unixtojd);
-PHP_FUNCTION(jdtounix);
-PHP_FUNCTION(cal_from_jd);
-PHP_FUNCTION(cal_to_jd);
-PHP_FUNCTION(cal_days_in_month);
-PHP_FUNCTION(cal_info);
-
 #define phpext_calendar_ptr calendar_module_ptr
 
 /*

ext/ctype/ctype.c

@@ -31,44 +31,14 @@
 
 static PHP_MINFO_FUNCTION(ctype);
 
-static PHP_FUNCTION(ctype_alnum);
-static PHP_FUNCTION(ctype_alpha);
-static PHP_FUNCTION(ctype_cntrl);
-static PHP_FUNCTION(ctype_digit);
-static PHP_FUNCTION(ctype_lower);
-static PHP_FUNCTION(ctype_graph);
-static PHP_FUNCTION(ctype_print);
-static PHP_FUNCTION(ctype_punct);
-static PHP_FUNCTION(ctype_space);
-static PHP_FUNCTION(ctype_upper);
-static PHP_FUNCTION(ctype_xdigit);
-/* }}} */
-
-/* {{{ ctype_functions[]
- * Every user visible function must have an entry in ctype_functions[].
- */
-static const zend_function_entry ctype_functions[] = {
-	PHP_FE(ctype_alnum,	arginfo_ctype_alnum)
-	PHP_FE(ctype_alpha,	arginfo_ctype_alpha)
-	PHP_FE(ctype_cntrl,	arginfo_ctype_cntrl)
-	PHP_FE(ctype_digit,	arginfo_ctype_digit)
-	PHP_FE(ctype_lower,	arginfo_ctype_lower)
-	PHP_FE(ctype_graph,	arginfo_ctype_graph)
-	PHP_FE(ctype_print,	arginfo_ctype_print)
-	PHP_FE(ctype_punct,	arginfo_ctype_punct)
-	PHP_FE(ctype_space,	arginfo_ctype_space)
-	PHP_FE(ctype_upper,	arginfo_ctype_upper)
-	PHP_FE(ctype_xdigit,	arginfo_ctype_xdigit)
-	PHP_FE_END
-};
 /* }}} */
 
 /* {{{ ctype_module_entry
  */
 zend_module_entry ctype_module_entry = {
 	STANDARD_MODULE_HEADER,
 	"ctype",
-	ctype_functions,
+	ext_functions,
 	NULL,
 	NULL,
 	NULL,
@@ -129,87 +99,87 @@ static PHP_MINFO_FUNCTION(ctype)
 
 /* {{{ proto bool ctype_alnum(mixed c)
    Checks for alphanumeric character(s) */
-static PHP_FUNCTION(ctype_alnum)
+PHP_FUNCTION(ctype_alnum)
 {
 	CTYPE(isalnum, 1, 0);
 }
 /* }}} */
 
 /* {{{ proto bool ctype_alpha(mixed c)
    Checks for alphabetic character(s) */
-static PHP_FUNCTION(ctype_alpha)
+PHP_FUNCTION(ctype_alpha)
 {
 	CTYPE(isalpha, 0, 0);
 }
 /* }}} */
 
 /* {{{ proto bool ctype_cntrl(mixed c)
    Checks for control character(s) */
-static PHP_FUNCTION(ctype_cntrl)
+PHP_FUNCTION(ctype_cntrl)
 {
 	CTYPE(iscntrl, 0, 0);
 }
 /* }}} */
 
 /* {{{ proto bool ctype_digit(mixed c)
    Checks for numeric character(s) */
-static PHP_FUNCTION(ctype_digit)
+PHP_FUNCTION(ctype_digit)
 {
 	CTYPE(isdigit, 1, 0);
 }
 /* }}} */
 
 /* {{{ proto bool ctype_lower(mixed c)
    Checks for lowercase character(s)  */
-static PHP_FUNCTION(ctype_lower)
+PHP_FUNCTION(ctype_lower)
 {
 	CTYPE(islower, 0, 0);
 }
 /* }}} */
 
 /* {{{ proto bool ctype_graph(mixed c)
    Checks for any printable character(s) except space */
-static PHP_FUNCTION(ctype_graph)
+PHP_FUNCTION(ctype_graph)
 {
 	CTYPE(isgraph, 1, 1);
 }
 /* }}} */
 
 /* {{{ proto bool ctype_print(mixed c)
    Checks for printable character(s) */
-static PHP_FUNCTION(ctype_print)
+PHP_FUNCTION(ctype_print)
 {
 	CTYPE(isprint, 1, 1);
 }
 /* }}} */
 
 /* {{{ proto bool ctype_punct(mixed c)
    Checks for any printable character which is not whitespace or an alphanumeric character */
-static PHP_FUNCTION(ctype_punct)
+PHP_FUNCTION(ctype_punct)
 {
 	CTYPE(ispunct, 0, 0);
 }
 /* }}} */
 
 /* {{{ proto bool ctype_space(mixed c)
    Checks for whitespace character(s)*/
-static PHP_FUNCTION(ctype_space)
+PHP_FUNCTION(ctype_space)
 {
 	CTYPE(isspace, 0, 0);
 }
 /* }}} */
 
 /* {{{ proto bool ctype_upper(mixed c)
    Checks for uppercase character(s) */
-static PHP_FUNCTION(ctype_upper)
+PHP_FUNCTION(ctype_upper)
 {
 	CTYPE(isupper, 0, 0);
 }
 /* }}} */
 
 /* {{{ proto bool ctype_xdigit(mixed c)
    Checks for character(s) representing a hexadecimal digit */
-static PHP_FUNCTION(ctype_xdigit)
+PHP_FUNCTION(ctype_xdigit)
 {
 	CTYPE(isxdigit, 1, 0);
 }

ext/ctype/ctype.stub.php

@@ -1,5 +1,7 @@
 <?php
 
+/** @generate-function-entries */
+
 function ctype_alnum($text): bool {}
 
 function ctype_alpha($text): bool {}

ext/ctype/ctype_arginfo.h

@@ -23,3 +23,32 @@ ZEND_END_ARG_INFO()
 #define arginfo_ctype_upper arginfo_ctype_alnum
 
 #define arginfo_ctype_xdigit arginfo_ctype_alnum
+
+
+ZEND_FUNCTION(ctype_alnum);
+ZEND_FUNCTION(ctype_alpha);
+ZEND_FUNCTION(ctype_cntrl);
+ZEND_FUNCTION(ctype_digit);
+ZEND_FUNCTION(ctype_lower);
+ZEND_FUNCTION(ctype_graph);
+ZEND_FUNCTION(ctype_print);
+ZEND_FUNCTION(ctype_punct);
+ZEND_FUNCTION(ctype_space);
+ZEND_FUNCTION(ctype_upper);
+ZEND_FUNCTION(ctype_xdigit);
+
+
+static const zend_function_entry ext_functions[] = {
+	ZEND_FE(ctype_alnum, arginfo_ctype_alnum)
+	ZEND_FE(ctype_alpha, arginfo_ctype_alpha)
+	ZEND_FE(ctype_cntrl, arginfo_ctype_cntrl)
+	ZEND_FE(ctype_digit, arginfo_ctype_digit)
+	ZEND_FE(ctype_lower, arginfo_ctype_lower)
+	ZEND_FE(ctype_graph, arginfo_ctype_graph)
+	ZEND_FE(ctype_print, arginfo_ctype_print)
+	ZEND_FE(ctype_punct, arginfo_ctype_punct)
+	ZEND_FE(ctype_space, arginfo_ctype_space)
+	ZEND_FE(ctype_upper, arginfo_ctype_upper)
+	ZEND_FE(ctype_xdigit, arginfo_ctype_xdigit)
+	ZEND_FE_END
+};