archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Declare array|int and object-of-class|int types in stubs

Browse source 
Closes GH-6081

Co-Authored-By: Nikita Popov <nikic@php.net>
This commit is contained in:
Máté Kocsis 2020-09-14 11:59:32 +02:00
parent 1c81a34563
commit 46c0c82a0f
No known key found for this signature in database
GPG key ID: FD055E41728BF310
29 changed files with 463 additions and 279 deletions
Download patch file Download diff file Expand all files Collapse all files

28
ext/intl/dateformat/dateformat_helpers.cpp
View file

@ -28,28 +28,22 @@ extern "C" {
using icu::GregorianCalendar;
int datefmt_process_calendar_arg(zval* calendar_zv,
Locale const& locale,
const char *func_name,
intl_error *err,
Calendar*& cal,
zend_long& cal_int_type,
bool& calendar_owned)
{
int datefmt_process_calendar_arg(
zend_object *calendar_obj, zend_long calendar_long, zend_bool calendar_is_null, Locale const& locale,
const char *func_name, intl_error *err, Calendar*& cal, zend_long& cal_int_type, bool& calendar_owned
) {
char *msg;
UErrorCode status = UErrorCode();
if (calendar_zv == NULL || Z_TYPE_P(calendar_zv) == IS_NULL) {
if (calendar_is_null) {
// default requested
cal = new GregorianCalendar(locale, status);
calendar_owned = true;
cal_int_type = UCAL_GREGORIAN;
} else if (Z_TYPE_P(calendar_zv) == IS_LONG) {
zend_long v = Z_LVAL_P(calendar_zv);
} else if (!calendar_obj) {
zend_long v = calendar_long;
if (v != (zend_long)UCAL_TRADITIONAL && v != (zend_long)UCAL_GREGORIAN) {
spprintf(&msg, 0, "%s: Invalid value for calendar type; it must be "
"one of IntlDateFormatter::TRADITIONAL (locale's default "
@ -66,12 +60,10 @@ int datefmt_process_calendar_arg(zval* calendar_zv,
}
calendar_owned = true;
cal_int_type = Z_LVAL_P(calendar_zv);
cal_int_type = calendar_long;
} else if (Z_TYPE_P(calendar_zv) == IS_OBJECT &&
instanceof_function(Z_OBJCE_P(calendar_zv), Calendar_ce_ptr)) {
cal = calendar_fetch_native_calendar(calendar_zv);
} else if (calendar_obj) {
cal = calendar_fetch_native_calendar(calendar_obj);
if (cal == NULL) {
spprintf(&msg, 0, "%s: Found unconstructed IntlCalendar object",
func_name);