Skip to content

Commit 62e0200

Browse files
committed
Merge branch 'PHP-8.1'
* PHP-8.1: Make IntlCalendar::roll() return type tentative
2 parents dd73e5a + 4fcca03 commit 62e0200

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

ext/intl/calendar/calendar.stub.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ public function isWeekend(?float $timestamp = null): bool {}
220220
/**
221221
* @param int|bool $value
222222
* @alias intlcal_roll
223+
* @tentative-return-type
223224
*/
224225
public function roll(int $field, $value): bool {}
225226

ext/intl/calendar/calendar_arginfo.h

Lines changed: 2 additions & 2 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: 1f47fca82af35929e8cbcb9b2b9979c4c03f658c */
2+
* Stub hash: 2265c2a4f478d6ccd576ce09a19a158df38a2bdb */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IntlCalendar___construct, 0, 0, 0)
55
ZEND_END_ARG_INFO()
@@ -113,7 +113,7 @@ ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlCalendar_isW
113113
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timestamp, IS_DOUBLE, 1, "null")
114114
ZEND_END_ARG_INFO()
115115

116-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_IntlCalendar_roll, 0, 2, _IS_BOOL, 0)
116+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_IntlCalendar_roll, 0, 2, _IS_BOOL, 0)
117117
ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0)
118118
ZEND_ARG_INFO(0, value)
119119
ZEND_END_ARG_INFO()

0 commit comments

Comments
 (0)