From 8b3b832359c64ee3ad6099df7e540d5029d63da9 Mon Sep 17 00:00:00 2001 From: Andrii Dembitskyi Date: Tue, 22 Jun 2021 16:15:40 +0300 Subject: [PATCH] Use original cell value event if cell contain error to generate more helpful exception message (in case of objects, for example) --- src/Spout/Writer/ODS/Manager/WorksheetManager.php | 2 +- src/Spout/Writer/XLSX/Manager/WorksheetManager.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Spout/Writer/ODS/Manager/WorksheetManager.php b/src/Spout/Writer/ODS/Manager/WorksheetManager.php index bd87dc1..cf47f5a 100644 --- a/src/Spout/Writer/ODS/Manager/WorksheetManager.php +++ b/src/Spout/Writer/ODS/Manager/WorksheetManager.php @@ -243,7 +243,7 @@ class WorksheetManager implements WorksheetManagerInterface } elseif ($cell->isEmpty()) { $data .= '/>'; } else { - $value = $cell->getValue(); + $value = $cell->getValueEvenIfError(); throw new InvalidArgumentException('Trying to add a value with an unsupported type: ' . (\is_object($value) ? \get_class($value) : \gettype($value))); } diff --git a/src/Spout/Writer/XLSX/Manager/WorksheetManager.php b/src/Spout/Writer/XLSX/Manager/WorksheetManager.php index b67f7ac..2f59de9 100644 --- a/src/Spout/Writer/XLSX/Manager/WorksheetManager.php +++ b/src/Spout/Writer/XLSX/Manager/WorksheetManager.php @@ -253,7 +253,7 @@ EOD; $cellXML = ''; } } else { - $value = $cell->getValue(); + $value = $cell->getValueEvenIfError(); throw new InvalidArgumentException('Trying to add a value with an unsupported type: ' . (\is_object($value) ? \get_class($value) : \gettype($value))); }