diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-02-17 08:55:18 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-02-17 08:55:18 +0100 |
| commit | 7d0102dfa70ca000af0cd4027e8c07a89ad14de2 (patch) | |
| tree | f4a1009c80c74629fe0763ddae74f4e5aff9a520 /ext/intl/calendar | |
| parent | de6984edd5ce7fa2b2f365b5ae770507ef42022d (diff) | |
| download | php-git-7d0102dfa70ca000af0cd4027e8c07a89ad14de2.tar.gz | |
Revert "Replace @param annotations with type declarations"
This reverts commit c31029f335ca1b453af799805c43c37e959ad555.
Diffstat (limited to 'ext/intl/calendar')
| -rw-r--r-- | ext/intl/calendar/calendar.stub.php | 6 | ||||
| -rw-r--r-- | ext/intl/calendar/calendar_arginfo.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ext/intl/calendar/calendar.stub.php b/ext/intl/calendar/calendar.stub.php index f057d579b6..267035e268 100644 --- a/ext/intl/calendar/calendar.stub.php +++ b/ext/intl/calendar/calendar.stub.php @@ -116,9 +116,10 @@ class IntlCalendar public function isWeekend(?float $date = null) {} /** + * @param int|bool $amountOrUpOrDown * @return bool */ - public function roll(int $field, int|bool $amountOrUpOrDown) {} + public function roll(int $field, $amountOrUpOrDown) {} /** @return bool */ public function isSet(int $field) {} @@ -197,7 +198,8 @@ function intlcal_before(IntlCalendar $calendarObject, IntlCalendar $calendar): b function intlcal_set(IntlCalendar $calendar, int $year, int $month, int $dayOfMonth = UNKNOWN, $hour = UNKNOWN, int $minute = UNKNOWN, int $second = UNKNOWN): bool {} -function intlcal_roll(IntlCalendar $calendar, int $field, int|bool $amountOrUpOrDown): bool {} +/** @param int|bool $amountOrUpOrDown */ +function intlcal_roll(IntlCalendar $calendar, int $field, $amountOrUpOrDown): bool {} function intlcal_clear(IntlCalendar $calendar, ?int $field = null): bool {} diff --git a/ext/intl/calendar/calendar_arginfo.h b/ext/intl/calendar/calendar_arginfo.h index 47bc248ff8..efe89030ec 100644 --- a/ext/intl/calendar/calendar_arginfo.h +++ b/ext/intl/calendar/calendar_arginfo.h @@ -105,7 +105,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar_roll, 0, 0, 2) ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0) - ZEND_ARG_TYPE_MASK(0, amountOrUpOrDown, MAY_BE_LONG|MAY_BE_BOOL) + ZEND_ARG_INFO(0, amountOrUpOrDown) ZEND_END_ARG_INFO() #define arginfo_class_IntlCalendar_isSet arginfo_class_IntlCalendar_get @@ -217,7 +217,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_roll, 0, 3, _IS_BOOL, 0) ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0) ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0) - ZEND_ARG_TYPE_MASK(0, amountOrUpOrDown, MAY_BE_LONG|MAY_BE_BOOL) + ZEND_ARG_INFO(0, amountOrUpOrDown) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_clear, 0, 1, _IS_BOOL, 0) |