Skip to content

fix(export): Handle exceptions when reading file content and ignore whitespace-only files #3214

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
Chartman123 wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −2
Open

fix(export): Handle exceptions when reading file content and ignore whitespace-only files #3214

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions lib/Service/SubmissionService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,19 @@ function (array $carry, Answer $answer) use ($questionPerQuestionId, $gridRowsPe
* @param list<non-empty-list<array{columns?: list<mixed|string>, label?: string, url?: string}|mixed|null|string>> $data
*/
private function exportData(array $header, array $data, string $fileFormat, ?File $file = null): string {
if ($file && $file->getContent()) {
$content = null;
if ($file) {
try {
$content = $file->getContent();
} catch (\Exception $e) {
$this->logger->warning('Failed to read existing linked file content: {msg}', ['msg' => $e->getMessage()]);
}
}

// Ignore whitespace-only files (e.g. S3 single-space placeholder).
if ($content !== null && trim($content) !== '') {
$existentFile = $this->tempManager->getTemporaryFile($fileFormat);
file_put_contents($existentFile, $file->getContent());
file_put_contents($existentFile, $content);
$spreadsheet = IOFactory::load($existentFile);
} else {
$spreadsheet = new Spreadsheet();
Expand Down
Loading