Skip to content

Commit 5ec02a7

Browse files
committed
Fix for PACKED array on PHP 8.2
1 parent be2ddc6 commit 5ec02a7

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

kernel/excel.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,8 @@ PHP_METHOD(vtiful_xls, header)
627627
*/
628628
PHP_METHOD(vtiful_xls, data)
629629
{
630-
zend_ulong column_index = 0;
630+
zend_ulong column_index = 0, index;
631+
zend_string *key;
631632
zval *data = NULL, *data_r_value = NULL;
632633

633634
ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -651,17 +652,16 @@ PHP_METHOD(vtiful_xls, data)
651652

652653
column_index = 0;
653654

654-
ZEND_HASH_FOREACH_BUCKET(Z_ARRVAL_P(data_r_value), Bucket *bucket)
655+
ZEND_HASH_FOREACH_KEY_VAL_IND(Z_ARRVAL_P(data_r_value), index, key, data) {
655656
// numeric index rewriting
656-
if (bucket->key == NULL) {
657-
column_index = bucket->h;
657+
if (key == NULL) {
658+
column_index = index;
658659
}
659-
660-
type_writer(&bucket->val, SHEET_CURRENT_LINE(obj), column_index, &obj->write_ptr, NULL, obj->format_ptr.format);
660+
type_writer(data, SHEET_CURRENT_LINE(obj), column_index, &obj->write_ptr, NULL, obj->format_ptr.format);
661661

662662
// next number index
663663
++column_index;
664-
ZEND_HASH_FOREACH_END();
664+
} ZEND_HASH_FOREACH_END();
665665

666666
SHEET_LINE_ADD(obj)
667667
ZEND_HASH_FOREACH_END();

0 commit comments

Comments
 (0)