Update ext/calendar parameter names

Closes GH-6277.

diff --git a/ext/calendar/calendar.stub.php b/ext/calendar/calendar.stub.php
index baa2075beefd915236a9e32aa7a5622efe239e79..575784df37b929499d477716b39e41533c513f28 100644 (file)
--- a/ext/calendar/calendar.stub.php
+++ b/ext/calendar/calendar.stub.php
@@ -4,33 +4,33 @@
 
 function cal_days_in_month(int $calendar, int $month, int $year): int {}
 
-function cal_from_jd(int $jd, int $calendar): array {}
+function cal_from_jd(int $julian_day, int $calendar): array {}
 
 function cal_info(int $calendar = -1): array {}
 
 function cal_to_jd(int $calendar, int $month, int $day, int $year): int {}
 
-function easter_date(?int $year = null, int $method = CAL_EASTER_DEFAULT): int {}
+function easter_date(?int $year = null, int $mode = CAL_EASTER_DEFAULT): int {}
 
-function easter_days(?int $year = null, int $method = CAL_EASTER_DEFAULT): int {}
+function easter_days(?int $year = null, int $mode = CAL_EASTER_DEFAULT): int {}
 
 function frenchtojd(int $month, int $day, int $year): int {}
 
 function gregoriantojd(int $month, int $day, int $year): int {}
 
-function jddayofweek(int $juliandaycount, int $mode = CAL_DOW_DAYNO): int|string {}
+function jddayofweek(int $julian_day, int $mode = CAL_DOW_DAYNO): int|string {}
 
-function jdmonthname(int $juliandaycount, int $mode): string {}
+function jdmonthname(int $julian_day, int $mode): string {}
 
-function jdtofrench(int $juliandaycount): string {}
+function jdtofrench(int $julian_day): string {}
 
-function jdtogregorian(int $juliandaycount): string {}
+function jdtogregorian(int $julian_day): string {}
 
-function jdtojewish(int $juliandaycount, bool $hebrew = false, int $fl = 0): string {}
+function jdtojewish(int $julian_day, bool $hebrew = false, int $flags = 0): string {}
 
-function jdtojulian(int $juliandaycount): string {}
+function jdtojulian(int $julian_day): string {}
 
-function jdtounix(int $jday): int {}
+function jdtounix(int $julian_day): int {}
 
 function jewishtojd(int $month, int $day, int $year): int {}
 

diff --git a/ext/calendar/calendar_arginfo.h b/ext/calendar/calendar_arginfo.h
index 22f259833b6ccaa14caecc5d7dcd0b91f907da93..b8d5bfc95fec2d7f1eb8d8660165c95b8ab43ddc 100644 (file)
--- a/ext/calendar/calendar_arginfo.h
+++ b/ext/calendar/calendar_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 1ace9d7ae3e505ae2e14323e21fa6ac0a490896d */
+ * Stub hash: ced2659f54bb25693831315625fe90b33e2f7cbe */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_cal_days_in_month, 0, 3, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, calendar, IS_LONG, 0)
@@ -8,7 +8,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_cal_days_in_month, 0, 3, IS_LONG
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_cal_from_jd, 0, 2, IS_ARRAY, 0)
-       ZEND_ARG_TYPE_INFO(0, jd, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, julian_day, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, calendar, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
@@ -25,7 +25,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_easter_date, 0, 0, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, year, IS_LONG, 1, "null")
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, method, IS_LONG, 0, "CAL_EASTER_DEFAULT")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "CAL_EASTER_DEFAULT")
 ZEND_END_ARG_INFO()
 
 #define arginfo_easter_days arginfo_easter_date
@@ -39,31 +39,31 @@ ZEND_END_ARG_INFO()
 #define arginfo_gregoriantojd arginfo_frenchtojd
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_jddayofweek, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
-       ZEND_ARG_TYPE_INFO(0, juliandaycount, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, julian_day, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "CAL_DOW_DAYNO")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_jdmonthname, 0, 2, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, juliandaycount, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, julian_day, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_jdtofrench, 0, 1, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, juliandaycount, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, julian_day, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_jdtogregorian arginfo_jdtofrench
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_jdtojewish, 0, 1, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, juliandaycount, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, julian_day, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, hebrew, _IS_BOOL, 0, "false")
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fl, IS_LONG, 0, "0")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
 #define arginfo_jdtojulian arginfo_jdtofrench
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_jdtounix, 0, 1, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, jday, IS_LONG, 0)
+       ZEND_ARG_TYPE_INFO(0, julian_day, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_jewishtojd arginfo_frenchtojd