Skip to content

Commit 2afbacc

Browse files
nikicnikic
committed
Backport some intl stub changes from master
While we're not sure under what circumstances they would fail, they're fallible on the implementation level.
1 parent 88d6fbe commit 2afbacc

File tree

4 files changed

+41
-41
lines changed

4 files changed

+41
-41
lines changed

‎ext/intl/calendar/calendar.stub.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public static function createInstance($timezone = null, ?string $locale = null)
2020
public function equals(IntlCalendar $other) {}
2121

2222
/**
23-
* @return int
23+
* @return int|false
2424
* @alias intlcal_field_difference
2525
*/
2626
public function fieldDifference(float $timestamp, int $field) {}
@@ -56,19 +56,19 @@ public function clear(?int $field = null) {}
5656
public static function fromDateTime(DateTime|string $datetime, ?string $locale = null) {}
5757

5858
/**
59-
* @return int
59+
* @return int|false
6060
* @alias intlcal_get
6161
*/
6262
public function get(int $field) {}
6363

6464
/**
65-
* @return int
65+
* @return int|false
6666
* @alias intlcal_get_actual_maximum
6767
*/
6868
public function getActualMaximum(int $field) {}
6969

7070
/**
71-
* @return int
71+
* @return int|false
7272
* @alias intlcal_get_actual_minimum
7373
*/
7474
public function getActualMinimum(int $field) {}
@@ -80,7 +80,7 @@ public function getActualMinimum(int $field) {}
8080
public static function getAvailableLocales() {}
8181

8282
/**
83-
* @return int
83+
* @return int|false
8484
* @alias intlcal_get_day_of_week_type
8585
*/
8686
public function getDayOfWeekType(int $dayOfWeek) {}
@@ -98,13 +98,13 @@ public function getErrorCode() {}
9898
public function getErrorMessage() {}
9999

100100
/**
101-
* @return int
101+
* @return int|false
102102
* @alias intlcal_get_first_day_of_week
103103
*/
104104
public function getFirstDayOfWeek() {}
105105

106106
/**
107-
* @return int
107+
* @return int|false
108108
* @alias intlcal_get_greatest_minimum
109109
*/
110110
public function getGreatestMinimum(int $field) {}
@@ -116,25 +116,25 @@ public function getGreatestMinimum(int $field) {}
116116
public static function getKeywordValuesForLocale(string $keyword, string $locale, bool $onlyCommon) {}
117117

118118
/**
119-
* @return int
119+
* @return int|false
120120
* @alias intlcal_get_least_maximum
121121
*/
122122
public function getLeastMaximum(int $field) {}
123123

124124
/**
125-
* @return string
125+
* @return string|false
126126
* @alias intlcal_get_locale
127127
*/
128128
public function getLocale(int $type) {}
129129

130130
/**
131-
* @return int
131+
* @return int|false
132132
* @alias intlcal_get_maximum
133133
*/
134134
public function getMaximum(int $field) {}
135135

136136
/**
137-
* @return int
137+
* @return int|false
138138
* @alias intlcal_get_minimal_days_in_first_week
139139
*/
140140
public function getMinimalDaysInFirstWeek() {}
@@ -146,7 +146,7 @@ public function getMinimalDaysInFirstWeek() {}
146146
public function setMinimalDaysInFirstWeek(int $days) {}
147147

148148
/**
149-
* @return int
149+
* @return int|false
150150
* @alias intlcal_get_minimum
151151
*/
152152
public function getMinimum(int $field) {}
@@ -170,7 +170,7 @@ public function getRepeatedWallTimeOption() {}
170170
public function getSkippedWallTimeOption() {}
171171

172172
/**
173-
* @return float
173+
* @return float|false
174174
* @alias intlcal_get_time
175175
*/
176176
public function getTime() {}
@@ -188,7 +188,7 @@ public function getTimeZone() {}
188188
public function getType() {}
189189

190190
/**
191-
* @return int
191+
* @return int|false
192192
* @alias intlcal_get_weekend_transition
193193
*/
194194
public function getWeekendTransition(int $dayOfWeek) {}

