Skip to content

fix: Use worksheet_write_boolean for PHP boolean values #543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: Use worksheet_write_boolean for PHP boolean values #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9026fe0
Added detection and writing for boolean type
HergenD Nov 29, 2024
d3493a5
Updated test to include bool parsing
HergenD Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions kernel/write.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,25 @@ void type_writer(zval *value, zend_long row, zend_long columns, xls_resource_wri
WORKSHEET_WRITER_EXCEPTION(worksheet_write_number(res->worksheet, (lxw_row_t)row, (lxw_col_t)columns, zval_get_double(value), NULL));
return;
}

if (value_type == IS_TRUE || value_type == IS_FALSE) {
if (format != NULL && format_handle == NULL) {
WORKSHEET_WRITER_EXCEPTION(worksheet_write_boolean(res->worksheet, lxw_row, lxw_col, zend_is_true(value), format_handle));
return;
}

if (format == NULL && format_handle != NULL) {
WORKSHEET_WRITER_EXCEPTION(worksheet_write_boolean(res->worksheet, lxw_row, lxw_col, zend_is_true(value), format_handle));
return;
}

if(format != NULL && format_handle != NULL) {
WORKSHEET_WRITER_EXCEPTION(worksheet_write_boolean(res->worksheet, lxw_row, lxw_col, zend_is_true(value), format_handle));
return;
}

WORKSHEET_WRITER_EXCEPTION(worksheet_write_boolean(res->worksheet, lxw_row, lxw_col, zend_is_true(value), NULL));
}
}

/*
Expand Down
6 changes: 3 additions & 3 deletions tests/018.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ $excel = new \Vtiful\Kernel\Excel($config);

$fileObject = $excel->fileName("18.xlsx");

$fileObject->header(['name', 'age'])
->data([['viest', 21]])
->data([['wjx', 21]]);
$fileObject->header(['name', 'age', 'active'])
->data([['viest', 21, true]])
->data([['wjx', 21, false]]);

$filePath = $fileObject->output();

Expand Down