Skip to content

Commit 397cde1

Browse files
viestviest
committed
PHP 8.0 arginfo warning
1 parent b935a65 commit 397cde1

File tree

3 files changed

+59
-25
lines changed

3 files changed

+59
-25
lines changed

‎kernel/chart.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ ZEND_END_ARG_INFO()
9090
ZEND_BEGIN_ARG_INFO_EX(chart_legend_set_position_arginfo, 0, 0, 1)
9191
ZEND_ARG_INFO(0, type)
9292
ZEND_END_ARG_INFO()
93+
94+
ZEND_BEGIN_ARG_INFO_EX(chart_to_resource_arginfo, 0, 0, 0)
95+
ZEND_END_ARG_INFO()
9396
/* }}} */
9497

9598
/** {{{ \Vtiful\Kernel\Chart::__construct(resource $handle, int $type)
@@ -279,7 +282,7 @@ zend_function_entry chart_methods[] = {
279282
PHP_ME(vtiful_chart, axisNameX, chart_axis_name_arginfo, ZEND_ACC_PUBLIC)
280283
PHP_ME(vtiful_chart, title, chart_title_name_arginfo, ZEND_ACC_PUBLIC)
281284
PHP_ME(vtiful_chart, legendSetPosition, chart_legend_set_position_arginfo, ZEND_ACC_PUBLIC)
282-
PHP_ME(vtiful_chart, toResource, NULL, ZEND_ACC_PUBLIC)
285+
PHP_ME(vtiful_chart, toResource, chart_to_resource_arginfo, ZEND_ACC_PUBLIC)
283286
PHP_FE_END
284287
};
285288
/* }}} */

‎kernel/excel.c‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,12 @@ ZEND_BEGIN_ARG_INFO_EX(xls_data_arginfo, 0, 0, 1)
9696
ZEND_ARG_INFO(0, data)
9797
ZEND_END_ARG_INFO()
9898

99+
ZEND_BEGIN_ARG_INFO_EX(xls_output_arginfo, 0, 0, 0)
100+
ZEND_END_ARG_INFO()
101+
102+
ZEND_BEGIN_ARG_INFO_EX(xls_get_handle_arginfo, 0, 0, 0)
103+
ZEND_END_ARG_INFO()
104+
99105
ZEND_BEGIN_ARG_INFO_EX(xls_insert_text_arginfo, 0, 0, 5)
100106
ZEND_ARG_INFO(0, row)
101107
ZEND_ARG_INFO(0, column)
@@ -189,6 +195,16 @@ ZEND_BEGIN_ARG_INFO_EX(xls_put_csv_callback_arginfo, 0, 0, 2)
189195
ZEND_ARG_INFO(0, escape_str)
190196
ZEND_END_ARG_INFO()
191197

198+
ZEND_BEGIN_ARG_INFO_EX(xls_sheet_list_arginfo, 0, 0, 0)
199+
ZEND_END_ARG_INFO()
200+
201+
ZEND_BEGIN_ARG_INFO_EX(xls_get_sheet_data_arginfo, 0, 0, 0)
202+
ZEND_END_ARG_INFO()
203+
204+
ZEND_BEGIN_ARG_INFO_EX(xls_next_row_arginfo, 0, 0, 0)
205+
ZEND_ARG_INFO(0, zv_type_t)
206+
ZEND_END_ARG_INFO()
207+
192208
ZEND_BEGIN_ARG_INFO_EX(xls_set_type_arginfo, 0, 0, 1)
193209
ZEND_ARG_INFO(0, zv_type_t)
194210
ZEND_END_ARG_INFO()
@@ -1092,11 +1108,11 @@ PHP_METHOD(vtiful_xls, getSheetData)
10921108
*/
10931109
PHP_METHOD(vtiful_xls, nextRow)
10941110
{
1095-
zval *zv_type = NULL;
1111+
zval *zv_type_t = NULL;
10961112

10971113
ZEND_PARSE_PARAMETERS_START(0, 1)
10981114
Z_PARAM_OPTIONAL
1099-
Z_PARAM_ARRAY(zv_type)
1115+
Z_PARAM_ARRAY(zv_type_t)
11001116
ZEND_PARSE_PARAMETERS_END();
11011117

11021118
xls_object *obj = Z_XLS_P(getThis());
@@ -1105,11 +1121,11 @@ PHP_METHOD(vtiful_xls, nextRow)
11051121
RETURN_FALSE;
11061122
}
11071123