‎ext/intl/calendar/calendar_arginfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 18a92d3af801f11e5c3b90e5d272fd98b3515c40 */
2+
* Stub hash: 9c4f78dc00000876a28250515573a34b44f082dc */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar___construct, 0, 0, 0)
55
ZEND_END_ARG_INFO()

‎ext/intl/php_intl.stub.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ function intlcal_get_now(): float {}
1717

1818
function intlcal_get_available_locales(): array {}
1919

20-
function intlcal_get(IntlCalendar $calendar, int $field): int {}
20+
function intlcal_get(IntlCalendar $calendar, int $field): int|false {}
2121

22-
function intlcal_get_time(IntlCalendar $calendar): float {}
22+
function intlcal_get_time(IntlCalendar $calendar): float|false {}
2323

2424
function intlcal_set_time(IntlCalendar $calendar, float $timestamp): bool {}
2525

@@ -39,35 +39,35 @@ function intlcal_roll(IntlCalendar $calendar, int $field, $value): bool {}
3939

4040
function intlcal_clear(IntlCalendar $calendar, ?int $field = null): bool {}
4141

42-
function intlcal_field_difference(IntlCalendar $calendar, float $timestamp, int $field): int {}
42+
function intlcal_field_difference(IntlCalendar $calendar, float $timestamp, int $field): int|false {}
4343

44-
function intlcal_get_actual_maximum(IntlCalendar $calendar, int $field): int {}
44+
function intlcal_get_actual_maximum(IntlCalendar $calendar, int $field): int|false {}
4545

46-
function intlcal_get_actual_minimum(IntlCalendar $calendar, int $field): int {}
46+
function intlcal_get_actual_minimum(IntlCalendar $calendar, int $field): int|false {}
4747

48-
function intlcal_get_day_of_week_type(IntlCalendar $calendar, int $dayOfWeek): int {}
48+
function intlcal_get_day_of_week_type(IntlCalendar $calendar, int $dayOfWeek): int|false {}
4949

50-
function intlcal_get_first_day_of_week(IntlCalendar $calendar): int {}
50+
function intlcal_get_first_day_of_week(IntlCalendar $calendar): int|false {}
5151

52-
function intlcal_get_least_maximum(IntlCalendar $calendar, int $field): int {}
52+
function intlcal_get_least_maximum(IntlCalendar $calendar, int $field): int|false {}
5353

54-
function intlcal_get_greatest_minimum(IntlCalendar $calendar, int $field): int {}
54+
function intlcal_get_greatest_minimum(IntlCalendar $calendar, int $field): int|false {}
5555

56-
function intlcal_get_locale(IntlCalendar $calendar, int $type): string {}
56+
function intlcal_get_locale(IntlCalendar $calendar, int $type): string|false {}
5757

58-
function intlcal_get_maximum(IntlCalendar $calendar, int $field): int {}
58+
function intlcal_get_maximum(IntlCalendar $calendar, int $field): int|false {}
5959

60-
function intlcal_get_minimal_days_in_first_week(IntlCalendar $calendar): int {}
60+
function intlcal_get_minimal_days_in_first_week(IntlCalendar $calendar): int|false {}
6161

6262
function intlcal_set_minimal_days_in_first_week(IntlCalendar $calendar, int $days): bool {}
6363

64-
function intlcal_get_minimum(IntlCalendar $calendar, int $field): int {}
64+
function intlcal_get_minimum(IntlCalendar $calendar, int $field): int|false {}
6565

6666
function intlcal_get_time_zone(IntlCalendar $calendar): IntlTimeZone|false {}
6767

6868
function intlcal_get_type(IntlCalendar $calendar): string {}
6969

70-
function intlcal_get_weekend_transition(IntlCalendar $calendar, int $dayOfWeek): int {}
70+
function intlcal_get_weekend_transition(IntlCalendar $calendar, int $dayOfWeek): int|false {}
7171

7272
function intlcal_in_daylight_time(IntlCalendar $calendar): bool {}
7373