1108-
if (zv_type == NULL) {
1109-
zv_type = zend_read_property(vtiful_xls_ce, getThis(), ZEND_STRL(V_XLS_TYPE), 0, NULL);
1124+
if (zv_type_t == NULL) {
1125+
zv_type_t = zend_read_property(vtiful_xls_ce, getThis(), ZEND_STRL(V_XLS_TYPE), 0, NULL);
11101126
}
11111127

1112-
load_sheet_current_row_data(obj->read_ptr.sheet_t, return_value, zv_type, READ_ROW);
1128+
load_sheet_current_row_data(obj->read_ptr.sheet_t, return_value, zv_type_t, READ_ROW);
11131129
}
11141130
/* }}} */
11151131

@@ -1156,8 +1172,8 @@ zend_function_entry xls_methods[] = {
11561172
PHP_ME(vtiful_xls, constMemory, xls_const_memory_arginfo, ZEND_ACC_PUBLIC)
11571173
PHP_ME(vtiful_xls, header, xls_header_arginfo, ZEND_ACC_PUBLIC)
11581174
PHP_ME(vtiful_xls, data, xls_data_arginfo, ZEND_ACC_PUBLIC)
1159-
PHP_ME(vtiful_xls, output, NULL, ZEND_ACC_PUBLIC)
1160-
PHP_ME(vtiful_xls, getHandle, NULL, ZEND_ACC_PUBLIC)
1175+
PHP_ME(vtiful_xls, output, xls_output_arginfo, ZEND_ACC_PUBLIC)
1176+
PHP_ME(vtiful_xls, getHandle, xls_get_handle_arginfo, ZEND_ACC_PUBLIC)
11611177
PHP_ME(vtiful_xls, autoFilter, xls_auto_filter_arginfo, ZEND_ACC_PUBLIC)
11621178
PHP_ME(vtiful_xls, insertText, xls_insert_text_arginfo, ZEND_ACC_PUBLIC)
11631179
PHP_ME(vtiful_xls, insertDate, xls_insert_date_arginfo, ZEND_ACC_PUBLIC)
@@ -1182,10 +1198,10 @@ zend_function_entry xls_methods[] = {
11821198
PHP_ME(vtiful_xls, openSheet, xls_open_sheet_arginfo, ZEND_ACC_PUBLIC)
11831199
PHP_ME(vtiful_xls, putCSV, xls_put_csv_arginfo, ZEND_ACC_PUBLIC)
11841200
PHP_ME(vtiful_xls, putCSVCallback, xls_put_csv_callback_arginfo, ZEND_ACC_PUBLIC)
1185-
PHP_ME(vtiful_xls, sheetList, NULL, ZEND_ACC_PUBLIC)
1201+
PHP_ME(vtiful_xls, sheetList, xls_sheet_list_arginfo, ZEND_ACC_PUBLIC)
11861202
PHP_ME(vtiful_xls, setType, xls_set_type_arginfo, ZEND_ACC_PUBLIC)
1187-
PHP_ME(vtiful_xls, getSheetData, NULL, ZEND_ACC_PUBLIC)
1188-
PHP_ME(vtiful_xls, nextRow, NULL, ZEND_ACC_PUBLIC)
1203+
PHP_ME(vtiful_xls, getSheetData, xls_get_sheet_data_arginfo, ZEND_ACC_PUBLIC)
1204+
PHP_ME(vtiful_xls, nextRow, xls_next_row_arginfo, ZEND_ACC_PUBLIC)
11891205
PHP_ME(vtiful_xls, nextCellCallback, xls_next_cell_callback_arginfo, ZEND_ACC_PUBLIC)
11901206
#endif
11911207

‎kernel/format.c‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,15 @@ ZEND_BEGIN_ARG_INFO_EX(format_construct_arginfo, 0, 0, 1)
5959
ZEND_ARG_INFO(0, handle)
6060
ZEND_END_ARG_INFO()
6161

62+
ZEND_BEGIN_ARG_INFO_EX(format_wrap_arginfo, 0, 0, 0)
63+
ZEND_END_ARG_INFO()
64+
65+
ZEND_BEGIN_ARG_INFO_EX(format_bold_arginfo, 0, 0, 0)
66+
ZEND_END_ARG_INFO()
67+
68+
ZEND_BEGIN_ARG_INFO_EX(format_italic_arginfo, 0, 0, 0)
69+
ZEND_END_ARG_INFO()
70+
6271
ZEND_BEGIN_ARG_INFO_EX(format_underline_arginfo, 0, 0, 1)
6372
ZEND_ARG_INFO(0, style)
6473
ZEND_END_ARG_INFO()
@@ -75,6 +84,9 @@ ZEND_BEGIN_ARG_INFO_EX(format_size_arginfo, 0, 0, 1)
7584
ZEND_ARG_INFO(0, size)
7685
ZEND_END_ARG_INFO()
7786

87+
ZEND_BEGIN_ARG_INFO_EX(format_strikeout_arginfo, 0, 0, 0)
88+
ZEND_END_ARG_INFO()
89+
7890
ZEND_BEGIN_ARG_INFO_EX(format_number_arginfo, 0, 0, 1)
7991
ZEND_ARG_INFO(0, format)
8092
ZEND_END_ARG_INFO()
@@ -91,6 +103,9 @@ ZEND_END_ARG_INFO()
91103
ZEND_BEGIN_ARG_INFO_EX(format_font_arginfo, 0, 0, 1)
92104
ZEND_ARG_INFO(0, font)
93105
ZEND_END_ARG_INFO()
106+
107+
ZEND_BEGIN_ARG_INFO_EX(format_to_resource_arginfo, 0, 0, 0)
108+
ZEND_END_ARG_INFO()
94109
/* }}} */
95110

96111
/** {{{ \Vtiful\Kernel\Format::__construct()
@@ -358,20 +373,20 @@ PHP_METHOD(vtiful_format, toResource)
358373
/** {{{ format_methods
359374
*/
360375
zend_function_entry format_methods[] = {
361-
PHP_ME(vtiful_format, __construct, format_construct_arginfo, ZEND_ACC_PUBLIC)
362-
PHP_ME(vtiful_format, wrap, NULL, ZEND_ACC_PUBLIC)
363-
PHP_ME(vtiful_format, bold, NULL, ZEND_ACC_PUBLIC)
364-
PHP_ME(vtiful_format, italic, NULL, ZEND_ACC_PUBLIC)
365-
PHP_ME(vtiful_format, border, format_border_arginfo, ZEND_ACC_PUBLIC)
366-
PHP_ME(vtiful_format, align, format_align_arginfo, ZEND_ACC_PUBLIC)
367-
PHP_ME(vtiful_format, number, format_number_arginfo, ZEND_ACC_PUBLIC)
368-
PHP_ME(vtiful_format, fontColor, format_color_arginfo, ZEND_ACC_PUBLIC)
369-
PHP_ME(vtiful_format, font, format_font_arginfo, ZEND_ACC_PUBLIC)
370-
PHP_ME(vtiful_format, fontSize, format_size_arginfo, ZEND_ACC_PUBLIC)
371-
PHP_ME(vtiful_format, strikeout, NULL, ZEND_ACC_PUBLIC)
372-
PHP_ME(vtiful_format, underline, format_underline_arginfo, ZEND_ACC_PUBLIC)
373-
PHP_ME(vtiful_format, toResource, NULL, ZEND_ACC_PUBLIC)
374-
PHP_ME(vtiful_format, background, format_background_arginfo, ZEND_ACC_PUBLIC)
376+
PHP_ME(vtiful_format, __construct, format_construct_arginfo, ZEND_ACC_PUBLIC)
377+
PHP_ME(vtiful_format, wrap, format_wrap_arginfo, ZEND_ACC_PUBLIC)
378+
PHP_ME(vtiful_format, bold, format_bold_arginfo, ZEND_ACC_PUBLIC)
379+
PHP_ME(vtiful_format, italic, format_italic_arginfo, ZEND_ACC_PUBLIC)
380+
PHP_ME(vtiful_format, border, format_border_arginfo, ZEND_ACC_PUBLIC)
381+
PHP_ME(vtiful_format, align, format_align_arginfo, ZEND_ACC_PUBLIC)
382+
PHP_ME(vtiful_format, number, format_number_arginfo, ZEND_ACC_PUBLIC)
383+
PHP_ME(vtiful_format, fontColor, format_color_arginfo, ZEND_ACC_PUBLIC)
384+
PHP_ME(vtiful_format, font, format_font_arginfo, ZEND_ACC_PUBLIC)
385+
PHP_ME(vtiful_format, fontSize, format_size_arginfo, ZEND_ACC_PUBLIC)
386+
PHP_ME(vtiful_format, strikeout, format_strikeout_arginfo, ZEND_ACC_PUBLIC)
387+
PHP_ME(vtiful_format, underline, format_underline_arginfo, ZEND_ACC_PUBLIC)
388+
PHP_ME(vtiful_format, toResource, format_to_resource_arginfo, ZEND_ACC_PUBLIC)
389+
PHP_ME(vtiful_format, background, format_background_arginfo, ZEND_ACC_PUBLIC)
375390
PHP_FE_END
376391
};
377392
/* }}} */

0 commit comments

Comments
 (0)