‎ext/intl/php_intl_arginfo.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 7c89762dffb3a8b4aae51ea823af2494e7dd25d5 */
2+
* Stub hash: 9d40cc3b008e968f4ae28e147209095c698334a5 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_intlcal_create_instance, 0, 0, IntlCalendar, 1)
55
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timezone, "null")
@@ -18,12 +18,12 @@ ZEND_END_ARG_INFO()
1818
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_get_available_locales, 0, 0, IS_ARRAY, 0)
1919
ZEND_END_ARG_INFO()
2020

21-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_get, 0, 2, IS_LONG, 0)
21+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intlcal_get, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
2222
ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
2323
ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0)
2424
ZEND_END_ARG_INFO()
2525

26-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_get_time, 0, 1, IS_DOUBLE, 0)
26+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intlcal_get_time, 0, 1, MAY_BE_DOUBLE|MAY_BE_FALSE)
2727
ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
2828
ZEND_END_ARG_INFO()
2929

@@ -71,7 +71,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_clear, 0, 1, _IS_BOOL, 0
7171
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, field, IS_LONG, 1, "null")
7272
ZEND_END_ARG_INFO()
7373

74-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_field_difference, 0, 3, IS_LONG, 0)
74+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intlcal_field_difference, 0, 3, MAY_BE_LONG|MAY_BE_FALSE)
7575
ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
7676
ZEND_ARG_TYPE_INFO(0, timestamp, IS_DOUBLE, 0)
7777
ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0)
@@ -81,20 +81,20 @@ ZEND_END_ARG_INFO()
8181

8282
#define arginfo_intlcal_get_actual_minimum arginfo_intlcal_get
8383

84-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_get_day_of_week_type, 0, 2, IS_LONG, 0)
84+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intlcal_get_day_of_week_type, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
8585
ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
8686
ZEND_ARG_TYPE_INFO(0, dayOfWeek, IS_LONG, 0)
8787
ZEND_END_ARG_INFO()
8888

89-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_get_first_day_of_week, 0, 1, IS_LONG, 0)
89+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intlcal_get_first_day_of_week, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
9090
ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
9191
ZEND_END_ARG_INFO()
9292

9393
#define arginfo_intlcal_get_least_maximum arginfo_intlcal_get
9494

9595
#define arginfo_intlcal_get_greatest_minimum arginfo_intlcal_get
9696

97-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_get_locale, 0, 2, IS_STRING, 0)
97+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intlcal_get_locale, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
9898
ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
9999
ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
100100
ZEND_END_ARG_INFO()
@@ -148,11 +148,13 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set_lenient, 0, 2, _IS_B
148148
ZEND_ARG_TYPE_INFO(0, lenient, _IS_BOOL, 0)
149149
ZEND_END_ARG_INFO()
150150

151-
#define arginfo_intlcal_get_repeated_wall_time_option arginfo_intlcal_get_first_day_of_week
151+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_get_repeated_wall_time_option, 0, 1, IS_LONG, 0)
152+
ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
153+
ZEND_END_ARG_INFO()
152154

153155
#define arginfo_intlcal_equals arginfo_intlcal_after
154156

155-
#define arginfo_intlcal_get_skipped_wall_time_option arginfo_intlcal_get_first_day_of_week
157+
#define arginfo_intlcal_get_skipped_wall_time_option arginfo_intlcal_get_repeated_wall_time_option
156158

157159
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_intlcal_set_repeated_wall_time_option, 0, 2, _IS_BOOL, 0)
158160
ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
@@ -170,9 +172,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_intlcal_to_date_time, 0, 1,
170172
ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
171173
ZEND_END_ARG_INFO()
172174

173-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intlcal_get_error_code, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
174-
ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)
175-
ZEND_END_ARG_INFO()
175+
#define arginfo_intlcal_get_error_code arginfo_intlcal_get_first_day_of_week
176176

177177
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_intlcal_get_error_message, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
178178
ZEND_ARG_OBJ_INFO(0, calendar, IntlCalendar, 0)

0 commit comments

Comments
 (0)